Whitespace clean up to avoid needless diff from master.