Whitespace.
Build system simplifications and generalizations.