Fix whitespace.

Fix some whitespace issues from a merge.