Whitespace changes

Change whitespace a little more defensively. This time, I did not change the sed-commands.