Some updates to the grammar.