Fix whitespace handling.