Refactor the grammar to pin individual statements.