Minor changes to the grammar.