Clean up the code here a bit. These are whitespace changes only and can
be ignored by the translation teams.