+ | otherwise = case lookupVarEnv ids v of
+ Just e -> e
+ Nothing -> Var v
+
+{- We used to have to look up in the in-scope set,
+ because GADTs were implicit in the intermediate language
+ But with FC, the type of an Id does not change in its scope
+ The worst that can happen if we don't look up in the in-scope set
+ is that we don't propagate IdInfo as vigorously as we might.
+ But that'll happen (when it's useful) in SimplEnv.substId
+
+ If you put this back in, you should worry about the
+ Just e -> e
+ case above too!
+