@explorable-viz/fluid 0.10.3 → 0.10.5

package/dist/fluid/shared/fluid.mjs

@@ -11538,7 +11538,7 @@ var assertPresent = (v) => (v1) => {
         }
         fail();
       })();
-      return assertWhen(true)($0 + " is an existing vertex")((v2) => present)(() => $Step("Loop", $1))();
+      return assertWhen(false)($0 + " is an existing vertex")((v2) => present)(() => $Step("Loop", $1))();
     };
   }
   fail();
@@ -11767,7 +11767,7 @@ var runWithGraphT = (dictMonad) => {
     const freezeGraph2 = freezeGraph1(dictGraph);
     return (m) => (\u03B1s) => dictMonad.Bind1().bind(freezeGraph2(m)(\u03B1s))((v) => {
       const $0 = v._1;
-      return assertWhen(true)("edgeListGC")((v1) => dictGraph.Eq0().eq($0)(dictGraph.fromEdgeList(Leaf2)(toEdgeList(dictGraph)($0))))(dictMonad.Applicative0().pure($Tuple(
+      return assertWhen(false)("edgeListGC")((v1) => dictGraph.Eq0().eq($0)(dictGraph.fromEdgeList(Leaf2)(toEdgeList(dictGraph)($0))))(dictMonad.Applicative0().pure($Tuple(
         $0,
         v._2
       )));
@@ -11844,7 +11844,7 @@ var fwdSlice = (dictGraph) => {
         return pure($Step("Loop", { pending: insert(ordVertex)(v1.es._1._1)(\u03B2s)(v1.pending), es: v1.es._2 }));
       }
       fail();
-    })({ pending: Leaf2, es: inEdges(dictGraph)($0)($1) }))(assertWhen(true)("inputs are sinks")((v$1) => difference2(ordVertex)($1)(dictGraph.sinks($0)).tag === "Leaf")(map(ordDVertex$p)((\u03B1) => $Tuple(
+    })({ pending: Leaf2, es: inEdges(dictGraph)($0)($1) }))(assertWhen(false)("inputs are sinks")((v$1) => difference2(ordVertex)($1)(dictGraph.sinks($0)).tag === "Leaf")(map(ordDVertex$p)((\u03B1) => $Tuple(
       \u03B1,
       dictGraph.vertexData($0)(\u03B1)
     ))($1)))._1;
@@ -11888,7 +11888,7 @@ var bwdSlice = (dictGraph) => {
       fail();
     })({
       visited: Leaf2,
-      "\u03B1s": fromFoldable8(assertWhen(true)("inputs are sinks")((v$1) => difference2(ordVertex)($1)(addresses2($0)).tag === "Leaf")($1)),
+      "\u03B1s": fromFoldable8(assertWhen(false)("inputs are sinks")((v$1) => difference2(ordVertex)($1)(addresses2($0)).tag === "Leaf")($1)),
       pending: Nil
     }))(Leaf2)._1;
   };
@@ -16214,186 +16214,149 @@ var codePointAt = (v) => (v1) => {
 };
 
 // output-es/Temp.Pretty.Doc/index.js
-var $Collection = (tag) => tag;
 var $Doc = (tag, _1, _2) => ({ tag, _1, _2 });
 var $Format = (tag) => tag;
+var $Mode = (tag) => tag;
+var Stmt = /* @__PURE__ */ $Mode("Stmt");
+var Expr = /* @__PURE__ */ $Mode("Expr");
 var Inline = /* @__PURE__ */ $Format("Inline");
 var Multiline = /* @__PURE__ */ $Format("Multiline");
-var Squash = /* @__PURE__ */ $Format("Squash");
-var Record = /* @__PURE__ */ $Collection("Record");
 var Empty = /* @__PURE__ */ $Doc("Empty");
 var Line = /* @__PURE__ */ $Doc("Line");
-var Collection = (value0) => (value1) => $Doc("Collection", value0, value1);
-var intercalate3 = (sep) => (xs) => {
-  const go = (go$a0$copy) => (go$a1$copy) => {
-    let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
-    while (go$c) {
-      const b = go$a0, v = go$a1;
-      if (v.tag === "Nil") {
-        go$c = false;
-        go$r = b;
-        continue;
-      }
-      if (v.tag === "Cons") {
-        go$a0 = b.init ? { init: false, acc: v._1 } : { init: false, acc: $Doc("Concat", b.acc, $Doc("Concat", sep, v._1)) };
-        go$a1 = v._2;
-        continue;
-      }
-      fail();
-    }
-    return go$r;
-  };
-  return go({ init: true, acc: Empty })(xs).acc;
-};
-var widthList = (v) => {
-  if (v.tag === "Nil") {
+var Mode = (value0) => (value1) => $Doc("Mode", value0, value1);
+var width = (m) => (doc2) => {
+  if (doc2.tag === "Empty") {
     return 0;
   }
-  if (v.tag === "Cons") {
-    if (v._2.tag === "Nil") {
-      return width(v._1);
-    }
-    return (width(v._1) + 2 | 0) + widthList(v._2) | 0;
-  }
-  fail();
-};
-var width = (v) => {
-  if (v.tag === "Empty") {
+  if (doc2.tag === "Line") {
     return 0;
   }
-  if (v.tag === "Line") {
-    return 0;
+  if (doc2.tag === "Text") {
+    return toCodePointArray(doc2._1).length;
   }
-  if (v.tag === "Text") {
-    return toCodePointArray(v._1).length;
+  if (doc2.tag === "Indent") {
+    return width(m)(doc2._1);
   }
-  if (v.tag === "Indent") {
-    return width(v._1);
+  if (doc2.tag === "Concat") {
+    return width(m)(doc2._1) + width(m)(doc2._2) | 0;
   }
-  if (v.tag === "Concat") {
-    return width(v._1) + width(v._2) | 0;
+  if (doc2.tag === "Mode") {
+    return width(doc2._1)(doc2._2);
   }
-  if (v.tag === "Block") {
-    return width(v._1);
+  if (doc2.tag === "StmtOrExpr") {
+    if (m === "Stmt") {
+      return width(m)(doc2._1);
+    }
+    if (m === "Expr") {
+      return width(m)(doc2._2);
+    }
+    fail();
   }
-  if (v.tag === "Collection") {
-    return widthList(v._2);
+  if (doc2.tag === "InlOrMul") {
+    return width(m)(doc2._1);
   }
   fail();
 };
+var stmt = /* @__PURE__ */ Mode(Stmt);
 var spaces = (n) => {
   if (n <= 0) {
     return "";
   }
   return " " + spaces(n - 1 | 0);
 };
-var record = /* @__PURE__ */ Collection(Record);
-var inlinable = (doc2) => {
+var inlinable = (m) => (doc2) => {
+  if (doc2.tag === "Empty") {
+    return true;
+  }
   if (doc2.tag === "Line") {
     return false;
   }
+  if (doc2.tag === "Text") {
+    return true;
+  }
   if (doc2.tag === "Indent") {
     return false;
   }
   if (doc2.tag === "Concat") {
-    return inlinable(doc2._1) && inlinable(doc2._2);
+    return inlinable(m)(doc2._1) && inlinable(m)(doc2._2);
   }
-  return true;
-};
-var format = (doc2) => {
-  if (doc2.tag === "Block") {
-    if (doc2._1.tag === "Collection") {
-      return Inline;
-    }
-    if (inlinable(doc2._1) && width(doc2._1) < 20) {
-      return Inline;
-    }
-    return Multiline;
+  if (doc2.tag === "Mode") {
+    return inlinable(doc2._1)(doc2._2);
   }
-  if (doc2.tag === "Collection") {
-    if (widthList(doc2._2) === 0) {
-      return Squash;
+  if (doc2.tag === "StmtOrExpr") {
+    if (m === "Stmt") {
+      return false;
     }
-    if (widthList(doc2._2) < 50) {
-      return Inline;
+    if (m === "Expr") {
+      return inlinable(m)(doc2._2);
     }
-    return Multiline;
-  }
-  return Inline;
-};
-var simplifyList = (ds) => (fmt) => {
-  if (fmt === "Squash") {
-    return Empty;
-  }
-  if (fmt === "Inline") {
-    return intercalate3($Doc("Text", ", "))(listMap((d) => simplify(d))(ds));
+    fail();
   }
-  if (fmt === "Multiline") {
-    return $Doc("Concat", $Doc("Indent", intercalate3($Doc("Text", ","))(listMap((d) => $Doc("Concat", Line, simplify(d)))(ds))), Line);
+  if (doc2.tag === "InlOrMul") {
+    return inlinable(m)(doc2._1);
   }
   fail();
 };
-var simplify = (doc2) => {
-  const fmt = format(doc2);
-  if (doc2.tag === "Block") {
-    if (fmt === "Squash") {
-      return $Doc("Concat", $Doc("Text", ": "), simplify(doc2._1));
-    }
-    if (fmt === "Inline") {
-      return $Doc("Concat", $Doc("Text", ": "), simplify(doc2._1));
-    }
-    if (fmt === "Multiline") {
-      return $Doc("Concat", $Doc("Text", ":"), $Doc("Indent", $Doc("Concat", Line, simplify(doc2._1))));
-    }
-    fail();
-  }
-  if (doc2.tag === "Collection") {
-    return (() => {
-      if (doc2._1 === "Record") {
-        if (fmt === "Squash") {
-          return (d) => $Doc("Concat", $Doc("Text", "{"), $Doc("Concat", d, $Doc("Text", "}")));
-        }
-        if (fmt === "Inline") {
-          return (d) => $Doc("Concat", $Doc("Text", "{ "), $Doc("Concat", d, $Doc("Text", " }")));
-        }
-        if (fmt === "Multiline") {
-          return (d) => $Doc("Concat", $Doc("Text", "{"), $Doc("Concat", d, $Doc("Text", "}")));
-        }
-        fail();
-      }
-      if (doc2._1 === "Array") {
-        return (d) => $Doc("Concat", $Doc("Text", "["), $Doc("Concat", d, $Doc("Text", "]")));
-      }
-      fail();
-    })()(simplifyList(doc2._2)(fmt));
+var format = (m) => (w) => (doc2) => {
+  if (inlinable(m)(doc2) && width(m)(doc2) < (80 - w | 0)) {
+    return Inline;
   }
-  return doc2;
+  return Multiline;
 };
-var renderWithIndent = (n) => (doc2) => {
+var renderWithIndent = (m) => (i) => (w) => (doc2) => {
+  const indentation = i * 2 | 0;
+  const fmt = format(m)(w)(doc2);
+  const $0 = (d1, d2) => {
+    const v = renderWithIndent(m)(i)(w)(d1);
+    const v1 = renderWithIndent(m)(i)(v._2)(d2);
+    return $Tuple(v._1 + v1._1, v1._2);
+  };
   if (doc2.tag === "Empty") {
-    return "";
+    return $Tuple("", w);
   }
   if (doc2.tag === "Line") {
-    const $0 = n * 2 | 0;
-    if ($0 <= 0) {
-      return "\n";
+    return $Tuple(indentation <= 0 ? "\n" : "\n " + spaces(indentation - 1 | 0), indentation);
+  }
+  if (doc2.tag === "Concat") {
+    if (doc2._1.tag === "Line") {
+      if (doc2._2.tag === "Empty") {
+        return $Tuple("\n", 0);
+      }
+      if (doc2._2.tag === "Line") {
+        return $Tuple(indentation <= 0 ? "\n\n" : "\n\n " + spaces(indentation - 1 | 0), indentation);
+      }
     }
-    return "\n " + spaces($0 - 1 | 0);
+    return $0(doc2._1, doc2._2);
   }
   if (doc2.tag === "Text") {
-    return doc2._1;
+    return $Tuple(doc2._1, w + toCodePointArray(doc2._1).length | 0);
   }
   if (doc2.tag === "Indent") {
-    return renderWithIndent(n + 1 | 0)(doc2._1);
+    return renderWithIndent(m)(i + 1 | 0)(w)(doc2._1);
   }
-  if (doc2.tag === "Concat") {
-    if (doc2._1.tag === "Line" && doc2._2.tag === "Empty") {
-      return "\n";
+  if (doc2.tag === "Mode") {
+    return renderWithIndent(doc2._1)(i)(w)(doc2._2);
+  }
+  if (doc2.tag === "StmtOrExpr") {
+    if (m === "Stmt") {
+      return renderWithIndent(m)(i)(w)(doc2._1);
+    }
+    if (m === "Expr") {
+      return renderWithIndent(m)(i)(w)(doc2._2);
+    }
+    fail();
+  }
+  if (doc2.tag === "InlOrMul") {
+    if (fmt === "Inline") {
+      return renderWithIndent(m)(i)(w)(doc2._1);
+    }
+    if (fmt === "Multiline") {
+      return renderWithIndent(m)(i)(w)(doc2._2);
     }
-    return renderWithIndent(n)(doc2._1) + renderWithIndent(n)(doc2._2);
   }
-  return renderWithIndent(n)(simplify(doc2));
+  fail();
 };
+var expr = /* @__PURE__ */ Mode(Expr);
 
 // output-es/Temp.Pretty.Helpers/index.js
 var vsep = (v) => {
@@ -16408,6 +16371,55 @@ var vsep = (v) => {
   }
   fail();
 };
+var sep$p = (v) => (v1) => {
+  if (v1.tag === "Nil") {
+    return Empty;
+  }
+  if (v1.tag === "Cons") {
+    if (v1._2.tag === "Nil") {
+      return v1._1;
+    }
+    return $Doc("Concat", v1._1, $Doc("Concat", v, sep$p(v)(v1._2)));
+  }
+  fail();
+};
+var record = (ds) => $Doc(
+  "InlOrMul",
+  $Doc(
+    "Concat",
+    $Doc("Text", "{"),
+    $Doc(
+      "Concat",
+      $Doc("Text", " "),
+      $Doc(
+        "Concat",
+        sep$p($Doc("Text", ", "))(ds),
+        $Doc("Concat", $Doc("Text", " "), $Doc("Text", "}"))
+      )
+    )
+  ),
+  $Doc(
+    "Concat",
+    $Doc("Text", "{"),
+    $Doc(
+      "Concat",
+      $Doc(
+        "Indent",
+        $Doc("Concat", Line, sep$p($Doc("Concat", $Doc("Text", ","), Line))(ds))
+      ),
+      $Doc("Concat", Line, $Doc("Text", "}"))
+    )
+  )
+);
+var matrix = (p) => $Doc(
+  "Concat",
+  $Doc(
+    "InlOrMul",
+    $Doc("Concat", $Doc("Text", "[|"), $Doc("Concat", $Doc("Text", " "), p)),
+    $Doc("Concat", $Doc("Text", "[|"), $Doc("Concat", Line, p))
+  ),
+  $Doc("Text", "|]")
+);
 var hsep = (v) => {
   if (v.tag === "Nil") {
     return Empty;
@@ -16420,6 +16432,23 @@ var hsep = (v) => {
   }
   fail();
 };
+var block = (d) => $Doc(
+  "StmtOrExpr",
+  $Doc(
+    "Concat",
+    $Doc("Text", ":"),
+    $Doc(
+      "InlOrMul",
+      $Doc("Concat", $Doc("Text", " "), d),
+      $Doc("Indent", $Doc("Concat", Line, d))
+    )
+  ),
+  $Doc(
+    "Concat",
+    $Doc("Text", ":"),
+    $Doc("Concat", $Doc("Text", " "), $Doc("Concat", d, $Doc("Text", ";")))
+  )
+);
 
 // output-es/Temp.Pretty/index.js
 var identity22 = (x) => x;
@@ -16542,7 +16571,7 @@ var prettyConstr = (dictRootOp) => (dictPretty) => {
   return (v) => (v1) => {
     if (v1.tag === "Nil") {
       if (v === "Nil") {
-        return $Doc("Concat", $Doc("Text", "["), $Doc("Text", "]"));
+        return $Doc("Text", "[]");
       }
       return $Doc("Text", v);
     }
@@ -16611,7 +16640,7 @@ var prettyPattern = {
       return prettyConstr(rootOpPattern)(prettyPattern)(v._1)(v._2);
     }
     if (v.tag === "PListEmpty") {
-      return $Doc("Concat", $Doc("Text", "["), $Doc("Text", "]"));
+      return $Doc("Text", "[]");
     }
     if (v.tag === "PListNonEmpty") {
       return $Doc(
@@ -16711,6 +16740,9 @@ var prettyBaseVal = (dictHighlightable) => {
         );
       }
       if (v.tag === "Dictionary") {
+        if (isEmpty2(v._1)) {
+          return $Doc("Text", "{}");
+        }
         return record(listMap(prettyVar$x215$x215Val(dictHighlightable).pretty)(toUnfoldable8(v._1)));
       }
       if (v.tag === "Constr") {
@@ -16727,7 +16759,7 @@ var prettyBaseVal = (dictHighlightable) => {
   };
 };
 var prettyVarDefs = (dictAnn) => ({
-  pretty: (ds) => vsep((() => {
+  pretty: (ds) => sep$p($Doc("StmtOrExpr", Line, $Doc("Text", " ")))((() => {
     const $0 = prettyVarDef(dictAnn);
     return $List("Cons", $0.pretty(ds._1), listMap($0.pretty)(ds._2));
   })())
@@ -16739,12 +16771,12 @@ var prettyVarDef = (dictAnn) => ({
     $Doc(
       "Concat",
       $Doc("Text", " "),
-      $Doc("Concat", prettyPattern.pretty(v._1), $Doc("Block", prettyExpr1(dictAnn).pretty(v._2)))
+      $Doc("Concat", prettyPattern.pretty(v._1), block(prettyExpr1(dictAnn).pretty(v._2)))
     )
   )
 });
 var prettyRecDefs = (dictAnn) => ({
-  pretty: (bs) => vsep((() => {
+  pretty: (bs) => sep$p($Doc("StmtOrExpr", Line, $Doc("Text", " ")))((() => {
     const $0 = prettyBranch(dictAnn);
     return $List("Cons", $0.pretty(bs._1), listMap($0.pretty)(bs._2));
   })())
@@ -16756,7 +16788,7 @@ var prettyPattern$x215Expr = (dictAnn) => ({
     $Doc(
       "Concat",
       $Doc("Text", " "),
-      $Doc("Concat", prettyPattern.pretty(v._1), $Doc("Block", prettyExpr1(dictAnn).pretty(v._2)))
+      $Doc("Concat", prettyPattern.pretty(v._1), block(prettyExpr1(dictAnn).pretty(v._2)))
     )
   )
 });
@@ -16899,69 +16931,60 @@ var prettyExpr1 = (dictAnn) => {
         if (v._3.tag === "Nil") {
           return $0.highlightIf(v._1)($Doc("Text", v._2));
         }
-        return $0.highlightIf(v._1)(prettyConstr2(prettyExpr1(dictAnn))(v._2)(v._3));
+        return $0.highlightIf(v._1)(expr(prettyConstr2(prettyExpr1(dictAnn))(v._2)(v._3)));
       }
       if (v.tag === "Dictionary") {
-        return $0.highlightIf(v._1)(record(listMap(prettyDictEntry$x215Expr(dictAnn).pretty)(v._2)));
+        if (v._2.tag === "Nil") {
+          return $0.highlightIf(v._1)($Doc("Text", "{}"));
+        }
+        return $0.highlightIf(v._1)(expr(record(listMap(prettyDictEntry$x215Expr(dictAnn).pretty)(v._2))));
       }
       if (v.tag === "Matrix") {
-        return $0.highlightIf(v._1)($Doc(
+        return $0.highlightIf(v._1)(expr(matrix($Doc(
           "Concat",
-          $Doc("Text", "[|"),
+          prettyExpr1(dictAnn).pretty(v._2),
           $Doc(
             "Concat",
             $Doc("Text", " "),
             $Doc(
               "Concat",
+              $Doc("Text", "for"),
               $Doc(
                 "Concat",
-                prettyExpr1(dictAnn).pretty(v._2),
+                $Doc("Text", " "),
                 $Doc(
                   "Concat",
-                  $Doc("Text", " "),
                   $Doc(
                     "Concat",
-                    $Doc("Text", "for"),
+                    $Doc("Text", "("),
                     $Doc(
                       "Concat",
-                      $Doc("Text", " "),
                       $Doc(
                         "Concat",
+                        $Doc("Text", v._3._1),
                         $Doc(
                           "Concat",
-                          $Doc("Text", "("),
-                          $Doc(
-                            "Concat",
-                            $Doc(
-                              "Concat",
-                              $Doc("Text", v._3._1),
-                              $Doc(
-                                "Concat",
-                                $Doc("Text", ","),
-                                $Doc("Concat", $Doc("Text", " "), $Doc("Text", v._3._2))
-                              )
-                            ),
-                            $Doc("Text", ")")
-                          )
-                        ),
-                        $Doc(
-                          "Concat",
-                          $Doc("Text", " "),
-                          $Doc(
-                            "Concat",
-                            $Doc("Text", "in"),
-                            $Doc("Concat", $Doc("Text", " "), prettyExpr1(dictAnn).pretty(v._4))
-                          )
+                          $Doc("Text", ","),
+                          $Doc("Concat", $Doc("Text", " "), $Doc("Text", v._3._2))
                         )
-                      )
+                      ),
+                      $Doc("Text", ")")
+                    )
+                  ),
+                  $Doc(
+                    "Concat",
+                    $Doc("Text", " "),
+                    $Doc(
+                      "Concat",
+                      $Doc("Text", "in"),
+                      $Doc("Concat", $Doc("Text", " "), prettyExpr1(dictAnn).pretty(v._4))
                     )
                   )
                 )
-              ),
-              $Doc("Concat", $Doc("Text", " "), $Doc("Text", "|]"))
+              )
             )
           )
-        ));
+        ))));
       }
       if (v.tag === "Lambda") {
         return $Doc(
@@ -16971,28 +16994,28 @@ var prettyExpr1 = (dictAnn) => {
         );
       }
       if (v.tag === "Project") {
-        return $Doc(
+        return expr($Doc(
           "Concat",
           prettyExpr1(dictAnn).pretty(v._1),
           $Doc("Concat", $Doc("Text", "."), $Doc("Text", v._2))
-        );
+        ));
       }
       if (v.tag === "DProject") {
-        return $Doc(
+        return expr($Doc(
           "Concat",
           prettyExpr1(dictAnn).pretty(v._1),
           $Doc(
             "Concat",
             $Doc("Text", "["),
-            $Doc("Concat", prettyExpr1(dictAnn).pretty(v._2), $Doc("Text", "]"))
+            $Doc("Concat", expr(prettyExpr1(dictAnn).pretty(v._2)), $Doc("Text", "]"))
           )
-        );
+        ));
       }
       if (v.tag === "App") {
-        return prettyAppChain(dictAnn)($Expr2("App", v._1, v._2))(Nil);
+        return expr(prettyAppChain(dictAnn)($Expr2("App", v._1, v._2))(Nil));
       }
       if (v.tag === "BinaryApp") {
-        return binaryApp(dictAnn)(0)($Expr2("BinaryApp", v._1, v._2, v._3));
+        return expr(binaryApp(dictAnn)(0)($Expr2("BinaryApp", v._1, v._2, v._3)));
       }
       if (v.tag === "MatchAs") {
         return $Doc(
@@ -17001,7 +17024,7 @@ var prettyExpr1 = (dictAnn) => {
           $Doc(
             "Concat",
             $Doc("Text", " "),
-            $Doc("Concat", prettyExpr1(dictAnn).pretty(v._1), $Doc("Block", prettyNonEmptyListPattern(dictAnn).pretty(v._2)))
+            $Doc("Concat", prettyExpr1(dictAnn).pretty(v._1), block(prettyNonEmptyListPattern(dictAnn).pretty(v._2)))
           )
         );
       }
@@ -17014,14 +17037,14 @@ var prettyExpr1 = (dictAnn) => {
             $Doc("Text", " "),
             $Doc(
               "Concat",
-              prettyExpr1(dictAnn).pretty(v._1),
+              expr(prettyExpr1(dictAnn).pretty(v._1)),
               $Doc(
                 "Concat",
-                $Doc("Block", prettyExpr1(dictAnn).pretty(v._2)),
+                block(prettyExpr1(dictAnn).pretty(v._2)),
                 $Doc(
                   "Concat",
                   Line,
-                  $Doc("Concat", $Doc("Text", "else"), $Doc("Block", prettyExpr1(dictAnn).pretty(v._3)))
+                  $Doc("Concat", $Doc("Text", "else"), block(prettyExpr1(dictAnn).pretty(v._3)))
                 )
               )
             )
@@ -17029,26 +17052,41 @@ var prettyExpr1 = (dictAnn) => {
         );
       }
       if (v.tag === "ListEmpty") {
-        return $0.highlightIf(v._1)($Doc("Concat", $Doc("Text", "["), $Doc("Text", "]")));
+        return $0.highlightIf(v._1)($Doc("Text", "[]"));
       }
       if (v.tag === "ListNonEmpty") {
-        const collect = (v1) => {
+        const collect = (v1) => (v2) => {
           if (v1.tag === "Next") {
             return $Doc(
               "Concat",
               $0.highlightIf(v1._1)($Doc("Text", ",")),
-              $Doc("Concat", $Doc("Text", " "), $Doc("Concat", prettyExpr1(dictAnn).pretty(v1._2), collect(v1._3)))
+              $Doc(
+                "Concat",
+                v2 ? $Doc("Concat", $Doc("Text", " "), prettyExpr1(dictAnn).pretty(v1._2)) : $Doc("Indent", $Doc("Concat", Line, prettyExpr1(dictAnn).pretty(v1._2))),
+                collect(v1._3)(v2)
+              )
             );
           }
           if (v1.tag === "End") {
-            return $0.highlightIf(v1._1)($Doc("Text", "]"));
+            if (v2) {
+              return $0.highlightIf(v1._1)($Doc("Text", "]"));
+            }
+            return $Doc("Concat", Line, $0.highlightIf(v1._1)($Doc("Text", "]")));
           }
           fail();
         };
         return $Doc(
           "Concat",
           $0.highlightIf(v._1)($Doc("Text", "[")),
-          $Doc("Concat", prettyExpr1(dictAnn).pretty(v._2), collect(v._3))
+          $Doc(
+            "InlOrMul",
+            $Doc("Concat", prettyExpr1(dictAnn).pretty(v._2), collect(v._3)(true)),
+            $Doc(
+              "Concat",
+              $Doc("Indent", $Doc("Concat", Line, prettyExpr1(dictAnn).pretty(v._2))),
+              collect(v._3)(false)
+            )
+          )
         );
       }
       if (v.tag === "ListEnum") {
@@ -17057,7 +17095,7 @@ var prettyExpr1 = (dictAnn) => {
           $Doc("Text", "["),
           $Doc(
             "Concat",
-            $Doc(
+            expr($Doc(
               "Concat",
               prettyExpr1(dictAnn).pretty(v._1),
               $Doc(
@@ -17069,7 +17107,7 @@ var prettyExpr1 = (dictAnn) => {
                   $Doc("Concat", $Doc("Text", " "), prettyExpr1(dictAnn).pretty(v._2))
                 )
               )
-            ),
+            )),
             $Doc("Text", "]")
           )
         );
@@ -17082,7 +17120,7 @@ var prettyExpr1 = (dictAnn) => {
             "Concat",
             $Doc(
               "Concat",
-              prettyExpr1(dictAnn).pretty(v._2),
+              expr(prettyExpr1(dictAnn).pretty(v._2)),
               $Doc("Concat", $Doc("Text", " "), prettyListQualifier(dictAnn).pretty(v._3))
             ),
             $Doc("Text", "]")
@@ -17095,12 +17133,12 @@ var prettyExpr1 = (dictAnn) => {
           prettyVarDefs(dictAnn).pretty(v._1),
           $Doc(
             "Concat",
-            $Doc("Text", ";"),
             $Doc(
-              "Concat",
-              $Doc("Concat", Line, Empty),
-              $Doc("Concat", Line, prettyExpr1(dictAnn).pretty(v._2))
-            )
+              "StmtOrExpr",
+              $Doc("Concat", $Doc("Text", ";"), $Doc("Concat", Line, Line)),
+              $Doc("Text", " ")
+            ),
+            prettyExpr1(dictAnn).pretty(v._2)
           )
         );
       }
@@ -17110,12 +17148,12 @@ var prettyExpr1 = (dictAnn) => {
           prettyRecDefs(dictAnn).pretty(v._1),
           $Doc(
             "Concat",
-            $Doc("Text", ";"),
             $Doc(
-              "Concat",
-              $Doc("Concat", Line, Empty),
-              $Doc("Concat", Line, prettyExpr1(dictAnn).pretty(v._2))
-            )
+              "StmtOrExpr",
+              $Doc("Concat", $Doc("Text", ";"), $Doc("Concat", Line, Line)),
+              $Doc("Text", " ")
+            ),
+            prettyExpr1(dictAnn).pretty(v._2)
           )
         );
       }
@@ -17126,15 +17164,23 @@ var prettyExpr1 = (dictAnn) => {
         return $Doc(
           "Concat",
           $Doc("Text", "@doc"),
-          $Doc(
-            "Concat",
-            $Doc(
-              "Concat",
-              $Doc("Text", "("),
-              $Doc("Concat", prettyExpr1(dictAnn).pretty(v._1), $Doc("Text", ")"))
-            ),
-            $Doc("Concat", $Doc("Text", " "), prettyExpr1(dictAnn).pretty(v._2))
-          )
+          (() => {
+            const $1 = prettyExpr1(dictAnn).pretty(v._1);
+            const $2 = prettyExpr1(dictAnn).pretty(v._2);
+            return $Doc(
+              "InlOrMul",
+              $Doc(
+                "Concat",
+                $Doc("Concat", $Doc("Text", "("), $Doc("Concat", $1, $Doc("Text", ")"))),
+                $Doc("Concat", $Doc("Text", " "), $2)
+              ),
+              $Doc(
+                "Concat",
+                $Doc("Concat", $Doc("Text", "("), $Doc("Concat", $1, $Doc("Text", ")"))),
+                $Doc("Concat", Line, $2)
+              )
+            );
+          })()
         );
       }
       fail();
@@ -17145,11 +17191,19 @@ var prettyDictEntry$x215Expr = (dictAnn) => ({
   pretty: (v) => $Doc(
     "Concat",
     prettyDictEntry(dictAnn).pretty(v._1),
-    $Doc(
-      "Concat",
-      $Doc("Text", ":"),
-      $Doc("Concat", $Doc("Text", " "), prettyExpr1(dictAnn).pretty(v._2))
-    )
+    stmt($Doc(
+      "InlOrMul",
+      $Doc(
+        "Concat",
+        $Doc("Text", ":"),
+        $Doc("Concat", $Doc("Text", " "), prettyExpr1(dictAnn).pretty(v._2))
+      ),
+      $Doc(
+        "Concat",
+        $Doc("Text", ":"),
+        $Doc("Indent", $Doc("Concat", Line, prettyExpr1(dictAnn).pretty(v._2)))
+      )
+    ))
   )
 });
 var prettyDictEntry = (dictAnn) => ({
@@ -17186,7 +17240,7 @@ var prettyBranch = (dictAnn) => ({
             $Doc("Text", "("),
             $Doc("Concat", prettyList5($List("Cons", v._2._1._1, v._2._1._2)), $Doc("Text", ")"))
           ),
-          $Doc("Block", prettyExpr1(dictAnn).pretty(v._2._2))
+          block(prettyExpr1(dictAnn).pretty(v._2._2))
         )
       )
     )
@@ -17293,10 +17347,18 @@ var binaryApp = (dictAnn) => (v) => (v1) => {
     return prettyExpr1(dictAnn).pretty(v1);
   }
   if (v1.tag === "Let") {
-    return $Doc("Text", "undefined");
+    return $Doc(
+      "Concat",
+      $Doc("Text", "("),
+      $Doc("Concat", prettyExpr1(dictAnn).pretty(v1), $Doc("Text", ")"))
+    );
   }
   if (v1.tag === "LetRec") {
-    return $Doc("Text", "undefined");
+    return $Doc(
+      "Concat",
+      $Doc("Text", "("),
+      $Doc("Concat", prettyExpr1(dictAnn).pretty(v1), $Doc("Text", ")"))
+    );
   }
   return prettyExpr1(dictAnn).pretty(v1);
 };
@@ -17948,8 +18010,8 @@ var unary = (dictBoundedJoinSemilattice) => {
     )
   );
 };
-var typeError = (v) => (typeName2) => throwException(error(typeName2 + " expected; got " + renderWithIndent(0)(prettyBaseVal(highlightableUnit).pretty(functorBaseVal.map((v$1) => {
-})(v)))))();
+var typeError = (v) => (typeName2) => throwException(error(typeName2 + " expected; got " + renderWithIndent(Stmt)(0)(0)(prettyBaseVal(highlightableUnit).pretty(functorBaseVal.map((v$1) => {
+})(v)))._1))();
 var string = {
   pack: Str2,
   unpack: (v) => {
@@ -18282,7 +18344,7 @@ var match = (dictMonadWithGraphAlloc) => {
           $Tuple(v2._2._1, insert(ordVertex)($4)()(v2._2._2))
         )))));
       }
-      return Bind1.bind(dataTypeForSetCtr.dataTypeFor(MonadThrow0)(mapObjectString.keys(v1._1)))((d) => MonadThrow0.throwError(error("Pattern mismatch: found " + renderWithIndent(0)(prettyVal(highlightableVertex).pretty(v)) + ", expected " + d._1)));
+      return Bind1.bind(dataTypeForSetCtr.dataTypeFor(MonadThrow0)(mapObjectString.keys(v1._1)))((d) => MonadThrow0.throwError(error("Pattern mismatch: found " + renderWithIndent(Stmt)(0)(0)(prettyVal(highlightableVertex).pretty(v))._1 + ", expected " + d._1)));
     }
     if (v1.tag === "ElimDict") {
       if (v._3.tag === "Dictionary") {
@@ -18295,7 +18357,7 @@ var match = (dictMonadWithGraphAlloc) => {
           $Tuple(v2._2._1, insert(ordVertex)($3)()(v2._2._2))
         ))));
       }
-      return MonadThrow0.throwError(error("Pattern mismatch: found " + renderWithIndent(0)(prettyVal(highlightableVertex).pretty(v)) + ", expected " + show22(v1._1)));
+      return MonadThrow0.throwError(error("Pattern mismatch: found " + renderWithIndent(Stmt)(0)(0)(prettyVal(highlightableVertex).pretty(v))._1 + ", expected " + show22(v1._1)));
     }
     fail();
   };
@@ -18479,7 +18541,7 @@ var $$eval = (dictMonadWithGraphAlloc) => {
                 return Nothing;
               })()));
             }
-            return MonadThrow0.throwError(error("Found " + renderWithIndent(0)(prettyVal(highlightableVertex).pretty(v)) + ", expected dictionary"));
+            return MonadThrow0.throwError(error("Found " + renderWithIndent(Stmt)(0)(0)(prettyVal(highlightableVertex).pretty(v))._1 + ", expected dictionary"));
           });
         }
         if (e0.tag === "DProject") {
@@ -18495,9 +18557,9 @@ var $$eval = (dictMonadWithGraphAlloc) => {
                   return Nothing;
                 })()));
               }
-              return MonadThrow0.throwError(error("Found " + renderWithIndent(0)(prettyVal(highlightableVertex).pretty(v$p)) + ", expected string"));
+              return MonadThrow0.throwError(error("Found " + renderWithIndent(Stmt)(0)(0)(prettyVal(highlightableVertex).pretty(v$p))._1 + ", expected string"));
             }
-            return MonadThrow0.throwError(error("Found " + renderWithIndent(0)(prettyVal(highlightableVertex).pretty(v)) + ", expected dict"));
+            return MonadThrow0.throwError(error("Found " + renderWithIndent(Stmt)(0)(0)(prettyVal(highlightableVertex).pretty(v))._1 + ", expected dict"));
           }));
         }
         if (e0.tag === "App") {
@@ -18552,7 +18614,7 @@ var apply2 = (dictMonadWithGraphAlloc) => {
   return (dictMonadReader) => (dictMonadAff) => {
     const Bind1 = dictMonadAff.MonadEffect0().Monad0().Bind1();
     return (dictLoadFile) => (v) => (v1) => {
-      const $0 = (v2) => MonadThrow0.throwError(error("Found " + renderWithIndent(0)(prettyVal(highlightableVertex).pretty(v2)) + ", expected function"));
+      const $0 = (v2) => MonadThrow0.throwError(error("Found " + renderWithIndent(Stmt)(0)(0)(prettyVal(highlightableVertex).pretty(v2))._1 + ", expected function"));
       if (v._3.tag === "Fun") {
         if (v._3._1.tag === "Closure") {
           const $1 = v._1;
@@ -18796,6 +18858,7 @@ var graphEval = (dictMonadAff) => {
   const monadAffState1 = monadAffState(monadAffState2);
   const $1 = monadAffState2.MonadEffect0().Monad0();
   const $2 = dictMonadAff.MonadEffect0().Monad0();
+  const applicativeStateT2 = applicativeStateT(Monad0);
   return (dictMonadReader) => {
     const monadReaderStateT2 = monadReaderStateT(monadReaderStateT(dictMonadReader));
     return (dictLoadFile) => (dictMonadError) => {
@@ -18811,7 +18874,6 @@ var graphEval = (dictMonadAff) => {
           }
         };
       })());
-      const check2 = check(monadThrowStateT(dictMonadError.MonadThrow0()));
       return (v) => (e) => {
         const $3 = v["\u03B3"];
         const $4 = spyFunWhen(false)("fwdSlice")((x) => $Tuple(showVertices(x._1), showEdgeList(toEdgeList(graphGraphImpl)(x._2))))(showGraph(graphGraphImpl))(fwdSlice2);
@@ -18822,10 +18884,7 @@ var graphEval = (dictMonadAff) => {
         ))))((v1) => {
           const $6 = v1._1;
           const $7 = v1._2;
-          return bindStateT2.bind(check2(difference2(ordDVertex$p)(verticesValVertex.vertices($7))(verticesGraphImpl.vertices($6)).tag === "Leaf")("outputs in graph"))(() => applicativeStateT(Monad0).pure($Tuple(
-            $6,
-            $Tuple($EnvExpr($3, e\u03B1), $7)
-          )));
+          return bindStateT2.bind(applicativeStateT2.pure())(() => applicativeStateT2.pure($Tuple($6, $Tuple($EnvExpr($3, e\u03B1), $7))));
         })))(v.n))((v1) => Monad0.Applicative0().pure({
           g: v1._2._2._1,
           graph_fwd: (a) => (b) => $4($Tuple(a, b)),
@@ -20323,7 +20382,7 @@ var brackets = (e) => {
     )))
   )))));
 };
-var block = (e) => {
+var block2 = (e) => {
   const $0 = delim(":");
   return (state1, more, lift12, $$throw2, done) => more((v2) => more((v1) => more((v2$1) => more((v1$1) => $0(
     state1,
@@ -21154,7 +21213,7 @@ var varDefs$lazy = /* @__PURE__ */ binding(() => {
         $2,
         (v2$1, $6) => $3($ParseState(v2$1._1, v2$1._2, $5), $6),
         (state2$1, a$1) => $1((v2$1) => {
-          const $6 = block(expr$lazy());
+          const $6 = block2(expr$lazy());
           return $1((v1$3) => $6(
             state2$1,
             $1,
@@ -21240,7 +21299,7 @@ var recDefs$lazy = /* @__PURE__ */ binding(() => {
                     $2,
                     (v2$4, $9) => $3($ParseState(v2$4._1, v2$4._2, $5), $9),
                     (state2$4, a$4) => $1((v2$4) => {
-                      const $9 = block(expr$lazy());
+                      const $9 = block2(expr$lazy());
                       return $1((v1$6) => $9(
                         state2$4,
                         $1,
@@ -21398,40 +21457,193 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
       })());
       return foldlArray(makeParser)((() => {
         const $02 = context("simple")((() => {
-          const $03 = context("matrix")((state1, more, lift12, $$throw2, done) => more((v1) => {
-            const $04 = state1._3;
-            return lexeme(string2("[|"))(
-              state1,
-              more,
-              lift12,
-              (v2, $12) => $$throw2($ParseState(v2._1, v2._2, $04), $12),
-              (state2, a) => more((v2) => more((v1$1) => opTree$lazy()(
+          const $03 = reserved("def");
+          const varDef = (v1, $12, $22, $32, $42) => {
+            const $52 = v1._3;
+            return $12((v1$1) => $03(
+              v1,
+              $12,
+              $22,
+              (v2, $62) => $32($ParseState(v2._1, v2._2, $52), $62),
+              (state2, a) => $12((v2) => $12((v1$2) => pattern(
+                state2,
+                $12,
+                $22,
+                (v2$1, $62) => $32($ParseState(v2$1._1, v2$1._2, $52), $62),
+                (state2$1, a$1) => $12((v2$1) => {
+                  const $62 = delim(":");
+                  return $12((v1$3) => $62(
+                    state2$1,
+                    $12,
+                    $22,
+                    (v2$2, $72) => $32($ParseState(v2$2._1, v2$2._2, $52), $72),
+                    (state2$2, a$2) => $12((v2$2) => $12((v1$4) => opTree$lazy()(
+                      state2$2,
+                      $12,
+                      $22,
+                      (v2$3, $72) => $32($ParseState(v2$3._1, v2$3._2, $52), $72),
+                      (state2$3, a$3) => $12((v2$3) => {
+                        const $72 = delim(";");
+                        return $12((v1$5) => $72(
+                          state2$3,
+                          $12,
+                          $22,
+                          (v2$4, $82) => $32($ParseState(v2$4._1, v2$4._2, $52), $82),
+                          (state2$4, a$4) => $12((v2$4) => $42(state2$4, $VarDef2(a$1, a$3)))
+                        ));
+                      })
+                    )))
+                  ));
+                })
+              )))
+            ));
+          };
+          const $1 = context("letExpr")((state1, more, lift12, $$throw2, done) => more((v1) => varDef(
+            state1,
+            more,
+            lift12,
+            $$throw2,
+            (state2, a) => more((v2) => {
+              const $12 = manyRec2(varDef);
+              return more((v1$1) => $12(
                 state2,
                 more,
                 lift12,
                 $$throw2,
-                (state2$1, a$1) => more((v2$1) => {
-                  const $12 = reserved("for");
-                  return more((v1$2) => $12(
+                (state2$1, a$1) => more((v2$1) => more((v1$2) => opTree$lazy()(
+                  state2$1,
+                  more,
+                  lift12,
+                  $$throw2,
+                  (state2$2, a$2) => more((v2$2) => done(state2$2, $Expr2("Let", nonEmptyListNonEmptyList.nonEmpty($List("Cons", a, a$1)), a$2)))
+                )))
+              ));
+            })
+          )));
+          const $2 = reserved("def");
+          const recDef = (v1, $32, $42, $52, $62) => {
+            const $72 = v1._3;
+            return $32((v1$1) => $2(
+              v1,
+              $32,
+              $42,
+              (v2, $82) => $52($ParseState(v2._1, v2._2, $72), $82),
+              (state2, a) => $32((v2) => $32((v1$2) => variable(
+                state2,
+                $32,
+                $42,
+                (v2$1, $82) => $52($ParseState(v2$1._1, v2$1._2, $72), $82),
+                (state2$1, a$1) => $32((v2$1) => {
+                  const $82 = delim("(");
+                  return $32((v1$3) => $82(
                     state2$1,
-                    more,
-                    lift12,
-                    $$throw2,
-                    (state2$2, a$2) => more((v2$2) => {
-                      const $22 = delim("(");
-                      return more((v1$3) => $22(
+                    $32,
+                    $42,
+                    (v2$2, $9) => $52($ParseState(v2$2._1, v2$2._2, $72), $9),
+                    (state2$2, a$2) => $32((v2$2) => {
+                      const $9 = sepBy1(pattern)(lexeme(withErrorMessage(satisfy((v) => v === ","))("','")));
+                      return $32((v1$4) => $9(
                         state2$2,
-                        more,
-                        lift12,
-                        $$throw2,
-                        (state2$3, a$3) => more((v2$3) => more((v1$4) => variable(
-                          state2$3,
-                          more,
+                        $32,
+                        $42,
+                        (v2$3, $10) => $52($ParseState(v2$3._1, v2$3._2, $72), $10),
+                        (state2$3, a$3) => $32((v2$3) => {
+                          const $10 = delim(")");
+                          return $32((v1$5) => $10(
+                            state2$3,
+                            $32,
+                            $42,
+                            (v2$4, $11) => $52($ParseState(v2$4._1, v2$4._2, $72), $11),
+                            (state2$4, a$4) => $32((v2$4) => {
+                              const $11 = delim(":");
+                              return $32((v1$6) => $11(
+                                state2$4,
+                                $32,
+                                $42,
+                                (v2$5, $12) => $52($ParseState(v2$5._1, v2$5._2, $72), $12),
+                                (state2$5, a$5) => $32((v2$5) => $32((v1$7) => opTree$lazy()(
+                                  state2$5,
+                                  $32,
+                                  $42,
+                                  (v2$6, $12) => $52($ParseState(v2$6._1, v2$6._2, $72), $12),
+                                  (state2$6, a$6) => $32((v2$6) => {
+                                    const $12 = delim(";");
+                                    return $32((v1$8) => $12(
+                                      state2$6,
+                                      $32,
+                                      $42,
+                                      (v2$7, $13) => $52($ParseState(v2$7._1, v2$7._2, $72), $13),
+                                      (state2$7, a$7) => $32((v2$7) => $62(state2$7, $Tuple(a$1, $Tuple(a$3, a$6))))
+                                    ));
+                                  })
+                                )))
+                              ));
+                            })
+                          ));
+                        })
+                      ));
+                    })
+                  ));
+                })
+              )))
+            ));
+          };
+          const $3 = context("letRecExpr")((state1, more, lift12, $$throw2, done) => more((v1) => recDef(
+            state1,
+            more,
+            lift12,
+            $$throw2,
+            (state2, a) => more((v2) => {
+              const $32 = manyRec2(recDef);
+              return more((v1$1) => $32(
+                state2,
+                more,
+                lift12,
+                $$throw2,
+                (state2$1, a$1) => more((v2$1) => more((v1$2) => opTree$lazy()(
+                  state2$1,
+                  more,
+                  lift12,
+                  $$throw2,
+                  (state2$2, a$2) => more((v2$2) => done(state2$2, $Expr2("LetRec", nonEmptyListNonEmptyList.nonEmpty($List("Cons", a, a$1)), a$2)))
+                )))
+              ));
+            })
+          )));
+          const $4 = context("matrix")((state1, more, lift12, $$throw2, done) => more((v1) => {
+            const $42 = state1._3;
+            return lexeme(string2("[|"))(
+              state1,
+              more,
+              lift12,
+              (v2, $52) => $$throw2($ParseState(v2._1, v2._2, $42), $52),
+              (state2, a) => more((v2) => more((v1$1) => opTree$lazy()(
+                state2,
+                more,
+                lift12,
+                $$throw2,
+                (state2$1, a$1) => more((v2$1) => {
+                  const $52 = reserved("for");
+                  return more((v1$2) => $52(
+                    state2$1,
+                    more,
+                    lift12,
+                    $$throw2,
+                    (state2$2, a$2) => more((v2$2) => {
+                      const $62 = delim("(");
+                      return more((v1$3) => $62(
+                        state2$2,
+                        more,
+                        lift12,
+                        $$throw2,
+                        (state2$3, a$3) => more((v2$3) => more((v1$4) => variable(
+                          state2$3,
+                          more,
                           lift12,
                           $$throw2,
                           (state2$4, a$4) => more((v2$4) => {
-                            const $32 = delim(",");
-                            return more((v1$5) => $32(
+                            const $72 = delim(",");
+                            return more((v1$5) => $72(
                               state2$4,
                               more,
                               lift12,
@@ -21442,15 +21654,15 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
                                 lift12,
                                 $$throw2,
                                 (state2$6, a$6) => more((v2$6) => {
-                                  const $42 = delim(")");
-                                  return more((v1$7) => $42(
+                                  const $82 = delim(")");
+                                  return more((v1$7) => $82(
                                     state2$6,
                                     more,
                                     lift12,
                                     $$throw2,
                                     (state2$7, a$7) => more((v2$7) => {
-                                      const $52 = reserved("in");
-                                      return more((v1$8) => $52(
+                                      const $9 = reserved("in");
+                                      return more((v1$8) => $9(
                                         state2$7,
                                         more,
                                         lift12,
@@ -21483,98 +21695,98 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
               )))
             );
           }));
-          const $1 = context("listExpr")((() => {
-            const $12 = delim("[");
-            return (state1, more, lift12, $$throw2, done) => more((v1) => $12(
+          const $5 = context("listExpr")((() => {
+            const $52 = delim("[");
+            return (state1, more, lift12, $$throw2, done) => more((v1) => $52(
               state1,
               more,
               lift12,
               $$throw2,
               (state2, a) => more((v2) => {
-                const $22 = optionMaybe((v1$1, $23, $32, $42, $52) => {
-                  const $62 = v1$1._3;
-                  return opTree$lazy()(v1$1, $23, $32, (v2$1, $72) => $42($ParseState(v2$1._1, v2$1._2, $62), $72), $52);
+                const $62 = optionMaybe((v1$1, $63, $72, $82, $9) => {
+                  const $10 = v1$1._3;
+                  return opTree$lazy()(v1$1, $63, $72, (v2$1, $11) => $82($ParseState(v2$1._1, v2$1._2, $10), $11), $9);
                 });
-                return more((v1$1) => $22(
+                return more((v1$1) => $62(
                   state2,
                   more,
                   lift12,
                   $$throw2,
                   (state2$1, a$1) => more((v2$1) => {
                     if (a$1.tag === "Nothing") {
-                      const $32 = delim("]");
-                      return more((v1$2) => $32(state2$1, more, lift12, $$throw2, (state2$2, a$2) => more((v2$2) => done(state2$2, $Expr2("ListEmpty", void 0)))));
+                      const $72 = delim("]");
+                      return more((v1$2) => $72(state2$1, more, lift12, $$throw2, (state2$2, a$2) => more((v2$2) => done(state2$2, $Expr2("ListEmpty", void 0)))));
                     }
                     if (a$1.tag === "Just") {
-                      const $32 = a$1._1;
-                      const $42 = context("listEnum")((state1$1, more$1, lift1$1, throw$1, done$1) => more$1((v1$2) => {
-                        const $43 = state1$1._3;
+                      const $72 = a$1._1;
+                      const $82 = context("listEnum")((state1$1, more$1, lift1$1, throw$1, done$1) => more$1((v1$2) => {
+                        const $83 = state1$1._3;
                         return lexeme(string2(".."))(
                           state1$1,
                           more$1,
                           lift1$1,
-                          (v2$2, $53) => throw$1($ParseState(v2$2._1, v2$2._2, $43), $53),
+                          (v2$2, $92) => throw$1($ParseState(v2$2._1, v2$2._2, $83), $92),
                           (state2$2, a$2) => more$1((v2$2) => more$1((v1$3) => opTree$lazy()(
                             state2$2,
                             more$1,
                             lift1$1,
                             throw$1,
                             (state2$3, a$3) => more$1((v2$3) => {
-                              const $53 = delim("]");
-                              return more$1((v1$4) => $53(state2$3, more$1, lift1$1, throw$1, (state2$4, a$4) => more$1((v2$4) => done$1(state2$4, $Expr2("ListEnum", $32, a$3)))));
+                              const $92 = delim("]");
+                              return more$1((v1$4) => $92(state2$3, more$1, lift1$1, throw$1, (state2$4, a$4) => more$1((v2$4) => done$1(state2$4, $Expr2("ListEnum", $72, a$3)))));
                             })
                           )))
                         );
                       }));
-                      const $52 = context("listComp")((() => {
-                        const $53 = many1((() => {
-                          const $54 = reserved("if");
-                          const $63 = reserved("for");
-                          return (v2$2, $73, $82, $9, $10) => {
-                            const $11 = v2$2._1;
-                            const $122 = v2$2._2;
-                            return $73((v3) => {
-                              const $13 = (v4, $132) => {
-                                const $14 = v4._3;
-                                return $73((v5) => {
-                                  if ($14) {
-                                    return $9(v4, $132);
+                      const $9 = context("listComp")((() => {
+                        const $92 = many1((() => {
+                          const $93 = reserved("if");
+                          const $102 = reserved("for");
+                          return (v2$2, $112, $12, $13, $14) => {
+                            const $15 = v2$2._1;
+                            const $16 = v2$2._2;
+                            return $112((v3) => {
+                              const $17 = (v4, $172) => {
+                                const $18 = v4._3;
+                                return $112((v5) => {
+                                  if ($18) {
+                                    return $13(v4, $172);
                                   }
-                                  return $73((v1$2) => {
-                                    const $15 = v2$2._3;
-                                    return $63(
+                                  return $112((v1$2) => {
+                                    const $19 = v2$2._3;
+                                    return $102(
                                       v2$2,
-                                      $73,
-                                      $82,
-                                      (v2$3, $16) => $9($ParseState(v2$3._1, v2$3._2, $15), $16),
-                                      (state2$2, a$2) => $73((v2$3) => $73((v1$3) => pattern(
+                                      $112,
+                                      $12,
+                                      (v2$3, $20) => $13($ParseState(v2$3._1, v2$3._2, $19), $20),
+                                      (state2$2, a$2) => $112((v2$3) => $112((v1$3) => pattern(
                                         state2$2,
-                                        $73,
-                                        $82,
-                                        $9,
-                                        (state2$3, a$3) => $73((v2$4) => {
-                                          const $16 = reserved("in");
-                                          return $73((v1$4) => $16(
+                                        $112,
+                                        $12,
+                                        $13,
+                                        (state2$3, a$3) => $112((v2$4) => {
+                                          const $20 = reserved("in");
+                                          return $112((v1$4) => $20(
                                             state2$3,
-                                            $73,
-                                            $82,
-                                            $9,
-                                            (state2$4, a$4) => $73((v2$5) => {
-                                              const $17 = brackets(opTree$lazy());
-                                              const $18 = state2$4._1;
-                                              const $19 = state2$4._2;
-                                              return $73((v3$1) => $73((v1$5) => $17(
-                                                $ParseState($18, $19, false),
-                                                $73,
-                                                $82,
-                                                (v2$6, $20) => $73((v5$1) => $73((v1$6) => opTree$lazy()(
+                                            $112,
+                                            $12,
+                                            $13,
+                                            (state2$4, a$4) => $112((v2$5) => {
+                                              const $21 = brackets(opTree$lazy());
+                                              const $22 = state2$4._1;
+                                              const $23 = state2$4._2;
+                                              return $112((v3$1) => $112((v1$5) => $21(
+                                                $ParseState($22, $23, false),
+                                                $112,
+                                                $12,
+                                                (v2$6, $24) => $112((v5$1) => $112((v1$6) => opTree$lazy()(
                                                   state2$4,
-                                                  $73,
-                                                  $82,
-                                                  $9,
-                                                  (state2$5, a$5) => $73((v2$7) => $10(state2$5, $Qualifier("ListCompGen", a$3, a$5)))
+                                                  $112,
+                                                  $12,
+                                                  $13,
+                                                  (state2$5, a$5) => $112((v2$7) => $14(state2$5, $Qualifier("ListCompGen", a$3, a$5)))
                                                 ))),
-                                                (state2$5, a$5) => $73((v2$6) => $10(state2$5, $Qualifier("ListCompDecl", $VarDef2(a$3, a$5))))
+                                                (state2$5, a$5) => $112((v2$6) => $14(state2$5, $Qualifier("ListCompDecl", $VarDef2(a$3, a$5))))
                                               )));
                                             })
                                           ));
@@ -21584,111 +21796,111 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
                                   });
                                 });
                               };
-                              return $73((v1$2) => $54(
-                                $ParseState($11, $122, false),
-                                $73,
-                                $82,
-                                (v2$3, $14) => $13($ParseState(v2$3._1, v2$3._2, false), $14),
-                                (state2$2, a$2) => $73((v2$3) => $73((v1$3) => opTree$lazy()(
+                              return $112((v1$2) => $93(
+                                $ParseState($15, $16, false),
+                                $112,
+                                $12,
+                                (v2$3, $18) => $17($ParseState(v2$3._1, v2$3._2, false), $18),
+                                (state2$2, a$2) => $112((v2$3) => $112((v1$3) => opTree$lazy()(
                                   state2$2,
-                                  $73,
-                                  $82,
-                                  $13,
-                                  (state2$3, a$3) => $73((v2$4) => $10(state2$3, $Qualifier("ListCompGuard", a$3)))
+                                  $112,
+                                  $12,
+                                  $17,
+                                  (state2$3, a$3) => $112((v2$4) => $14(state2$3, $Qualifier("ListCompGuard", a$3)))
                                 )))
                               ));
                             });
                           };
                         })());
-                        return (state1$1, more$1, lift1$1, throw$1, done$1) => more$1((v1$2) => $53(
+                        return (state1$1, more$1, lift1$1, throw$1, done$1) => more$1((v1$2) => $92(
                           state1$1,
                           more$1,
                           lift1$1,
                           throw$1,
                           (state2$2, a$2) => more$1((v2$2) => {
-                            const $63 = delim("]");
-                            return more$1((v1$3) => $63(
+                            const $102 = delim("]");
+                            return more$1((v1$3) => $102(
                               state2$2,
                               more$1,
                               lift1$1,
                               throw$1,
-                              (state2$3, a$3) => more$1((v2$3) => done$1(state2$3, $Expr2("ListComp", void 0, $32, $List("Cons", a$2._1, a$2._2))))
+                              (state2$3, a$3) => more$1((v2$3) => done$1(state2$3, $Expr2("ListComp", void 0, $72, $List("Cons", a$2._1, a$2._2))))
                             ));
                           })
                         ));
                       })());
                       const listRest$lazy = binding(() => {
-                        const $63 = delim("]");
-                        const $73 = delim(",");
-                        return (v2$2, $82, $9, $10, $11) => {
-                          const $122 = v2$2._1;
-                          const $13 = v2$2._2;
-                          return $82((v3) => $82((v1$2) => $63(
-                            $ParseState($122, $13, false),
-                            $82,
-                            $9,
-                            (v4, $14) => {
-                              const $15 = v4._3;
-                              return $82((v5) => {
-                                if ($15) {
-                                  return $10(v4, $14);
+                        const $102 = delim("]");
+                        const $112 = delim(",");
+                        return (v2$2, $12, $13, $14, $15) => {
+                          const $16 = v2$2._1;
+                          const $17 = v2$2._2;
+                          return $12((v3) => $12((v1$2) => $102(
+                            $ParseState($16, $17, false),
+                            $12,
+                            $13,
+                            (v4, $18) => {
+                              const $19 = v4._3;
+                              return $12((v5) => {
+                                if ($19) {
+                                  return $14(v4, $18);
                                 }
-                                return $82((v1$3) => $73(
+                                return $12((v1$3) => $112(
                                   v2$2,
-                                  $82,
-                                  $9,
-                                  $10,
-                                  (state2$2, a$2) => $82((v2$3) => $82((v1$4) => opTree$lazy()(
+                                  $12,
+                                  $13,
+                                  $14,
+                                  (state2$2, a$2) => $12((v2$3) => $12((v1$4) => opTree$lazy()(
                                     state2$2,
-                                    $82,
-                                    $9,
-                                    $10,
-                                    (state2$3, a$3) => $82((v2$4) => $82((v1$5) => listRest$lazy()(
+                                    $12,
+                                    $13,
+                                    $14,
+                                    (state2$3, a$3) => $12((v2$4) => $12((v1$5) => listRest$lazy()(
                                       state2$3,
-                                      $82,
-                                      $9,
-                                      $10,
-                                      (state2$4, a$4) => $82((v2$5) => $11(state2$4, $ListRest("Next", void 0, a$3, a$4)))
+                                      $12,
+                                      $13,
+                                      $14,
+                                      (state2$4, a$4) => $12((v2$5) => $15(state2$4, $ListRest("Next", void 0, a$3, a$4)))
                                     )))
                                   )))
                                 ));
                               });
                             },
-                            (state2$2, a$2) => $82((v2$3) => $11(state2$2, $ListRest("End", void 0)))
+                            (state2$2, a$2) => $12((v2$3) => $15(state2$2, $ListRest("End", void 0)))
                           )));
                         };
                       });
                       const listRest = listRest$lazy();
-                      const $62 = state2$1._1;
-                      const $72 = state2$1._2;
-                      return more((v3) => $42(
-                        $ParseState($62, $72, false),
+                      const $10 = state2$1._1;
+                      const $11 = state2$1._2;
+                      return more((v3) => $82(
+                        $ParseState($10, $11, false),
                         more,
                         lift12,
-                        (v4, $82) => {
-                          const $9 = v4._3;
+                        (v4, $12) => {
+                          const $13 = v4._3;
                           return more((v5) => {
-                            if ($9) {
-                              return $$throw2(v4, $82);
+                            if ($13) {
+                              return $$throw2(v4, $12);
                             }
-                            const $10 = state2$1._1;
-                            const $11 = state2$1._2;
-                            return more((v3$1) => $52(
-                              $ParseState($10, $11, false),
+                            const $14 = state2$1._1;
+                            const $15 = state2$1._2;
+                            return more((v3$1) => $9(
+                              $ParseState($14, $15, false),
                               more,
                               lift12,
-                              (v4$1, $122) => {
-                                const $13 = v4$1._3;
+                              (v4$1, $16) => {
+                                const $17 = v4$1._3;
                                 return more((v5$1) => {
-                                  if ($13) {
-                                    return $$throw2(v4$1, $122);
+                                  if ($17) {
+                                    return $$throw2(v4$1, $16);
                                   }
                                   return more((v1$2) => listRest(
                                     state2$1,
                                     more,
                                     lift12,
                                     $$throw2,
-                                    (state2$2, a$2) => more((v2$2) => done(state2$2, $Expr2("ListNonEmpty", void 0, $32, a$2)))
+                                    (state2$2, a$2) => more((v2$2) => done(state2$2, $Expr2("ListNonEmpty", void 0, $72, a$2)))
                                   ));
                                 });
                               },
@@ -21705,25 +21917,25 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
               })
             ));
           })());
-          const $2 = context("lambda")((() => {
-            const $22 = reserved("lambda");
+          const $6 = context("lambda")((() => {
+            const $62 = reserved("lambda");
             return (state1, more, lift12, $$throw2, done) => more((v1) => {
-              const $32 = state1._3;
-              return $22(
+              const $72 = state1._3;
+              return $62(
                 state1,
                 more,
                 lift12,
-                (v2, $42) => $$throw2($ParseState(v2._1, v2._2, $32), $42),
+                (v2, $82) => $$throw2($ParseState(v2._1, v2._2, $72), $82),
                 (state2, a) => more((v2) => {
-                  const $42 = sepBy1(pattern)(lexeme(withErrorMessage(satisfy((v) => v === ","))("','")));
-                  return more((v1$1) => $42(
+                  const $82 = sepBy1(pattern)(lexeme(withErrorMessage(satisfy((v) => v === ","))("','")));
+                  return more((v1$1) => $82(
                     state2,
                     more,
                     lift12,
                     $$throw2,
                     (state2$1, a$1) => more((v2$1) => {
-                      const $52 = delim(":");
-                      return more((v1$2) => $52(
+                      const $9 = delim(":");
+                      return more((v1$2) => $9(
                         state2$1,
                         more,
                         lift12,
@@ -21745,516 +21957,558 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
               );
             });
           })());
-          const $3 = delim("[");
-          const $4 = VarKey();
-          const $5 = context("dict")((() => {
-            const $52 = delim("{");
-            return (state1, more, lift12, $$throw2, done) => more((v1) => $52(
-              state1,
-              more,
-              lift12,
-              $$throw2,
-              (state2, a) => more((v2) => {
-                const $62 = sepBy((state1$1, more$1, lift1$1, throw$1, done$1) => more$1((v1$1) => {
-                  const $63 = (state2$1, a$1) => more$1((v2$1) => {
-                    const $64 = lexeme(withErrorMessage(satisfy((v) => v === ":"))("':'"));
-                    return more$1((v1$2) => $64(
-                      state2$1,
-                      more$1,
-                      lift1$1,
-                      throw$1,
-                      (state2$2, a$2) => more$1((v2$2) => more$1((v1$3) => opTree$lazy()(
-                        state2$2,
+          const $7 = delim("[");
+          const $8 = (() => {
+            const $82 = VarKey();
+            const $9 = context("dict")((() => {
+              const $92 = delim("{");
+              return (state1, more, lift12, $$throw2, done) => more((v1) => $92(
+                state1,
+                more,
+                lift12,
+                $$throw2,
+                (state2, a) => more((v2) => {
+                  const $102 = sepBy((state1$1, more$1, lift1$1, throw$1, done$1) => more$1((v1$1) => {
+                    const $103 = (state2$1, a$1) => more$1((v2$1) => {
+                      const $104 = lexeme(withErrorMessage(satisfy((v) => v === ":"))("':'"));
+                      return more$1((v1$2) => $104(
+                        state2$1,
                         more$1,
                         lift1$1,
                         throw$1,
-                        (state2$3, a$3) => more$1((v2$3) => done$1(state2$3, $Tuple(a$1, a$3)))
-                      )))
-                    ));
-                  });
-                  const $72 = state1$1._1;
-                  const $82 = state1$1._2;
-                  return more$1((v3) => {
-                    const $9 = (v4, $92) => {
-                      const $10 = v4._3;
-                      return more$1((v5) => {
-                        if ($10) {
-                          return throw$1(v4, $92);
-                        }
-                        return more$1((v1$2) => variable(state1$1, more$1, lift1$1, throw$1, (state2$1, a$1) => more$1((v2$1) => $63(state2$1, $4(a$1)))));
-                      });
-                    };
-                    return more$1((v1$2) => $3(
-                      $ParseState($72, $82, false),
-                      more$1,
-                      lift1$1,
-                      $9,
-                      (state2$1, a$1) => more$1((v2$1) => more$1((v1$3) => opTree$lazy()(
-                        state2$1,
+                        (state2$2, a$2) => more$1((v2$2) => more$1((v1$3) => expr$lazy()(
+                          state2$2,
+                          more$1,
+                          lift1$1,
+                          throw$1,
+                          (state2$3, a$3) => more$1((v2$3) => done$1(state2$3, $Tuple(a$1, a$3)))
+                        )))
+                      ));
+                    });
+                    const $112 = state1$1._1;
+                    const $12 = state1$1._2;
+                    return more$1((v3) => {
+                      const $13 = (v4, $132) => {
+                        const $14 = v4._3;
+                        return more$1((v5) => {
+                          if ($14) {
+                            return throw$1(v4, $132);
+                          }
+                          return more$1((v1$2) => variable(state1$1, more$1, lift1$1, throw$1, (state2$1, a$1) => more$1((v2$1) => $103(state2$1, $82(a$1)))));
+                        });
+                      };
+                      return more$1((v1$2) => $7(
+                        $ParseState($112, $12, false),
                         more$1,
                         lift1$1,
-                        $9,
-                        (state2$2, a$2) => more$1((v2$2) => {
-                          const $10 = delim("]");
-                          return more$1((v1$4) => $10(state2$2, more$1, lift1$1, $9, (state2$3, a$3) => more$1((v2$3) => $63(state2$3, $DictEntry("ExprKey", a$2)))));
-                        })
-                      )))
-                    ));
-                  });
-                }))(lexeme(withErrorMessage(satisfy((v) => v === ","))("','")));
-                return more((v1$1) => $62(
-                  state2,
-                  more,
-                  lift12,
-                  $$throw2,
-                  (state2$1, a$1) => more((v2$1) => more((v1$2) => whitespace(
-                    state2$1,
+                        $13,
+                        (state2$1, a$1) => more$1((v2$1) => more$1((v1$3) => opTree$lazy()(
+                          state2$1,
+                          more$1,
+                          lift1$1,
+                          $13,
+                          (state2$2, a$2) => more$1((v2$2) => {
+                            const $14 = delim("]");
+                            return more$1((v1$4) => $14(state2$2, more$1, lift1$1, $13, (state2$3, a$3) => more$1((v2$3) => $103(state2$3, $DictEntry("ExprKey", a$2)))));
+                          })
+                        )))
+                      ));
+                    });
+                  }))(lexeme(withErrorMessage(satisfy((v) => v === ","))("','")));
+                  return more((v1$1) => $102(
+                    state2,
                     more,
                     lift12,
                     $$throw2,
-                    (state2$2, a$2) => more((v2$2) => {
-                      const $72 = delim("}");
-                      return more((v1$3) => $72(state2$2, more, lift12, $$throw2, (state2$3, a$3) => more((v2$3) => done(state2$3, $Expr2("Dictionary", void 0, a$1)))));
-                    })
-                  )))
-                ));
-              })
-            ));
-          })());
-          const $6 = Float();
-          const $7 = Int();
-          const $8 = (() => {
-            const $82 = some(alternativeParserT)(lazyParserT)(satisfy((c) => c !== '"' && c !== "$" && !isSpace(toCharCode(c))));
-            const $9 = (() => {
-              const $92 = delim("$");
-              const $10 = (() => {
-                const $102 = Str();
-                const $11 = context("pair")((() => {
-                  const $112 = delim("(");
-                  return (state1, more, lift12, $$throw2, done) => more((v1) => {
-                    const $122 = state1._3;
-                    return more((v1$1) => $112(
-                      state1,
+                    (state2$1, a$1) => more((v2$1) => more((v1$2) => whitespace(
+                      state2$1,
                       more,
                       lift12,
-                      (v2, $132) => $$throw2($ParseState(v2._1, v2._2, $122), $132),
-                      (state2, a) => more((v2) => more((v1$2) => opTree$lazy()(
-                        state2,
-                        more,
-                        lift12,
-                        (v2$1, $132) => $$throw2($ParseState(v2$1._1, v2$1._2, $122), $132),
-                        (state2$1, a$1) => more((v2$1) => {
-                          const $132 = delim(",");
-                          return more((v1$3) => $132(
-                            state2$1,
+                      $$throw2,
+                      (state2$2, a$2) => more((v2$2) => {
+                        const $112 = delim("}");
+                        return more((v1$3) => $112(state2$2, more, lift12, $$throw2, (state2$3, a$3) => more((v2$3) => done(state2$3, $Expr2("Dictionary", void 0, a$1)))));
+                      })
+                    )))
+                  ));
+                })
+              ));
+            })());
+            const $10 = Float();
+            const $11 = (() => {
+              const $112 = Int();
+              const $12 = (() => {
+                const $122 = some(alternativeParserT)(lazyParserT)(satisfy((c) => c !== '"' && c !== "$" && !isSpace(toCharCode(c))));
+                const $13 = (() => {
+                  const $132 = delim("$");
+                  const $14 = (() => {
+                    const $142 = Str();
+                    const $15 = context("pair")((() => {
+                      const $152 = delim("(");
+                      return (state1, more, lift12, $$throw2, done) => more((v1) => {
+                        const $162 = state1._3;
+                        return more((v1$1) => $152(
+                          state1,
+                          more,
+                          lift12,
+                          (v2, $172) => $$throw2($ParseState(v2._1, v2._2, $162), $172),
+                          (state2, a) => more((v2) => more((v1$2) => opTree$lazy()(
+                            state2,
                             more,
                             lift12,
-                            (v2$2, $14) => $$throw2($ParseState(v2$2._1, v2$2._2, $122), $14),
-                            (state2$2, a$2) => more((v2$2) => more((v2$3) => more((v1$4) => opTree$lazy()(
-                              state2$2,
-                              more,
-                              lift12,
-                              $$throw2,
-                              (state2$3, a$3) => more((v2$4) => {
-                                const $14 = delim(")");
-                                return more((v1$5) => $14(
-                                  state2$3,
+                            (v2$1, $172) => $$throw2($ParseState(v2$1._1, v2$1._2, $162), $172),
+                            (state2$1, a$1) => more((v2$1) => {
+                              const $172 = delim(",");
+                              return more((v1$3) => $172(
+                                state2$1,
+                                more,
+                                lift12,
+                                (v2$2, $18) => $$throw2($ParseState(v2$2._1, v2$2._2, $162), $18),
+                                (state2$2, a$2) => more((v2$2) => more((v2$3) => more((v1$4) => opTree$lazy()(
+                                  state2$2,
                                   more,
                                   lift12,
                                   $$throw2,
-                                  (state2$4, a$4) => more((v2$5) => done(
-                                    state2$4,
-                                    $Expr2("Constr", void 0, "Pair", $List("Cons", a$1, $List("Cons", a$3, Nil)))
-                                  ))
-                                ));
-                              })
-                            ))))
-                          ));
-                        })
-                      )))
-                    ));
-                  });
-                })());
-                const args = (e) => {
-                  const $122 = delim("(");
-                  return (state1, more, lift12, $$throw2, done) => more((v1) => {
-                    const $132 = state1._3;
-                    return more((v1$1) => $122(
-                      state1,
-                      more,
-                      lift12,
-                      (v2, $14) => $$throw2($ParseState(v2._1, v2._2, $132), $14),
-                      (state2, a) => more((v2) => sameLine(
-                        state2,
-                        more,
-                        lift12,
-                        (v2$1, $14) => $$throw2($ParseState(v2$1._1, v2$1._2, $132), $14),
-                        (state2$1, a$1) => more((v2$1) => {
-                          const $14 = sepBy(opTree$lazy())(lexeme(withErrorMessage(satisfy((v) => v === ","))("','")));
-                          return more((v1$2) => $14(
-                            state2$1,
+                                  (state2$3, a$3) => more((v2$4) => {
+                                    const $18 = delim(")");
+                                    return more((v1$5) => $18(
+                                      state2$3,
+                                      more,
+                                      lift12,
+                                      $$throw2,
+                                      (state2$4, a$4) => more((v2$5) => done(
+                                        state2$4,
+                                        $Expr2("Constr", void 0, "Pair", $List("Cons", a$1, $List("Cons", a$3, Nil)))
+                                      ))
+                                    ));
+                                  })
+                                ))))
+                              ));
+                            })
+                          )))
+                        ));
+                      });
+                    })());
+                    const args = (e) => {
+                      const $162 = delim("(");
+                      return (state1, more, lift12, $$throw2, done) => more((v1) => {
+                        const $172 = state1._3;
+                        return more((v1$1) => $162(
+                          state1,
+                          more,
+                          lift12,
+                          (v2, $18) => $$throw2($ParseState(v2._1, v2._2, $172), $18),
+                          (state2, a) => more((v2) => sameLine(
+                            state2,
                             more,
                             lift12,
-                            $$throw2,
-                            (state2$2, a$2) => more((v2$2) => {
-                              const $15 = delim(")");
-                              return more((v1$3) => $15(
-                                state2$2,
+                            (v2$1, $18) => $$throw2($ParseState(v2$1._1, v2$1._2, $172), $18),
+                            (state2$1, a$1) => more((v2$1) => {
+                              const $18 = sepBy(opTree$lazy())(lexeme(withErrorMessage(satisfy((v) => v === ","))("','")));
+                              return more((v1$2) => $18(
+                                state2$1,
                                 more,
                                 lift12,
                                 $$throw2,
-                                (state2$3, a$3) => more((v2$3) => {
-                                  if (e.tag === "Constr") {
-                                    return app($Expr2(
-                                      "Constr",
-                                      e._1,
-                                      e._2,
-                                      foldableList.foldr(Cons)(foldableList.foldr(Cons)(Nil)(a$2))(e._3)
-                                    ))(state2$3, more, lift12, $$throw2, done);
-                                  }
-                                  return app((() => {
-                                    const go = (go$a0$copy) => (go$a1$copy) => {
-                                      let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
-                                      while (go$c) {
-                                        const b = go$a0, v = go$a1;
-                                        if (v.tag === "Nil") {
-                                          go$c = false;
-                                          go$r = b;
-                                          continue;
-                                        }
-                                        if (v.tag === "Cons") {
-                                          go$a0 = $Expr2("App", b, v._1);
-                                          go$a1 = v._2;
-                                          continue;
-                                        }
-                                        fail();
+                                (state2$2, a$2) => more((v2$2) => {
+                                  const $19 = delim(")");
+                                  return more((v1$3) => $19(
+                                    state2$2,
+                                    more,
+                                    lift12,
+                                    $$throw2,
+                                    (state2$3, a$3) => more((v2$3) => {
+                                      if (e.tag === "Constr") {
+                                        return app($Expr2(
+                                          "Constr",
+                                          e._1,
+                                          e._2,
+                                          foldableList.foldr(Cons)(foldableList.foldr(Cons)(Nil)(a$2))(e._3)
+                                        ))(state2$3, more, lift12, $$throw2, done);
                                       }
-                                      return go$r;
-                                    };
-                                    return go(e)(a$2);
-                                  })())(state2$3, more, lift12, $$throw2, done);
+                                      return app((() => {
+                                        const go = (go$a0$copy) => (go$a1$copy) => {
+                                          let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
+                                          while (go$c) {
+                                            const b = go$a0, v = go$a1;
+                                            if (v.tag === "Nil") {
+                                              go$c = false;
+                                              go$r = b;
+                                              continue;
+                                            }
+                                            if (v.tag === "Cons") {
+                                              go$a0 = $Expr2("App", b, v._1);
+                                              go$a1 = v._2;
+                                              continue;
+                                            }
+                                            fail();
+                                          }
+                                          return go$r;
+                                        };
+                                        return go(e)(a$2);
+                                      })())(state2$3, more, lift12, $$throw2, done);
+                                    })
+                                  ));
                                 })
                               ));
                             })
-                          ));
-                        })
-                      ))
-                    ));
-                  });
-                };
-                const app = (e) => {
-                  const $122 = args(e);
-                  return (v2, $132, $14, $15, $16) => {
-                    const $17 = v2._1;
-                    const $18 = v2._2;
-                    return $132((v3) => {
-                      const $19 = (v4, $192) => {
-                        const $20 = v4._3;
-                        return $132((v5) => {
-                          if ($20) {
-                            return $15(v4, $192);
-                          }
-                          return $16(v2, e);
-                        });
-                      };
-                      return $132((v2$1) => $132((v1) => sameLine(
-                        $ParseState($17, $18, false),
-                        $132,
-                        $14,
-                        $19,
-                        (state2, a) => $132((v2$2) => $132((v3$1) => $122(state2, $132, $14, $19, (state3, a$1) => $132((v4) => $16(state3, a$1)))))
-                      )));
-                    });
-                  };
-                };
-                const $12 = context("app chain")(withPos((() => {
-                  const $122 = Constr2();
-                  const $132 = context("parens op")((() => {
-                    const $133 = delim("(");
-                    return (state1, more, lift12, $$throw2, done) => more((v1) => $133(
-                      state1,
-                      more,
-                      lift12,
-                      $$throw2,
-                      (state2, a) => more((v2) => more((v1$1) => operator(
-                        state2,
-                        more,
-                        lift12,
-                        $$throw2,
-                        (state2$1, a$1) => more((v2$1) => {
-                          const $14 = delim(")");
-                          return more((v1$2) => $14(state2$1, more, lift12, $$throw2, (state2$2, a$2) => more((v2$2) => done(state2$2, $Expr2("Op", a$1)))));
-                        })
-                      )))
-                    ));
-                  })());
-                  return (state1, more, lift12, $$throw2, done) => more((v1) => {
-                    const $14 = state1._1;
-                    const $15 = state1._2;
-                    return more((v3) => more((v1$1) => variable(
-                      $ParseState($14, $15, false),
-                      more,
-                      lift12,
-                      (v4, $16) => {
-                        const $17 = v4._3;
-                        return more((v5) => {
-                          if ($17) {
-                            return $$throw2(v4, $16);
-                          }
-                          const $18 = state1._1;
-                          const $19 = state1._2;
-                          return more((v3$1) => more((v1$2) => constructor(
-                            $ParseState($18, $19, false),
-                            more,
-                            lift12,
-                            (v4$1, $20) => {
-                              const $21 = v4$1._3;
-                              return more((v5$1) => {
-                                if ($21) {
-                                  return $$throw2(v4$1, $20);
-                                }
-                                const $22 = state1._1;
-                                const $23 = state1._2;
-                                return more((v3$2) => parensExpr(
-                                  $ParseState($22, $23, false),
-                                  more,
-                                  lift12,
-                                  (v2, $24) => more((v5$2) => {
-                                    const $25 = state1._3;
-                                    return $132(
-                                      state1,
-                                      more,
-                                      lift12,
-                                      (v2$1, $26) => $$throw2($ParseState(v2$1._1, v2$1._2, $25), $26),
-                                      (state2, a) => more((v2$1) => app(a)(state2, more, lift12, $$throw2, done))
-                                    );
-                                  }),
-                                  (state2, a) => more((v2) => app(a)(state2, more, lift12, $$throw2, done))
-                                ));
-                              });
-                            },
-                            (state2, a) => more((v2) => {
-                              const $20 = $122(a)(Nil);
-                              return more((v2$1) => app($20)(state2, more, lift12, $$throw2, done));
-                            })
+                          ))
+                        ));
+                      });
+                    };
+                    const app = (e) => {
+                      const $162 = args(e);
+                      return (v2, $172, $18, $19, $20) => {
+                        const $21 = v2._1;
+                        const $22 = v2._2;
+                        return $172((v3) => {
+                          const $23 = (v4, $232) => {
+                            const $24 = v4._3;
+                            return $172((v5) => {
+                              if ($24) {
+                                return $19(v4, $232);
+                              }
+                              return $20(v2, e);
+                            });
+                          };
+                          return $172((v2$1) => $172((v1) => sameLine(
+                            $ParseState($21, $22, false),
+                            $172,
+                            $18,
+                            $23,
+                            (state2, a) => $172((v2$2) => $172((v3$1) => $162(state2, $172, $18, $23, (state3, a$1) => $172((v4) => $20(state3, a$1)))))
                           )));
                         });
-                      },
-                      (state2, a) => more((v2) => more((v2$1) => app($Expr2("Var", a))(state2, more, lift12, $$throw2, done)))
-                    )));
-                  });
-                })()));
-                const $13 = (() => {
-                  const $132 = withErrorMessage(context("doc expr")((state1, more, lift12, $$throw2, done) => more((v1) => {
-                    const $133 = state1._3;
-                    return lexeme(string2("@doc"))(
-                      state1,
-                      more,
-                      lift12,
-                      (v2, $14) => $$throw2($ParseState(v2._1, v2._2, $133), $14),
-                      (state2, a) => more((v2) => {
-                        const $14 = delim("(");
-                        return more((v1$1) => $14(
-                          state2,
+                      };
+                    };
+                    const $16 = context("app chain")(withPos((() => {
+                      const $162 = Constr2();
+                      const $172 = context("parens op")((() => {
+                        const $173 = delim("(");
+                        return (state1, more, lift12, $$throw2, done) => more((v1) => $173(
+                          state1,
                           more,
                           lift12,
                           $$throw2,
-                          (state2$1, a$1) => more((v2$1) => more((v1$2) => opTree$lazy()(
-                            state2$1,
+                          (state2, a) => more((v2) => more((v1$1) => operator(
+                            state2,
                             more,
                             lift12,
                             $$throw2,
-                            (state2$2, a$2) => more((v2$2) => {
-                              const $15 = delim(")");
-                              return more((v1$3) => $15(
-                                state2$2,
-                                more,
-                                lift12,
-                                $$throw2,
-                                (state2$3, a$3) => more((v2$3) => more((v1$4) => opTree$lazy()(
-                                  state2$3,
-                                  more,
-                                  lift12,
-                                  $$throw2,
-                                  (state2$4, a$4) => more((v2$4) => done(state2$4, $Expr2("DocExpr", a$2, a$4)))
-                                )))
-                              ));
+                            (state2$1, a$1) => more((v2$1) => {
+                              const $18 = delim(")");
+                              return more((v1$2) => $18(state2$1, more, lift12, $$throw2, (state2$2, a$2) => more((v2$2) => done(state2$2, $Expr2("Op", a$1)))));
                             })
                           )))
                         ));
-                      })
-                    );
-                  })))("simple expression");
-                  return (v2, $14, $15, $16, $17) => {
-                    const $18 = v2._1;
-                    const $19 = v2._2;
-                    return $14((v3) => $14((v3$1) => $14((v1) => $$float(
-                      $ParseState($18, $19, false),
-                      $14,
-                      $15,
-                      (v2$1, $20) => $14((v5) => $14((v1$1) => integer(
-                        $ParseState($18, $19, false),
-                        $14,
-                        $15,
-                        (v4, $21) => {
-                          const $22 = v4._3;
-                          return $14((v5$1) => {
-                            if ($22) {
-                              return $16(v4, $21);
-                            }
-                            const $23 = v2._1;
-                            const $24 = v2._2;
-                            return $14((v3$2) => {
-                              const $25 = (v4$1, $252) => {
-                                const $26 = v4$1._3;
-                                return $14((v5$2) => {
-                                  if ($26) {
-                                    return $16(v4$1, $252);
-                                  }
-                                  const $27 = v2._1;
-                                  const $28 = v2._2;
-                                  return $14((v3$3) => $14((v1$2) => stringLiteral(
+                      })());
+                      return (state1, more, lift12, $$throw2, done) => more((v1) => {
+                        const $18 = state1._1;
+                        const $19 = state1._2;
+                        return more((v3) => more((v1$1) => variable(
+                          $ParseState($18, $19, false),
+                          more,
+                          lift12,
+                          (v4, $20) => {
+                            const $21 = v4._3;
+                            return more((v5) => {
+                              if ($21) {
+                                return $$throw2(v4, $20);
+                              }
+                              const $22 = state1._1;
+                              const $23 = state1._2;
+                              return more((v3$1) => more((v1$2) => constructor(
+                                $ParseState($22, $23, false),
+                                more,
+                                lift12,
+                                (v4$1, $24) => {
+                                  const $25 = v4$1._3;
+                                  return more((v5$1) => {
+                                    if ($25) {
+                                      return $$throw2(v4$1, $24);
+                                    }
+                                    const $26 = state1._1;
+                                    const $27 = state1._2;
+                                    return more((v3$2) => parensExpr(
+                                      $ParseState($26, $27, false),
+                                      more,
+                                      lift12,
+                                      (v2, $28) => more((v5$2) => {
+                                        const $29 = state1._3;
+                                        return $172(
+                                          state1,
+                                          more,
+                                          lift12,
+                                          (v2$1, $30) => $$throw2($ParseState(v2$1._1, v2$1._2, $29), $30),
+                                          (state2, a) => more((v2$1) => app(a)(state2, more, lift12, $$throw2, done))
+                                        );
+                                      }),
+                                      (state2, a) => more((v2) => app(a)(state2, more, lift12, $$throw2, done))
+                                    ));
+                                  });
+                                },
+                                (state2, a) => more((v2) => {
+                                  const $24 = $162(a)(Nil);
+                                  return more((v2$1) => app($24)(state2, more, lift12, $$throw2, done));
+                                })
+                              )));
+                            });
+                          },
+                          (state2, a) => more((v2) => more((v2$1) => app($Expr2("Var", a))(state2, more, lift12, $$throw2, done)))
+                        )));
+                      });
+                    })()));
+                    const $17 = (() => {
+                      const $172 = withErrorMessage(context("doc expr")((state1, more, lift12, $$throw2, done) => more((v1) => {
+                        const $173 = state1._3;
+                        return lexeme(string2("@doc"))(
+                          state1,
+                          more,
+                          lift12,
+                          (v2, $18) => $$throw2($ParseState(v2._1, v2._2, $173), $18),
+                          (state2, a) => more((v2) => {
+                            const $18 = delim("(");
+                            return more((v1$1) => $18(
+                              state2,
+                              more,
+                              lift12,
+                              $$throw2,
+                              (state2$1, a$1) => more((v2$1) => more((v1$2) => opTree$lazy()(
+                                state2$1,
+                                more,
+                                lift12,
+                                $$throw2,
+                                (state2$2, a$2) => more((v2$2) => {
+                                  const $19 = delim(")");
+                                  return more((v1$3) => $19(
+                                    state2$2,
+                                    more,
+                                    lift12,
+                                    $$throw2,
+                                    (state2$3, a$3) => more((v2$3) => more((v1$4) => opTree$lazy()(
+                                      state2$3,
+                                      more,
+                                      lift12,
+                                      $$throw2,
+                                      (state2$4, a$4) => more((v2$4) => done(state2$4, $Expr2("DocExpr", a$2, a$4)))
+                                    )))
+                                  ));
+                                })
+                              )))
+                            ));
+                          })
+                        );
+                      })))("simple expression");
+                      return (v2, $18, $19, $20, $21) => {
+                        const $22 = v2._1;
+                        const $23 = v2._2;
+                        return $18((v3) => $18((v3$1) => $18((v1) => $$float(
+                          $ParseState($22, $23, false),
+                          $18,
+                          $19,
+                          (v2$1, $24) => $18((v5) => $18((v1$1) => integer(
+                            $ParseState($22, $23, false),
+                            $18,
+                            $19,
+                            (v4, $25) => {
+                              const $26 = v4._3;
+                              return $18((v5$1) => {
+                                if ($26) {
+                                  return $20(v4, $25);
+                                }
+                                const $27 = v2._1;
+                                const $28 = v2._2;
+                                return $18((v3$2) => {
+                                  const $29 = (v4$1, $292) => {
+                                    const $30 = v4$1._3;
+                                    return $18((v5$2) => {
+                                      if ($30) {
+                                        return $20(v4$1, $292);
+                                      }
+                                      const $31 = v2._1;
+                                      const $32 = v2._2;
+                                      return $18((v3$3) => $18((v1$2) => stringLiteral(
+                                        $ParseState($31, $32, false),
+                                        $18,
+                                        $19,
+                                        (v4$2, $33) => {
+                                          const $34 = v4$2._3;
+                                          return $18((v5$3) => {
+                                            if ($34) {
+                                              return $20(v4$2, $33);
+                                            }
+                                            const $35 = v2._1;
+                                            const $36 = v2._2;
+                                            return $18((v3$4) => $15(
+                                              $ParseState($35, $36, false),
+                                              $18,
+                                              $19,
+                                              (v4$3, $37) => {
+                                                const $38 = v4$3._3;
+                                                return $18((v5$4) => {
+                                                  if ($38) {
+                                                    return $20(v4$3, $37);
+                                                  }
+                                                  const $39 = v2._1;
+                                                  const $40 = v2._2;
+                                                  return $18((v3$5) => $16(
+                                                    $ParseState($39, $40, false),
+                                                    $18,
+                                                    $19,
+                                                    (v4$4, $41) => {
+                                                      const $42 = v4$4._3;
+                                                      return $18((v5$5) => {
+                                                        if ($42) {
+                                                          return $20(v4$4, $41);
+                                                        }
+                                                        const $43 = v2._1;
+                                                        const $44 = v2._2;
+                                                        return $18((v3$6) => parensExpr(
+                                                          $ParseState($43, $44, false),
+                                                          $18,
+                                                          $19,
+                                                          (v4$5, $45) => {
+                                                            const $46 = v4$5._3;
+                                                            return $18((v5$6) => {
+                                                              if ($46) {
+                                                                return $20(v4$5, $45);
+                                                              }
+                                                              return $172(v2, $18, $19, $20, $21);
+                                                            });
+                                                          },
+                                                          $21
+                                                        ));
+                                                      });
+                                                    },
+                                                    $21
+                                                  ));
+                                                });
+                                              },
+                                              $21
+                                            ));
+                                          });
+                                        },
+                                        (state2, a) => $18((v2$2) => $21(state2, $142(a)))
+                                      )));
+                                    });
+                                  };
+                                  return $18((v1$2) => lexeme(string2('"""'))(
                                     $ParseState($27, $28, false),
-                                    $14,
-                                    $15,
-                                    (v4$2, $29) => {
-                                      const $30 = v4$2._3;
-                                      return $14((v5$3) => {
-                                        if ($30) {
-                                          return $16(v4$2, $29);
-                                        }
-                                        const $31 = v2._1;
-                                        const $32 = v2._2;
-                                        return $14((v3$4) => $11(
-                                          $ParseState($31, $32, false),
-                                          $14,
-                                          $15,
-                                          (v4$3, $33) => {
-                                            const $34 = v4$3._3;
-                                            return $14((v5$4) => {
-                                              if ($34) {
-                                                return $16(v4$3, $33);
+                                    $18,
+                                    $19,
+                                    (v2$2, $30) => $29($ParseState(v2$2._1, v2$2._2, false), $30),
+                                    (state2, a) => $18((v2$2) => {
+                                      const $30 = manyRec2(lexeme((v2$3, $302, $31, $32, $33) => {
+                                        const $34 = v2$3._1;
+                                        const $35 = v2$3._2;
+                                        return $302((v3$3) => $302((v1$3) => $122(
+                                          $ParseState($34, $35, false),
+                                          $302,
+                                          $31,
+                                          (v4$1, $36) => {
+                                            const $37 = v4$1._3;
+                                            return $302((v5$2) => {
+                                              if ($37) {
+                                                return $32(v4$1, $36);
                                               }
-                                              const $35 = v2._1;
-                                              const $36 = v2._2;
-                                              return $14((v3$5) => $12(
-                                                $ParseState($35, $36, false),
-                                                $14,
-                                                $15,
-                                                (v4$4, $37) => {
-                                                  const $38 = v4$4._3;
-                                                  return $14((v5$5) => {
-                                                    if ($38) {
-                                                      return $16(v4$4, $37);
-                                                    }
-                                                    const $39 = v2._1;
-                                                    const $40 = v2._2;
-                                                    return $14((v3$6) => parensExpr(
-                                                      $ParseState($39, $40, false),
-                                                      $14,
-                                                      $15,
-                                                      (v4$5, $41) => {
-                                                        const $42 = v4$5._3;
-                                                        return $14((v5$6) => {
-                                                          if ($42) {
-                                                            return $16(v4$5, $41);
-                                                          }
-                                                          return $132(v2, $14, $15, $16, $17);
-                                                        });
-                                                      },
-                                                      $17
-                                                    ));
-                                                  });
-                                                },
-                                                $17
+                                              return $302((v1$4) => $132(
+                                                v2$3,
+                                                $302,
+                                                $31,
+                                                $32,
+                                                (state2$1, a$1) => $302((v2$4) => {
+                                                  const $38 = delim("{");
+                                                  return $302((v1$5) => $38(
+                                                    state2$1,
+                                                    $302,
+                                                    $31,
+                                                    $32,
+                                                    (state2$2, a$2) => $302((v2$5) => $302((v1$6) => opTree$lazy()(
+                                                      state2$2,
+                                                      $302,
+                                                      $31,
+                                                      $32,
+                                                      (state2$3, a$3) => $302((v2$6) => {
+                                                        const $39 = delim("}");
+                                                        return $302((v1$7) => $39(
+                                                          state2$3,
+                                                          $302,
+                                                          $31,
+                                                          $32,
+                                                          (state2$4, a$4) => $302((v2$7) => $33(state2$4, $ParagraphElem("Unquote", a$3)))
+                                                        ));
+                                                      })
+                                                    )))
+                                                  ));
+                                                })
                                               ));
                                             });
                                           },
-                                          $17
-                                        ));
-                                      });
-                                    },
-                                    (state2, a) => $14((v2$2) => $17(state2, $102(a)))
-                                  )));
-                                });
-                              };
-                              return $14((v1$2) => lexeme(string2('"""'))(
-                                $ParseState($23, $24, false),
-                                $14,
-                                $15,
-                                (v2$2, $26) => $25($ParseState(v2$2._1, v2$2._2, false), $26),
-                                (state2, a) => $14((v2$2) => {
-                                  const $26 = manyRec2(lexeme((v2$3, $262, $27, $28, $29) => {
-                                    const $30 = v2$3._1;
-                                    const $31 = v2$3._2;
-                                    return $262((v3$3) => $262((v1$3) => $82(
-                                      $ParseState($30, $31, false),
-                                      $262,
-                                      $27,
-                                      (v4$1, $32) => {
-                                        const $33 = v4$1._3;
-                                        return $262((v5$2) => {
-                                          if ($33) {
-                                            return $28(v4$1, $32);
-                                          }
-                                          return $262((v1$4) => $92(
-                                            v2$3,
-                                            $262,
-                                            $27,
-                                            $28,
-                                            (state2$1, a$1) => $262((v2$4) => {
-                                              const $34 = delim("{");
-                                              return $262((v1$5) => $34(
-                                                state2$1,
-                                                $262,
-                                                $27,
-                                                $28,
-                                                (state2$2, a$2) => $262((v2$5) => $262((v1$6) => opTree$lazy()(
-                                                  state2$2,
-                                                  $262,
-                                                  $27,
-                                                  $28,
-                                                  (state2$3, a$3) => $262((v2$6) => {
-                                                    const $35 = delim("}");
-                                                    return $262((v1$7) => $35(
-                                                      state2$3,
-                                                      $262,
-                                                      $27,
-                                                      $28,
-                                                      (state2$4, a$4) => $262((v2$7) => $29(state2$4, $ParagraphElem("Unquote", a$3)))
-                                                    ));
-                                                  })
-                                                )))
-                                              ));
-                                            })
-                                          ));
-                                        });
-                                      },
-                                      (state2$1, a$1) => $262((v2$4) => $29(state2$1, $ParagraphElem("Token", fromCharArray(a$1))))
-                                    )));
-                                  }));
-                                  return $14((v1$3) => $26(
-                                    state2,
-                                    $14,
-                                    $15,
-                                    $25,
-                                    (state2$1, a$1) => $14((v2$3) => $14((v1$4) => lexeme(string2('"""'))(
-                                      state2$1,
-                                      $14,
-                                      $15,
-                                      $25,
-                                      (state2$2, a$2) => $14((v2$4) => $17(state2$2, $Expr2("Paragraph", a$1)))
-                                    )))
+                                          (state2$1, a$1) => $302((v2$4) => $33(state2$1, $ParagraphElem("Token", fromCharArray(a$1))))
+                                        )));
+                                      }));
+                                      return $18((v1$3) => $30(
+                                        state2,
+                                        $18,
+                                        $19,
+                                        $29,
+                                        (state2$1, a$1) => $18((v2$3) => $18((v1$4) => lexeme(string2('"""'))(
+                                          state2$1,
+                                          $18,
+                                          $19,
+                                          $29,
+                                          (state2$2, a$2) => $18((v2$4) => $21(state2$2, $Expr2("Paragraph", a$1)))
+                                        )))
+                                      ));
+                                    })
                                   ));
-                                })
-                              ));
-                            });
+                                });
+                              });
+                            },
+                            (state2, a) => $18((v2$2) => $21(state2, $112(a)))
+                          ))),
+                          (state2, a) => $18((v2$1) => $21(state2, $10(a)))
+                        ))));
+                      };
+                    })();
+                    return (v2, $18, $19, $20, $21) => {
+                      const $22 = v2._1;
+                      const $23 = v2._2;
+                      return $18((v3) => $9(
+                        $ParseState($22, $23, false),
+                        $18,
+                        $19,
+                        (v4, $24) => {
+                          const $25 = v4._3;
+                          return $18((v5) => {
+                            if ($25) {
+                              return $20(v4, $24);
+                            }
+                            return $17(v2, $18, $19, $20, $21);
                           });
                         },
-                        (state2, a) => $14((v2$2) => $17(state2, $7(a)))
-                      ))),
-                      (state2, a) => $14((v2$1) => $17(state2, $6(a)))
-                    ))));
+                        $21
+                      ));
+                    };
+                  })();
+                  return (v2, $15, $16, $17, $18) => {
+                    const $19 = v2._1;
+                    const $20 = v2._2;
+                    return $15((v3) => $6(
+                      $ParseState($19, $20, false),
+                      $15,
+                      $16,
+                      (v4, $21) => {
+                        const $22 = v4._3;
+                        return $15((v5) => {
+                          if ($22) {
+                            return $17(v4, $21);
+                          }
+                          return $14(v2, $15, $16, $17, $18);
+                        });
+                      },
+                      $18
+                    ));
                   };
                 })();
                 return (v2, $14, $15, $16, $17) => {
@@ -22277,50 +22531,50 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
                   ));
                 };
               })();
-              return (v2, $11, $12, $13, $14) => {
-                const $15 = v2._1;
-                const $16 = v2._2;
-                return $11((v3) => $2(
-                  $ParseState($15, $16, false),
-                  $11,
-                  $12,
-                  (v4, $17) => {
-                    const $18 = v4._3;
-                    return $11((v5) => {
-                      if ($18) {
-                        return $13(v4, $17);
+              return (v2, $13, $14, $15, $16) => {
+                const $17 = v2._1;
+                const $18 = v2._2;
+                return $13((v3) => $4(
+                  $ParseState($17, $18, false),
+                  $13,
+                  $14,
+                  (v4, $19) => {
+                    const $20 = v4._3;
+                    return $13((v5) => {
+                      if ($20) {
+                        return $15(v4, $19);
                       }
-                      return $10(v2, $11, $12, $13, $14);
+                      return $12(v2, $13, $14, $15, $16);
                     });
                   },
-                  $14
+                  $16
                 ));
               };
             })();
-            return (v2, $10, $11, $12, $13) => {
-              const $14 = v2._1;
-              const $15 = v2._2;
-              return $10((v3) => $1(
-                $ParseState($14, $15, false),
-                $10,
-                $11,
-                (v4, $16) => {
-                  const $17 = v4._3;
-                  return $10((v5) => {
-                    if ($17) {
-                      return $12(v4, $16);
+            return (v2, $12, $13, $14, $15) => {
+              const $16 = v2._1;
+              const $17 = v2._2;
+              return $12((v3) => $3(
+                $ParseState($16, $17, false),
+                $12,
+                $13,
+                (v4, $18) => {
+                  const $19 = v4._3;
+                  return $12((v5) => {
+                    if ($19) {
+                      return $14(v4, $18);
                     }
-                    return $9(v2, $10, $11, $12, $13);
+                    return $11(v2, $12, $13, $14, $15);
                   });
                 },
-                $13
+                $15
               ));
             };
           })();
           return (v2, $9, $10, $11, $12) => {
             const $13 = v2._1;
             const $14 = v2._2;
-            return $9((v3) => $03(
+            return $9((v3) => $1(
               $ParseState($13, $14, false),
               $9,
               $10,
@@ -22364,7 +22618,7 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
           lift12,
           $$throw2,
           (state2$1, a$1) => more((v2$1) => {
-            const $22 = block(expr$lazy());
+            const $22 = block2(expr$lazy());
             return more((v1$2) => $22(state2$1, more, lift12, $$throw2, (state2$2, a$2) => more((v2$2) => done(state2$2, $Tuple(a$1, a$2)))));
           })
         )))
@@ -22373,7 +22627,7 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
     const $1 = reserved("match");
     const $2 = reserved("if");
     const $3 = context("def")((() => {
-      const $32 = context("funDef")((state1, more, lift12, $$throw2, done) => more((v1) => {
+      const $32 = context("funDef")(withPos((state1, more, lift12, $$throw2, done) => more((v1) => {
         const $33 = state1._3;
         return recDefs$lazy()(
           state1,
@@ -22388,8 +22642,8 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
             (state2$1, a$1) => more((v2$1) => done(state2$1, $Expr2("LetRec", a, a$1)))
           )))
         );
-      }));
-      const $42 = context("valDef")((state1, more, lift12, $$throw2, done) => more((v1) => {
+      })));
+      const $42 = context("valDef")(withPos((state1, more, lift12, $$throw2, done) => more((v1) => {
         const $43 = state1._3;
         return varDefs$lazy()(
           state1,
@@ -22404,7 +22658,7 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
             (state2$1, a$1) => more((v2$1) => done(state2$1, $Expr2("Let", a, a$1)))
           )))
         );
-      }));
+      })));
       return (v2, $5, $6, $7, $8) => {
         const $9 = v2._1;
         const $10 = v2._2;
@@ -22461,7 +22715,7 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
                   $6,
                   $15,
                   (state2$1, a$1) => $5((v2$2) => {
-                    const $16 = block(expr$lazy());
+                    const $16 = block2(expr$lazy());
                     return $5((v1$2) => $16(
                       state2$1,
                       $5,
@@ -22475,7 +22729,7 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
                           $6,
                           $15,
                           (state2$3, a$3) => $5((v2$4) => {
-                            const $18 = block(expr$lazy());
+                            const $18 = block2(expr$lazy());
                             return $5((v1$4) => $18(state2$3, $5, $6, $15, (state2$4, a$4) => $5((v2$5) => $8(state2$4, $Expr2("IfElse", a$1, a$2, a$4)))));
                           })
                         ));
@@ -22498,7 +22752,7 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
             $6,
             $11,
             (state2$1, a$1) => $5((v2$2) => {
-              const $12 = block((state1, more, lift12, $$throw2, done) => more((v1$2) => branch(
+              const $12 = block2((state1, more, lift12, $$throw2, done) => more((v1$2) => branch(
                 state1,
                 more,
                 lift12,
@@ -22527,9 +22781,9 @@ var expr$lazy = /* @__PURE__ */ binding(() => {
 });
 var varDefs = /* @__PURE__ */ varDefs$lazy();
 var recDefs = /* @__PURE__ */ recDefs$lazy();
-var expr = /* @__PURE__ */ expr$lazy();
+var expr2 = /* @__PURE__ */ expr$lazy();
 var parsePy$p = (input) => {
-  const $0 = runParserT2(input)(withImports(expr))(initialPos)._1;
+  const $0 = runParserT2(input)(withImports(expr2))(initialPos)._1;
   if ($0.tag === "Left") {
     return $Either("Left", prettyParseError($0._1));
   }
@@ -24277,13 +24531,13 @@ var elem3 = /* @__PURE__ */ (() => {
     return x.tag === "OptLong" && y.tag === "OptLong" && x._1 === y._1;
   });
 })();
-var simplify2 = (v) => {
+var simplify = (v) => {
   if (v.tag === "Leaf") {
     return $OptTree("Leaf", v._1);
   }
   if (v.tag === "MultNode") {
     const v1 = arrayBind(v._1)((x) => {
-      const $0 = simplify2(x);
+      const $0 = simplify(x);
       if ($0.tag === "MultNode") {
         return $0._1;
       }
@@ -24296,7 +24550,7 @@ var simplify2 = (v) => {
   }
   if (v.tag === "AltNode") {
     const v1 = arrayBind(v._1)((x) => {
-      const $0 = simplify2(x);
+      const $0 = simplify(x);
       if ($0.tag === "AltNode") {
         return $0._1;
       }
@@ -24799,7 +25053,7 @@ var treeMapParser = (g) => {
     fail();
   };
   const $0 = go(false)(false)(false)(g);
-  return (x) => simplify2($0(x));
+  return (x) => simplify($0(x));
 };
 var mapParser = (f) => {
   const flatten2 = (v) => {
@@ -29261,7 +29515,7 @@ var expr_$lazy = /* @__PURE__ */ binding(() => {
                   if (e$p.tag === "Var") {
                     return $Expr2("Project", e, e$p._1);
                   }
-                  return throwException(error('Field names are not first class; got "' + renderWithIndent(0)(prettyExpr1(annUnit).pretty(e$p)) + '".'))();
+                  return throwException(error('Field names are not first class; got "' + renderWithIndent(Stmt)(0)(0)(prettyExpr1(annUnit).pretty(e$p))._1 + '".'))();
                 };
               }
               if (":" === definitely("absurd")(charAt2(0)(a$1))) {
@@ -29901,7 +30155,7 @@ var migrate = (v) => {
       return (v$1) => $0;
     }
     if (v1.tag === "Right") {
-      const $0 = _pure(renderWithIndent(0)(prettyExpr1(annUnit).pretty(v1._1._1)));
+      const $0 = _pure(renderWithIndent(Stmt)(0)(0)(prettyExpr1(annUnit).pretty(v1._1._1))._1);
       return (v$1) => $0;
     }
     fail();
@@ -29917,7 +30171,7 @@ var evaluate = (v) => {
 };
 var dispatchCommand = (v) => {
   if (v.tag === "Evaluate") {
-    return _bind(evaluate(v._1))((v1) => _liftEffect(log(renderWithIndent(0)(prettyVal(highlightableUnit).pretty(v1)))));
+    return _bind(evaluate(v._1))((v1) => _liftEffect(log(renderWithIndent(Stmt)(0)(0)(prettyVal(highlightableUnit).pretty(v1))._1)));
   }
   if (v.tag === "Migrate") {
     return _bind(migrate(v._1))((r) => _liftEffect(log(r)));