[#858] grammar and whitespace