Whitespace tweaks; #606