Remove some white space.
Typo
Avoid C-related material getting into cpp/javacc output.
Framework for work on JENA-803.