Fix a bug in type substitution where type vars are not subst'ed
Fix a bug in type substitution where type vars are not subst'ed