Whitespace tidy, including upstream.