From 4338e5b5b9a5db11198bd8eea95c75455921559d Mon Sep 17 00:00:00 2001
From: Rob Rix <rob.rix@me.com>
Date: Mon, 22 Oct 2018 12:57:46 -0400
Subject: [PATCH] Simplify the flow-sensitive carriers.

---
 src/Analysis/Abstract/Caching/FlowSensitive.hs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Analysis/Abstract/Caching/FlowSensitive.hs b/src/Analysis/Abstract/Caching/FlowSensitive.hs
index 581c8b7b9..23120d1f9 100644
--- a/src/Analysis/Abstract/Caching/FlowSensitive.hs
+++ b/src/Analysis/Abstract/Caching/FlowSensitive.hs
@@ -135,15 +135,15 @@ getConfiguration term = Configuration term <$> askRoots <*> getEvalContext <*> g
 
 
 caching :: (Carrier sig m, Effect sig)
-        => Evaluator term address value (AltC []
-          (Evaluator term address value (ReaderC (Cache term address value)
-          (Evaluator term address value (StateC (Cache term address value)
-          (Evaluator term address value m)))))) a
+        => Evaluator term address value (AltC [] (Eff
+                                        (ReaderC (Cache term address value) (Eff
+                                        (StateC (Cache term address value) (Eff
+                                        m)))))) a
         -> Evaluator term address value m (Cache term address value, [a])
 caching
-  = runState  lowerBound . runEvaluator
-  . runReader lowerBound . runEvaluator
-  . runNonDet            . runEvaluator
+  = raiseHandler (runState  lowerBound)
+  . raiseHandler (runReader lowerBound)
+  . raiseHandler runNonDet
 
 
 -- | A map of 'Configuration's to 'Set's of resulting values & 'Heap's.