Clean up whitespace.

Various whitespace clean-ups.