#389 More whitespace fixes