clean up representation of literals in the grammar

[CodeFarmer]

...this is related to the general moving of stuff out of the .g file anyway, but even if not there's starting to be a lot of repetition.