While we are at it: More whitespace fixes