Better whitespace handling.