Whitespace tidy-ups.