Be more tolerant of extra whitespace