Improves whitespace handling