Wrap instantiated types in InstantiatedType rather than setting attrs
Merge branch 'master' into mammoth