Yet more whitespace fixes.