Requires refactoring of all C_XXX classes for terminal types, and their ancestors in software implementations. Parsers need to generate the new structures.
Merge C_PRIMITIVE class into C_PRIMITIVE_OBJECT; remove C_PRIMITIVE. Remove existing wrapper routines from C_PRIMITIVE_OBJECT.