diff --git a/bootstrap/bin/hocc/Parse.hmh b/bootstrap/bin/hocc/Parse.hmh
index ab0e4a01..d968e939 100644
--- a/bootstrap/bin/hocc/Parse.hmh
+++ b/bootstrap/bin/hocc/Parse.hmh
@@ -248,11 +248,9 @@ type nonterm_ident =
   | Matter of {token_: Scan.Token.t; matter: nonterm_matter}
   | MatterEpsilon
   and nonterm_hmh =
-  | Hmh of {prelude: nonterm_matter; hocc_: nonterm_hocc; postlude: nonterm_matter;
-  eoi: Scan.Token.t}
+  | Hmh of {prelude: nonterm_matter; hocc_: nonterm_hocc; postlude: nonterm_matter; eoi: token_eoi}
   and nonterm_hmhi =
-  | Hmhi of {prelude: nonterm_matter; hocc_: token_hocc; postlude: nonterm_matter;
-  eoi: Scan.Token.t}
+  | Hmhi of {prelude: nonterm_matter; hocc_: token_hocc; postlude: nonterm_matter; eoi: token_eoi}
 
 include hocc
     (* hocc-specific keywords *)
@@ -552,14 +550,10 @@ include hocc
       | epsilon -> MatterEpsilon
 
     start Hmh of nonterm_hmh ::=
-      | prelude:Matter hocc_:Hocc postlude:Matter eoi:EOI ->
-        let EOI {token_=eoi} = eoi in
-        Hmh {prelude; hocc_; postlude; eoi}
+      | prelude:Matter hocc_:Hocc postlude:Matter eoi:EOI -> Hmh {prelude; hocc_; postlude; eoi}
 
     start Hmhi of nonterm_hmhi ::=
-      | prelude:Matter hocc_:"hocc" postlude:Matter eoi:EOI ->
-        let EOI {token_=eoi} = eoi in
-        Hmhi {prelude; hocc_; postlude; eoi}
+      | prelude:Matter hocc_:"hocc" postlude:Matter eoi:EOI -> Hmhi {prelude; hocc_; postlude; eoi}
 
 let rec scan scanner =
     let scanner, scan_token = Scan.next scanner in
@@ -1663,7 +1657,7 @@ let rec pp_token_hocc (HOCC {token_}) formatter =
           |> fmt_semi ~alt ~width
           |> Fmt.fmt "postlude=" |> pp_matter postlude
           |> fmt_semi ~alt ~width
-          |> Fmt.fmt "eoi=" |> Scan.Token.pp eoi
+          |> Fmt.fmt "eoi=" |> pp_token_eoi eoi
           |> fmt_rcurly ~alt ~width
   and pp_hmh hmh formatter =
     fmt_hmh hmh formatter
@@ -1679,7 +1673,7 @@ let rec pp_token_hocc (HOCC {token_}) formatter =
           |> fmt_semi ~alt ~width
           |> Fmt.fmt "postlude=" |> pp_matter postlude
           |> fmt_semi ~alt ~width
-          |> Fmt.fmt "eoi=" |> Scan.Token.pp eoi
+          |> Fmt.fmt "eoi=" |> pp_token_eoi eoi
           |> fmt_rcurly ~alt ~width
   and pp_hmhi hmhi formatter =
     fmt_hmhi hmhi formatter
diff --git a/bootstrap/bin/hocc/Parse.ml b/bootstrap/bin/hocc/Parse.ml
index 4b4f6996..24c36eea 100644
--- a/bootstrap/bin/hocc/Parse.ml
+++ b/bootstrap/bin/hocc/Parse.ml
@@ -241,11 +241,9 @@ type nonterm_ident =
   | Matter of {token_: Scan.Token.t; matter: nonterm_matter}
   | MatterEpsilon
   and nonterm_hmh =
-  | Hmh of {prelude: nonterm_matter; hocc_: nonterm_hocc; postlude: nonterm_matter;
-  eoi: Scan.Token.t}
+  | Hmh of {prelude: nonterm_matter; hocc_: nonterm_hocc; postlude: nonterm_matter; eoi: token_eoi}
   and nonterm_hmhi =
-  | Hmhi of {prelude: nonterm_matter; hocc_: token_hocc; postlude: nonterm_matter;
-  eoi: Scan.Token.t}
+  | Hmhi of {prelude: nonterm_matter; hocc_: token_hocc; postlude: nonterm_matter; eoi: token_eoi}
 
 include struct
     module Spec = struct
