Factor runFresh out of evaluating.

src/Analysis/Abstract/Evaluating.hs

@@ -19,8 +19,7 @@ deriving instance (Show (Cell address value), Show address, Show value) => Show
 
 
 evaluating :: Evaluator address value
-                (  Fresh
-                ': State (Heap address (Cell address) value)
+                (  State (Heap address (Cell address) value)
                 ': State (ModuleTable (Maybe (address, Environment address)))
                 ': effects) result
            -> Evaluator address value effects (result, EvaluatingState address value)
@@ -28,4 +27,3 @@ evaluating
   = fmap (\ ((result, heap), modules) -> (result, EvaluatingState heap modules))
   . runState lowerBound -- State (ModuleTable (Maybe (address, Environment address)))
   . runState lowerBound -- State (Heap address (Cell address) value)
-  . runFresh 0

src/Semantic/Graph.hs

@@ -61,6 +61,7 @@ runGraph graphType includePackages project
           runGraphAnalysis
             = run
             . evaluating
+            . runFresh 0
             . runIgnoringTrace
             . resumingLoadError
             . resumingUnspecialized

src/Semantic/Util.hs

@@ -30,6 +30,7 @@ import           Text.Show.Pretty (ppShow)
 justEvaluating
   = runM
   . evaluating
+  . runFresh 0
   . runPrintingTrace
   . fmap reassociate
   . runLoadError
@@ -68,6 +69,7 @@ newtype UtilEff address a = UtilEff
 checking
   = runM @_ @IO
   . evaluating
+  . runFresh 0
   . runPrintingTrace
   . runTermEvaluator @_ @Monovariant @Type
   . caching @[]

test/Control/Abstract/Evaluator/Spec.hs

@@ -31,6 +31,7 @@ spec = parallel $ do
 evaluate
   = runM
   . evaluating @Precise @Val
+  . runFresh 0
   . runReader (PackageInfo (name "test") Nothing mempty)
   . runReader (ModuleInfo "test/Control/Abstract/Evaluator/Spec.hs")
   . fmap reassociate

test/SpecHelpers.hs

@@ -113,6 +113,7 @@ testEvaluating
   = run
   . runReturningTrace
   . evaluating
+  . runFresh 0
   . fmap reassociate
   . runLoadError
   . runUnspecialized