As a long-term enhancement, pull up all of the non-AP parts of TypeMap, ASEntity, and IASModel into a standalone module in its own package. It can be published as an even lower-level utility for code that works with SA-shaped data that doesn't actually follow the AS standard.