Improve whitespace handling

We want to drop whitespace except between statements.