More work on parser generation.
Adjust naming of more constants.