-import Id ( Id, idType, isDataConId_maybe )
-import Type ( Type, isTauTy, mkTyConApp, boxedTypeKind )
-import Subst ( substTy, substTheta )
+import Id ( Id, idType, isDataConWrapId_maybe )
+import Type ( Type, isTauTy, mkTyConApp, mkClassPred, boxedTypeKind )
+import Subst ( substTy, substClasses )