Wrap instantiated types in InstantiatedType rather than setting attrs