#757
* Don't handle subtypes based on models (this is wrong!).
* Support all other models.
* Infer subtypes from attributes / attribute values.