Reconcile Type System with the updated CEM templates

There are new things in the general CEM templates that have not been added to the type system. This includes new features (e.g., historyOf) and semantic types (e.g., Devices) that were not previously represented or annotated.

Some of these are being annotated, some of them are not.