Undo unnecessary whitespace changes

These make reviewing more difficult.

Pointed out by Thomas Munro.