Removed some lexical tie-ins to the grammar