When substituting types the base types should not be included as models

Fixes #254