-import Id ( isNullaryDataCon, dataConArgTys, replaceIdInfo, idName, Id )
-import Maybes ( maybeToBool, seqMaybe, catMaybes )
-import Name ( nameOccName, mkLocalName,
- isLocallyDefined, Module,
+import Var ( setIdInfo, idName, Id, TyVar )
+import DataCon ( isNullaryDataCon, dataConArgTys, dataConId )
+import Maybes ( maybeToBool, catMaybes, expectJust )
+import MkId ( mkDictFunId )
+import Name ( nameOccName, isLocallyDefined, Module,