import CoreUtils ( exprIsHNF, exprIsDupable )
import CoreLint ( showPass, endPass )
import CoreFVs ( CoreExprWithFVs, freeVars, freeVarsOf, idRuleVars )
-import Id ( isOneShotBndr )
+import Id ( isOneShotBndr, idType )
import Var
import Type ( isUnLiftedType )
import VarSet
noFloatIntoRhs rhs = exprIsHNF (deAnnotate' rhs) -- We'd just float right back out again...
is_one_shot :: Var -> Bool
-is_one_shot b = isId b && isOneShotBndr b
+is_one_shot b = isIdVar b && isOneShotBndr b
\end{code}