Please watch out with whitespace fixes in a commit. This adds a lot of noise and makes it difficult to review.