Fix whitespace problems. To be squashed.