Define state accessors for annotationMap/recordMap/composites.
Fix error message in cType for collections.
Rewrite canonicalType to facilitate throwing errors on invalid inputs.
Add addComposite calls during declaration of collections.
Fix calls to canonicalType to reflect monadic change.
Add addAnnotation calls when processing annotation declarations.