Improved treatment of whitespace