Correct handling of whitespace.