@@ -11986,7 +11984,7 @@ include struct
                   | Elm.{symbol=Symbol.Token (UIDENT uident); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Ident (
                   (*______________________________________________________________________________*)
-#310 "./Parse.hmh"
+#308 "./Parse.hmh"
 IdentUident {uident}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -11996,7 +11994,7 @@ IdentUident {uident}
                   | Elm.{symbol=Symbol.Token (CIDENT cident); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Ident (
                   (*______________________________________________________________________________*)
-#311 "./Parse.hmh"
+#309 "./Parse.hmh"
 IdentCident {cident}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12006,7 +12004,7 @@ IdentCident {cident}
                   | Elm.{symbol=Symbol.Token (USCORE uscore); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Ident (
                   (*______________________________________________________________________________*)
-#312 "./Parse.hmh"
+#310 "./Parse.hmh"
 IdentUscore {uscore}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12018,7 +12016,7 @@ IdentUscore {uscore}
                   :: _
                   :: tl__hocc__ -> Symbol.Nonterm (PrecsTl (
                   (*______________________________________________________________________________*)
-#315 "./Parse.hmh"
+#313 "./Parse.hmh"
 PrecsTlUident {uident; precs_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12027,7 +12025,7 @@ PrecsTlUident {uident; precs_tl}
                 (* 4 *) (function
                   tl__hocc__ -> Symbol.Nonterm (PrecsTl (
                   (*______________________________________________________________________________*)
-#316 "./Parse.hmh"
+#314 "./Parse.hmh"
 PrecsTlEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12037,7 +12035,7 @@ PrecsTlEpsilon
                   :: Elm.{symbol=Symbol.Token (UIDENT uident); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Precs (
                   (*______________________________________________________________________________*)
-#319 "./Parse.hmh"
+#317 "./Parse.hmh"
 Precs {uident; precs_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12048,7 +12046,7 @@ Precs {uident; precs_tl}
                   :: _
                   :: tl__hocc__ -> Symbol.Nonterm (PrecRels (
                   (*______________________________________________________________________________*)
-#322 "./Parse.hmh"
+#320 "./Parse.hmh"
 PrecRelsPrecs {precs}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12057,7 +12055,7 @@ PrecRelsPrecs {precs}
                 (* 7 *) (function
                   tl__hocc__ -> Symbol.Nonterm (PrecRels (
                   (*______________________________________________________________________________*)
-#323 "./Parse.hmh"
+#321 "./Parse.hmh"
 PrecRelsEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12066,7 +12064,7 @@ PrecRelsEpsilon
                   | _
                   :: tl__hocc__ -> Symbol.Nonterm (PrecType (
                   (*______________________________________________________________________________*)
-#326 "./Parse.hmh"
+#324 "./Parse.hmh"
 PrecTypeNeutral
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12076,7 +12074,7 @@ PrecTypeNeutral
                   | _
                   :: tl__hocc__ -> Symbol.Nonterm (PrecType (
                   (*______________________________________________________________________________*)
-#327 "./Parse.hmh"
+#325 "./Parse.hmh"
 PrecTypeLeft
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12086,7 +12084,7 @@ PrecTypeLeft
                   | _
                   :: tl__hocc__ -> Symbol.Nonterm (PrecType (
                   (*______________________________________________________________________________*)
-#328 "./Parse.hmh"
+#326 "./Parse.hmh"
 PrecTypeRight
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12098,7 +12096,7 @@ PrecTypeRight
                   :: Elm.{symbol=Symbol.Nonterm (PrecType prec_type); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Prec (
                   (*______________________________________________________________________________*)
-#331 "./Parse.hmh"
+#329 "./Parse.hmh"
 Prec {prec_type; uident; prec_rels}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12110,7 +12108,7 @@ Prec {prec_type; uident; prec_rels}
                   :: Elm.{symbol=Symbol.Token (CIDENT cident); _}
                   :: tl__hocc__ -> Symbol.Nonterm (SymbolTypeQualifier (
                   (*______________________________________________________________________________*)
-#335 "./Parse.hmh"
+#333 "./Parse.hmh"
 SymbolTypeQualifier {cident; symbol_type_qualifier_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12119,7 +12117,7 @@ SymbolTypeQualifier {cident; symbol_type_qualifier_tl}
                 (* 13 *) (function
                   tl__hocc__ -> Symbol.Nonterm (SymbolTypeQualifier (
                   (*______________________________________________________________________________*)
-#336 "./Parse.hmh"
+#334 "./Parse.hmh"
 SymbolTypeQualifierEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12130,7 +12128,7 @@ SymbolTypeQualifierEpsilon
                   :: _
                   :: tl__hocc__ -> Symbol.Nonterm (SymbolType (
                   (*______________________________________________________________________________*)
-#340 "./Parse.hmh"
+#338 "./Parse.hmh"
 SymbolType {symbol_type_qualifier; symbol_type}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12140,7 +12138,7 @@ SymbolType {symbol_type_qualifier; symbol_type}
                   | Elm.{symbol=Symbol.Nonterm (SymbolType symbol_type); _}
                   :: tl__hocc__ -> Symbol.Nonterm (SymbolType0 (
                   (*______________________________________________________________________________*)
-#343 "./Parse.hmh"
+#341 "./Parse.hmh"
 SymbolType0SymbolType {symbol_type}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12149,7 +12147,7 @@ SymbolType0SymbolType {symbol_type}
                 (* 16 *) (function
                   tl__hocc__ -> Symbol.Nonterm (SymbolType0 (
                   (*______________________________________________________________________________*)
-#344 "./Parse.hmh"
+#342 "./Parse.hmh"
 SymbolType0Epsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12159,7 +12157,7 @@ SymbolType0Epsilon
                   :: _
                   :: tl__hocc__ -> Symbol.Nonterm (PrecRef (
                   (*______________________________________________________________________________*)
-#347 "./Parse.hmh"
+#345 "./Parse.hmh"
 PrecRefUident {uident}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12168,7 +12166,7 @@ PrecRefUident {uident}
                 (* 18 *) (function
                   tl__hocc__ -> Symbol.Nonterm (PrecRef (
                   (*______________________________________________________________________________*)
-#348 "./Parse.hmh"
+#346 "./Parse.hmh"
 PrecRefEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12177,7 +12175,7 @@ PrecRefEpsilon
                   | Elm.{symbol=Symbol.Token (ISTRING alias); _}
                   :: tl__hocc__ -> Symbol.Nonterm (TokenAlias (
                   (*______________________________________________________________________________*)
-#351 "./Parse.hmh"
+#349 "./Parse.hmh"
 TokenAlias {alias}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12186,7 +12184,7 @@ TokenAlias {alias}
                 (* 20 *) (function
                   tl__hocc__ -> Symbol.Nonterm (TokenAlias (
                   (*______________________________________________________________________________*)
-#352 "./Parse.hmh"
+#350 "./Parse.hmh"
 TokenAliasEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12199,7 +12197,7 @@ TokenAliasEpsilon
                   :: _
                   :: tl__hocc__ -> Symbol.Nonterm (Token (
                   (*______________________________________________________________________________*)
-#356 "./Parse.hmh"
+#354 "./Parse.hmh"
 Token {cident; token_alias; symbol_type0; prec_ref}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12209,7 +12207,7 @@ Token {cident; token_alias; symbol_type0; prec_ref}
                   | Elm.{symbol=Symbol.Token (LINE_DELIM line_delim); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Sep (
                   (*______________________________________________________________________________*)
-#359 "./Parse.hmh"
+#357 "./Parse.hmh"
 SepLineDelim {line_delim}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12219,7 +12217,7 @@ SepLineDelim {line_delim}
                   | Elm.{symbol=Symbol.Token (SEMI semi); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Sep (
                   (*______________________________________________________________________________*)
-#360 "./Parse.hmh"
+#358 "./Parse.hmh"
 SepSemi {semi}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12229,7 +12227,7 @@ SepSemi {semi}
                   | Elm.{symbol=Symbol.Token (BAR bar); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Sep (
                   (*______________________________________________________________________________*)
-#361 "./Parse.hmh"
+#359 "./Parse.hmh"
 SepBar {bar}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12241,7 +12239,7 @@ SepBar {bar}
                   :: Elm.{symbol=Symbol.Nonterm (Sep sep); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodesTl (
                   (*______________________________________________________________________________*)
-#364 "./Parse.hmh"
+#362 "./Parse.hmh"
 CodesTlSepCode {sep; code; codes_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12250,7 +12248,7 @@ CodesTlSepCode {sep; code; codes_tl}
                 (* 26 *) (function
                   tl__hocc__ -> Symbol.Nonterm (CodesTl (
                   (*______________________________________________________________________________*)
-#365 "./Parse.hmh"
+#363 "./Parse.hmh"
 CodesTlEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12260,7 +12258,7 @@ CodesTlEpsilon
                   :: Elm.{symbol=Symbol.Nonterm (Code code); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Codes (
                   (*______________________________________________________________________________*)
-#368 "./Parse.hmh"
+#366 "./Parse.hmh"
 Codes {code; codes_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12270,7 +12268,7 @@ Codes {code; codes_tl}
                   | Elm.{symbol=Symbol.Nonterm (Codes codes); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Codes0 (
                   (*______________________________________________________________________________*)
-#371 "./Parse.hmh"
+#369 "./Parse.hmh"
 Codes0Codes {codes}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12279,7 +12277,7 @@ Codes0Codes {codes}
                 (* 29 *) (function
                   tl__hocc__ -> Symbol.Nonterm (Codes0 (
                   (*______________________________________________________________________________*)
-#372 "./Parse.hmh"
+#370 "./Parse.hmh"
 Codes0Epsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12290,7 +12288,7 @@ Codes0Epsilon
                   :: Elm.{symbol=Symbol.Token (INDENT indent); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Delimited (
                   (*______________________________________________________________________________*)
-#375 "./Parse.hmh"
+#373 "./Parse.hmh"
 DelimitedBlock {indent; codes; dedent}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12302,7 +12300,7 @@ DelimitedBlock {indent; codes; dedent}
                   :: Elm.{symbol=Symbol.Token (LPAREN lparen); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Delimited (
                   (*______________________________________________________________________________*)
-#376 "./Parse.hmh"
+#374 "./Parse.hmh"
 DelimitedParen {lparen; codes0; rparen}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12314,7 +12312,7 @@ DelimitedParen {lparen; codes0; rparen}
                   :: Elm.{symbol=Symbol.Token (LCAPTURE lcapture); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Delimited (
                   (*______________________________________________________________________________*)
-#377 "./Parse.hmh"
+#375 "./Parse.hmh"
 DelimitedCapture {lcapture; codes0; rcapture}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12326,7 +12324,7 @@ DelimitedCapture {lcapture; codes0; rcapture}
                   :: Elm.{symbol=Symbol.Token (LBRACK lbrack); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Delimited (
                   (*______________________________________________________________________________*)
-#378 "./Parse.hmh"
+#376 "./Parse.hmh"
 DelimitedList {lbrack; codes0; rbrack}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12338,7 +12336,7 @@ DelimitedList {lbrack; codes0; rbrack}
                   :: Elm.{symbol=Symbol.Token (LARRAY larray); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Delimited (
                   (*______________________________________________________________________________*)
-#379 "./Parse.hmh"
+#377 "./Parse.hmh"
 DelimitedArray {larray; codes0; rarray}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12350,7 +12348,7 @@ DelimitedArray {larray; codes0; rarray}
                   :: Elm.{symbol=Symbol.Token (LCURLY lcurly); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Delimited (
                   (*______________________________________________________________________________*)
-#380 "./Parse.hmh"
+#378 "./Parse.hmh"
 DelimitedModule {lcurly; codes0; rcurly}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12360,7 +12358,7 @@ DelimitedModule {lcurly; codes0; rcurly}
                   | Elm.{symbol=Symbol.Token (OTHER_TOKEN token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#384 "./Parse.hmh"
+#382 "./Parse.hmh"
 let OTHER_TOKEN {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12371,7 +12369,7 @@ let OTHER_TOKEN {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (UIDENT token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#387 "./Parse.hmh"
+#385 "./Parse.hmh"
 let UIDENT {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12382,7 +12380,7 @@ let UIDENT {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (CIDENT token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#390 "./Parse.hmh"
+#388 "./Parse.hmh"
 let CIDENT {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12393,7 +12391,7 @@ let CIDENT {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (USCORE token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#393 "./Parse.hmh"
+#391 "./Parse.hmh"
 let USCORE {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12404,7 +12402,7 @@ let USCORE {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (ISTRING token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#396 "./Parse.hmh"
+#394 "./Parse.hmh"
 let ISTRING {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12415,7 +12413,7 @@ let ISTRING {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (OF token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#399 "./Parse.hmh"
+#397 "./Parse.hmh"
 let OF {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12426,7 +12424,7 @@ let OF {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (COLON token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#402 "./Parse.hmh"
+#400 "./Parse.hmh"
 let COLON {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12437,7 +12435,7 @@ let COLON {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (DOT token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#405 "./Parse.hmh"
+#403 "./Parse.hmh"
 let DOT {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12448,7 +12446,7 @@ let DOT {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (ARROW token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#408 "./Parse.hmh"
+#406 "./Parse.hmh"
 let ARROW {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12459,7 +12457,7 @@ let ARROW {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (LT token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#411 "./Parse.hmh"
+#409 "./Parse.hmh"
 let LT {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12470,7 +12468,7 @@ let LT {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (COMMA token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeToken (
                   (*______________________________________________________________________________*)
-#414 "./Parse.hmh"
+#412 "./Parse.hmh"
 let COMMA {token_} = token_ in
         CodeToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12482,7 +12480,7 @@ let COMMA {token_} = token_ in
                   :: Elm.{symbol=Symbol.Nonterm (Delimited delimited); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeTl (
                   (*______________________________________________________________________________*)
-#418 "./Parse.hmh"
+#416 "./Parse.hmh"
 CodeTlDelimited {delimited; code_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12493,7 +12491,7 @@ CodeTlDelimited {delimited; code_tl}
                   :: Elm.{symbol=Symbol.Nonterm (CodeToken code_token); _}
                   :: tl__hocc__ -> Symbol.Nonterm (CodeTl (
                   (*______________________________________________________________________________*)
-#419 "./Parse.hmh"
+#417 "./Parse.hmh"
 CodeTlCodeToken {code_token; code_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12502,7 +12500,7 @@ CodeTlCodeToken {code_token; code_tl}
                 (* 49 *) (function
                   tl__hocc__ -> Symbol.Nonterm (CodeTl (
                   (*______________________________________________________________________________*)
-#420 "./Parse.hmh"
+#418 "./Parse.hmh"
 CodeTlEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12512,7 +12510,7 @@ CodeTlEpsilon
                   :: Elm.{symbol=Symbol.Nonterm (Delimited delimited); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Code (
                   (*______________________________________________________________________________*)
-#423 "./Parse.hmh"
+#421 "./Parse.hmh"
 CodeDelimited {delimited; code_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12523,7 +12521,7 @@ CodeDelimited {delimited; code_tl}
                   :: Elm.{symbol=Symbol.Nonterm (CodeToken code_token); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Code (
                   (*______________________________________________________________________________*)
-#424 "./Parse.hmh"
+#422 "./Parse.hmh"
 CodeCodeToken {code_token; code_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12533,7 +12531,7 @@ CodeCodeToken {code_token; code_tl}
                   | Elm.{symbol=Symbol.Token (CIDENT cident); _}
                   :: tl__hocc__ -> Symbol.Nonterm (ProdParamSymbol (
                   (*______________________________________________________________________________*)
-#427 "./Parse.hmh"
+#425 "./Parse.hmh"
 ProdParamSymbolCident {cident}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12543,7 +12541,7 @@ ProdParamSymbolCident {cident}
                   | Elm.{symbol=Symbol.Token (ISTRING alias); _}
                   :: tl__hocc__ -> Symbol.Nonterm (ProdParamSymbol (
                   (*______________________________________________________________________________*)
-#428 "./Parse.hmh"
+#426 "./Parse.hmh"
 ProdParamSymbolAlias {alias}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12555,7 +12553,7 @@ ProdParamSymbolAlias {alias}
                   :: Elm.{symbol=Symbol.Nonterm (Ident ident); _}
                   :: tl__hocc__ -> Symbol.Nonterm (ProdParam (
                   (*______________________________________________________________________________*)
-#432 "./Parse.hmh"
+#430 "./Parse.hmh"
 ProdParamBinding {ident; prod_param_symbol}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12565,7 +12563,7 @@ ProdParamBinding {ident; prod_param_symbol}
                   | Elm.{symbol=Symbol.Nonterm (ProdParamSymbol prod_param_symbol); _}
                   :: tl__hocc__ -> Symbol.Nonterm (ProdParam (
                   (*______________________________________________________________________________*)
-#433 "./Parse.hmh"
+#431 "./Parse.hmh"
 ProdParam {prod_param_symbol}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12576,7 +12574,7 @@ ProdParam {prod_param_symbol}
                   :: Elm.{symbol=Symbol.Nonterm (ProdParam prod_param); _}
                   :: tl__hocc__ -> Symbol.Nonterm (ProdParamsTl (
                   (*______________________________________________________________________________*)
-#437 "./Parse.hmh"
+#435 "./Parse.hmh"
 ProdParamsTlProdParam {prod_param; prod_params_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12585,7 +12583,7 @@ ProdParamsTlProdParam {prod_param; prod_params_tl}
                 (* 57 *) (function
                   tl__hocc__ -> Symbol.Nonterm (ProdParamsTl (
                   (*______________________________________________________________________________*)
-#438 "./Parse.hmh"
+#436 "./Parse.hmh"
 ProdParamsTlEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12595,7 +12593,7 @@ ProdParamsTlEpsilon
                   :: Elm.{symbol=Symbol.Nonterm (ProdParam prod_param); _}
                   :: tl__hocc__ -> Symbol.Nonterm (ProdParams (
                   (*______________________________________________________________________________*)
-#442 "./Parse.hmh"
+#440 "./Parse.hmh"
 ProdParamsProdParam {prod_param; prod_params_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12605,7 +12603,7 @@ ProdParamsProdParam {prod_param; prod_params_tl}
                   | Elm.{symbol=Symbol.Nonterm (ProdParams prod_params); _}
                   :: tl__hocc__ -> Symbol.Nonterm (ProdPattern (
                   (*______________________________________________________________________________*)
-#445 "./Parse.hmh"
+#443 "./Parse.hmh"
 ProdPatternParams {prod_params}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12615,7 +12613,7 @@ ProdPatternParams {prod_params}
                   | Elm.{symbol=Symbol.Token (EPSILON_ epsilon_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (ProdPattern (
                   (*______________________________________________________________________________*)
-#446 "./Parse.hmh"
+#444 "./Parse.hmh"
 ProdPatternEpsilon {epsilon_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12626,7 +12624,7 @@ ProdPatternEpsilon {epsilon_}
                   :: Elm.{symbol=Symbol.Nonterm (ProdPattern prod_pattern); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Prod (
                   (*______________________________________________________________________________*)
-#449 "./Parse.hmh"
+#447 "./Parse.hmh"
 Prod {prod_pattern; prec_ref}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12638,7 +12636,7 @@ Prod {prod_pattern; prec_ref}
                   :: _
                   :: tl__hocc__ -> Symbol.Nonterm (ProdsTl (
                   (*______________________________________________________________________________*)
-#452 "./Parse.hmh"
+#450 "./Parse.hmh"
 ProdsTlProd {prod; prods_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12647,7 +12645,7 @@ ProdsTlProd {prod; prods_tl}
                 (* 63 *) (function
                   tl__hocc__ -> Symbol.Nonterm (ProdsTl (
                   (*______________________________________________________________________________*)
-#453 "./Parse.hmh"
+#451 "./Parse.hmh"
 ProdsTlEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12658,7 +12656,7 @@ ProdsTlEpsilon
                   :: _
                   :: tl__hocc__ -> Symbol.Nonterm (Prods (
                   (*______________________________________________________________________________*)
-#457 "./Parse.hmh"
+#455 "./Parse.hmh"
 ProdsProd {prod; prods_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12669,7 +12667,7 @@ ProdsProd {prod; prods_tl}
                   :: Elm.{symbol=Symbol.Nonterm (Prod prod); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Prods (
                   (*______________________________________________________________________________*)
-#458 "./Parse.hmh"
+#456 "./Parse.hmh"
 ProdsProd {prod; prods_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12681,7 +12679,7 @@ ProdsProd {prod; prods_tl}
                   :: Elm.{symbol=Symbol.Nonterm (Prods prods); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Reduction (
                   (*______________________________________________________________________________*)
-#461 "./Parse.hmh"
+#459 "./Parse.hmh"
 Reduction {prods; code}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12693,7 +12691,7 @@ Reduction {prods; code}
                   :: _
                   :: tl__hocc__ -> Symbol.Nonterm (ReductionsTl (
                   (*______________________________________________________________________________*)
-#465 "./Parse.hmh"
+#463 "./Parse.hmh"
 ReductionsTlReduction {reduction; reductions_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12702,7 +12700,7 @@ ReductionsTlReduction {reduction; reductions_tl}
                 (* 68 *) (function
                   tl__hocc__ -> Symbol.Nonterm (ReductionsTl (
                   (*______________________________________________________________________________*)
-#466 "./Parse.hmh"
+#464 "./Parse.hmh"
 ReductionsTlEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12712,7 +12710,7 @@ ReductionsTlEpsilon
                   :: Elm.{symbol=Symbol.Nonterm (Reduction reduction); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Reductions (
                   (*______________________________________________________________________________*)
-#470 "./Parse.hmh"
+#468 "./Parse.hmh"
 ReductionsReduction {reduction; reductions_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12722,7 +12720,7 @@ ReductionsReduction {reduction; reductions_tl}
                   | _
                   :: tl__hocc__ -> Symbol.Nonterm (NontermType (
                   (*______________________________________________________________________________*)
-#473 "./Parse.hmh"
+#471 "./Parse.hmh"
 NontermTypeNonterm
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12732,7 +12730,7 @@ NontermTypeNonterm
                   | _
                   :: tl__hocc__ -> Symbol.Nonterm (NontermType (
                   (*______________________________________________________________________________*)
-#474 "./Parse.hmh"
+#472 "./Parse.hmh"
 NontermTypeStart
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12746,7 +12744,7 @@ NontermTypeStart
                   :: Elm.{symbol=Symbol.Nonterm (NontermType nonterm_type); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Nonterm (
                   (*______________________________________________________________________________*)
-#478 "./Parse.hmh"
+#476 "./Parse.hmh"
 NontermProds {nonterm_type; cident; prec_ref; prods}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12761,7 +12759,7 @@ NontermProds {nonterm_type; cident; prec_ref; prods}
                   :: Elm.{symbol=Symbol.Nonterm (NontermType nonterm_type); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Nonterm (
                   (*______________________________________________________________________________*)
-#481 "./Parse.hmh"
+#479 "./Parse.hmh"
 NontermReductions {nonterm_type; cident; symbol_type; prec_ref; reductions}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12771,7 +12769,7 @@ NontermReductions {nonterm_type; cident; symbol_type; prec_ref; reductions}
                   | Elm.{symbol=Symbol.Nonterm (Prec prec_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Stmt (
                   (*______________________________________________________________________________*)
-#484 "./Parse.hmh"
+#482 "./Parse.hmh"
 StmtPrec {prec_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12781,7 +12779,7 @@ StmtPrec {prec_}
                   | Elm.{symbol=Symbol.Nonterm (Token token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Stmt (
                   (*______________________________________________________________________________*)
-#485 "./Parse.hmh"
+#483 "./Parse.hmh"
 StmtToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12791,7 +12789,7 @@ StmtToken {token_}
                   | Elm.{symbol=Symbol.Nonterm (Nonterm nonterm_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Stmt (
                   (*______________________________________________________________________________*)
-#486 "./Parse.hmh"
+#484 "./Parse.hmh"
 StmtNonterm {nonterm_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12801,7 +12799,7 @@ StmtNonterm {nonterm_}
                   | Elm.{symbol=Symbol.Nonterm (Code code); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Stmt (
                   (*______________________________________________________________________________*)
-#487 "./Parse.hmh"
+#485 "./Parse.hmh"
 StmtCode {code}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12813,7 +12811,7 @@ StmtCode {code}
                   :: _
                   :: tl__hocc__ -> Symbol.Nonterm (StmtsTl (
                   (*______________________________________________________________________________*)
-#490 "./Parse.hmh"
+#488 "./Parse.hmh"
 StmtsTl {stmt; stmts_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12822,7 +12820,7 @@ StmtsTl {stmt; stmts_tl}
                 (* 79 *) (function
                   tl__hocc__ -> Symbol.Nonterm (StmtsTl (
                   (*______________________________________________________________________________*)
-#491 "./Parse.hmh"
+#489 "./Parse.hmh"
 StmtsTlEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12832,7 +12830,7 @@ StmtsTlEpsilon
                   :: Elm.{symbol=Symbol.Nonterm (Stmt stmt); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Stmts (
                   (*______________________________________________________________________________*)
-#494 "./Parse.hmh"
+#492 "./Parse.hmh"
 Stmts {stmt; stmts_tl}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12845,7 +12843,7 @@ Stmts {stmt; stmts_tl}
                   :: Elm.{symbol=Symbol.Token (HOCC hocc_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Hocc (
                   (*______________________________________________________________________________*)
-#497 "./Parse.hmh"
+#495 "./Parse.hmh"
 Hocc {hocc_; indent; stmts; dedent}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -12855,7 +12853,7 @@ Hocc {hocc_; indent; stmts; dedent}
                   | Elm.{symbol=Symbol.Nonterm (CodeToken code_token); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#501 "./Parse.hmh"
+#499 "./Parse.hmh"
 let CodeToken {token_} = code_token in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12866,7 +12864,7 @@ let CodeToken {token_} = code_token in
                   | Elm.{symbol=Symbol.Nonterm (Sep sep); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#504 "./Parse.hmh"
+#502 "./Parse.hmh"
 let token_ = match sep with
           | SepLineDelim {line_delim=LINE_DELIM {token_}}
           | SepSemi {semi=SEMI {token_}}
@@ -12882,7 +12880,7 @@ let token_ = match sep with
                   | Elm.{symbol=Symbol.Token (INDENT token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#512 "./Parse.hmh"
+#510 "./Parse.hmh"
 let INDENT {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12893,7 +12891,7 @@ let INDENT {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (DEDENT token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#515 "./Parse.hmh"
+#513 "./Parse.hmh"
 let DEDENT {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12904,7 +12902,7 @@ let DEDENT {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (LPAREN token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#518 "./Parse.hmh"
+#516 "./Parse.hmh"
 let LPAREN {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12915,7 +12913,7 @@ let LPAREN {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (RPAREN token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#521 "./Parse.hmh"
+#519 "./Parse.hmh"
 let RPAREN {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12926,7 +12924,7 @@ let RPAREN {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (LCAPTURE token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#524 "./Parse.hmh"
+#522 "./Parse.hmh"
 let LCAPTURE {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12937,7 +12935,7 @@ let LCAPTURE {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (RCAPTURE token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#527 "./Parse.hmh"
+#525 "./Parse.hmh"
 let RCAPTURE {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12948,7 +12946,7 @@ let RCAPTURE {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (LBRACK token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#530 "./Parse.hmh"
+#528 "./Parse.hmh"
 let LBRACK {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12959,7 +12957,7 @@ let LBRACK {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (RBRACK token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#533 "./Parse.hmh"
+#531 "./Parse.hmh"
 let RBRACK {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12970,7 +12968,7 @@ let RBRACK {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (LARRAY token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#536 "./Parse.hmh"
+#534 "./Parse.hmh"
 let LARRAY {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12981,7 +12979,7 @@ let LARRAY {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (RARRAY token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#539 "./Parse.hmh"
+#537 "./Parse.hmh"
 let RARRAY {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -12992,7 +12990,7 @@ let RARRAY {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (LCURLY token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#542 "./Parse.hmh"
+#540 "./Parse.hmh"
 let LCURLY {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -13003,7 +13001,7 @@ let LCURLY {token_} = token_ in
                   | Elm.{symbol=Symbol.Token (RCURLY token_); _}
                   :: tl__hocc__ -> Symbol.Nonterm (MatterToken (
                   (*______________________________________________________________________________*)
-#545 "./Parse.hmh"
+#543 "./Parse.hmh"
 let RCURLY {token_} = token_ in
         MatterToken {token_}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -13015,7 +13013,7 @@ let RCURLY {token_} = token_ in
                   :: Elm.{symbol=Symbol.Nonterm (MatterToken matter_token); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Matter (
                   (*______________________________________________________________________________*)
-#550 "./Parse.hmh"
+#548 "./Parse.hmh"
 let MatterToken {token_} = matter_token in
         Matter {token_; matter}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
@@ -13025,7 +13023,7 @@ let MatterToken {token_} = matter_token in
                 (* 97 *) (function
                   tl__hocc__ -> Symbol.Nonterm (Matter (
                   (*______________________________________________________________________________*)
-#552 "./Parse.hmh"
+#550 "./Parse.hmh"
 MatterEpsilon
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
@@ -13037,9 +13035,8 @@ MatterEpsilon
                   :: Elm.{symbol=Symbol.Nonterm (Matter prelude); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Hmh (
                   (*______________________________________________________________________________*)
-#556 "./Parse.hmh"
-let EOI {token_=eoi} = eoi in
-        Hmh {prelude; hocc_; postlude; eoi}
+#553 "./Parse.hmh"
+Hmh {prelude; hocc_; postlude; eoi}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
                   | _ -> not_reached ()
@@ -13052,9 +13049,8 @@ let EOI {token_=eoi} = eoi in
                   :: Elm.{symbol=Symbol.Nonterm (Matter prelude); _}
                   :: tl__hocc__ -> Symbol.Nonterm (Hmhi (
                   (*______________________________________________________________________________*)
-#561 "./Parse.hmh"
-let EOI {token_=eoi} = eoi in
-        Hmhi {prelude; hocc_; postlude; eoi}
+#556 "./Parse.hmh"
+Hmhi {prelude; hocc_; postlude; eoi}
                   (*‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾*)
                   )), tl__hocc__
                   | _ -> not_reached ()
@@ -13266,7 +13262,7 @@ let EOI {token_=eoi} = eoi in
           | Status.Prefix -> t |> feed token |> walk
           | _ -> not_reached ()
   end
-#563 "./Parse.hmh"
+#557 "./Parse.hmh"
 
 let rec scan scanner =
     let scanner, scan_token = Scan.next scanner in
@@ -14370,7 +14366,7 @@ let rec pp_token_hocc (HOCC {token_}) formatter =
           |> fmt_semi ~alt ~width
           |> Fmt.fmt "postlude=" |> pp_matter postlude
           |> fmt_semi ~alt ~width
-          |> Fmt.fmt "eoi=" |> Scan.Token.pp eoi
+          |> Fmt.fmt "eoi=" |> pp_token_eoi eoi
           |> fmt_rcurly ~alt ~width
   and pp_hmh hmh formatter =
     fmt_hmh hmh formatter
@@ -14386,7 +14382,7 @@ let rec pp_token_hocc (HOCC {token_}) formatter =
           |> fmt_semi ~alt ~width
           |> Fmt.fmt "postlude=" |> pp_matter postlude
           |> fmt_semi ~alt ~width
-          |> Fmt.fmt "eoi=" |> Scan.Token.pp eoi
+          |> Fmt.fmt "eoi=" |> pp_token_eoi eoi
           |> fmt_rcurly ~alt ~width
   and pp_hmhi hmhi formatter =
     fmt_hmhi hmhi formatter
diff --git a/bootstrap/bin/hocc/code.ml b/bootstrap/bin/hocc/code.ml
index 302446bb..64adf7a8 100644
--- a/bootstrap/bin/hocc/code.ml
+++ b/bootstrap/bin/hocc/code.ml
@@ -434,7 +434,8 @@ let expand_hmi_template template_indentation template Spec.{symbols; _} formatte
   ] in
   formatter |> expand ~template_indentation template expanders
 
-let generate_hmi conf Parse.(Hmhi {prelude; hocc_=HOCC {token_=hocc_}; postlude; eoi}) io spec =
+let generate_hmi conf Parse.(Hmhi {prelude; hocc_=HOCC {token_=hocc_}; postlude;
+    eoi=EOI {token_=eoi}}) io spec =
   assert (Spec.conflicts spec = 0L);
   let indentation = indentation_of_hocc hocc_ in
   let module_name = module_name conf in
@@ -1771,8 +1772,8 @@ let expand_hm_template template_indentation template hocc_block
   formatter |> expand ~template_indentation template expanders
 
 let generate_hm conf
-    Parse.(Hmh {prelude; hocc_=(Hocc {hocc_=HOCC {token_=hocc_}; _} as hocc_block); postlude; eoi})
-    io spec =
+    Parse.(Hmh {prelude; hocc_=(Hocc {hocc_=HOCC {token_=hocc_}; _} as hocc_block); postlude;
+    eoi=EOI {token_=eoi}}) io spec =
   assert (Spec.conflicts spec = 0L);
   let indentation = indentation_of_hocc hocc_ in
   let module_name = module_name conf in
@@ -2186,7 +2187,8 @@ let expand_mli_template template_indentation template Spec.{symbols; _} formatte
   ] in
   formatter |> expand ~template_indentation template expanders
 
-let generate_mli conf Parse.(Hmhi {prelude; hocc_=HOCC {token_=hocc_}; postlude; eoi}) io spec =
+let generate_mli conf Parse.(Hmhi {prelude; hocc_=HOCC {token_=hocc_}; postlude;
+    eoi=EOI {token_=eoi}}) io spec =
   assert (Spec.conflicts spec = 0L);
   let indentation = indentation_of_hocc hocc_ in
   let module_name = module_name conf in
@@ -3560,8 +3562,8 @@ let expand_ml_template template_indentation template
   formatter |> expand ~template_indentation template expanders
 
 let generate_ml conf
-    Parse.(Hmh {prelude; hocc_=(Hocc {hocc_=HOCC {token_=hocc_}; _} as hocc_block); postlude; eoi})
-    io spec =
+    Parse.(Hmh {prelude; hocc_=(Hocc {hocc_=HOCC {token_=hocc_}; _} as hocc_block); postlude;
+    eoi=EOI {token_=eoi}}) io spec =
   assert (Spec.conflicts spec = 0L);
   let indentation = indentation_of_hocc hocc_ in
   let module_name = module_name conf in