Tweaks to support a Courier DataResolver

In order to support a Courier DataResolver, we have amended the core `Archetype` models to expose certain properties for serialization purposes.

The final commit was whitespace housekeeping ... I think @tomfulton will find this amusing, as I was notorious for it in uComponents ;-)