Cleanup, fix debug drawing

src/Dodge/Data/ActionPlan.hs

@@ -140,10 +140,9 @@ data Action
     | UseSelf
         { _useSelf :: CrAc
         }
-    | ArbitraryAction
-        {_arbitraryAction :: CrWdAc}
-    | -- | Repeatedly perform impulses alongside a main action until the main action terminates
-      DoImpulsesAlongside
+    | ArbitraryAction {_arbitraryAction :: CrWdAc}
+-- | Repeatedly perform impulses alongside a main action until the main action terminates
+    | DoImpulsesAlongside
         { _sideImpulses :: [Impulse]
         , _mainAction :: Action
         }

src/Dodge/Render/ShapePicture.hs

@@ -2,7 +2,6 @@
 module Dodge.Render.ShapePicture (worldSPic) where
 
 import Dodge.Debug
-import qualified Data.Map.Strict as M
 import Control.Lens
 import Data.Foldable
 import Data.Strict.Tuple
@@ -113,7 +112,7 @@ extraPics cfig u =
         <> _flares lw
         <> foldMap drawLightSource (_lightSources lw)
         <> viewClipBounds cfig w
-        <> foldMap (drawDebug u) (M.keys $ _uvDebug u)
+        <> foldMap (drawDebug u) (u ^. uvConfig . debug_booleans)
   where
     w = u ^. uvWorld
     lw = w ^. cWorld . lWorld