Better handling of whitespace.