-import AbsPrel ( liftDataCon, mkLiftTy )
-import TysPrim ( statePrimTyCon ) -- ToDo: get from AbsPrel
-import AbsUniType
-import Id ( getIdUniType, updateIdType, mkSysLocal, isLocallyDefined )
-import IdEnv
-import Outputable
-import PlainCore
-import SplitUniq
-import Util
+IMP_Ubiq(){-uitous-}
+
+import CoreSyn
+import CoreUtils ( coreExprType )
+import Id ( idType, mkSysLocal,
+ nullIdEnv, growIdEnvList, lookupIdEnv, SYN_IE(IdEnv),
+ GenId{-instances-}
+ )
+import Name ( isLocallyDefined, getSrcLoc )
+import TyCon ( isBoxedTyCon, TyCon{-instance-} )
+import Type ( maybeAppDataTyConExpandingDicts, eqTy )
+import TysPrim ( statePrimTyCon )
+import TysWiredIn ( liftDataCon, mkLiftTy )
+import UniqSupply ( getUnique, getUniques, splitUniqSupply, UniqSupply )
+import Util ( zipEqual, zipWithEqual, assertPanic, panic )