Be a bit more forgiving as to whitespace