-import IdInfo ( zapSpecPragInfo )
-import VarSet
-import VarEnv
-
-import Type ( Type, mkTyVarTy, splitSigmaTy, splitFunTysN,
- tyVarsOfType, tyVarsOfTypes, applyTys,
- mkForAllTys, boxedTypeKind
- )
-import Subst ( Subst, mkSubst, substTy, emptySubst, substBndrs, extendSubstList,
- substExpr, substId, substIds, substAndCloneId, substAndCloneIds, lookupSubst
+import CoreSubst ( Subst, mkEmptySubst, extendTvSubstList, lookupIdSubst,
+ substBndr, substBndrs, substTy, substInScope,
+ cloneIdBndr, cloneIdBndrs, cloneRecIdBndrs