Address Rob's concerns.

src/Analysis/Abstract/Caching.hs

@@ -104,7 +104,6 @@ convergingModules recur m = do
     -- nondeterministic values into @()@.
       withOracle prevCache (gatherM (const ()) (recur m)))
 
-  -- TODO: We're hitting an infinite loop here, c.f test/fixtures/ruby/analysis/graphing/include-file-with-undefined-call
   TermEvaluator (address =<< runTermEvaluator (maybe empty scatter (cacheLookup c cache)))
 
 -- | Iterate a monadic action starting from some initial seed until the results converge.

src/Control/Abstract/Heap.hs

@@ -59,7 +59,8 @@ box :: ( Member (Allocator address value) effects
     => value
     -> Evaluator address value effects address
 box val = do
-  addr <- gensym >>= alloc
+  name <- gensym
+  addr <- alloc name
   assign addr val
   pure addr
 

src/Data/Abstract/Evaluatable.hs

@@ -57,11 +57,11 @@ class (Show1 constr, Foldable constr) => Evaluatable constr where
           , Member (Reader PackageInfo) effects
           , Member (Reader Span) effects
           , Member (Resumable (EnvironmentError address)) effects
+          , Member (Resumable (Unspecialized value)) effects
           , Member (Resumable EvalError) effects
           , Member (Resumable ResolutionError) effects
-          , Member (Resumable (Unspecialized value)) effects
-          , Member Trace effects
           , Member Fresh effects
+          , Member Trace effects
           )
        => SubtermAlgebra constr term (Evaluator address value effects (ValueRef address))
   eval expr = do