More whitespace formatting fixes.