Use substTypeVars in makeWrappedInstance