diff --git a/library/init/data/string/basic.lean b/library/init/data/string/basic.lean
index e571537d9b..b592cb8c22 100644
--- a/library/init/data/string/basic.lean
+++ b/library/init/data/string/basic.lean
@@ -81,11 +81,31 @@ private def utf8_get_aux : list char → usize → usize → char
 def utf8_get : (@& string) → utf8_pos → char
 | ⟨s⟩ p := utf8_get_aux s 0 p
 
+private def utf8_set_aux (c' : char) : list char → usize → usize → list char
+| []      i p := []
+| (c::cs) i p :=
+  if i = p then (c'::cs) else c::(utf8_set_aux cs (i + csize c) p)
+
+@[extern cpp "lean::string_utf8_set"]
+def utf8_set : string → utf8_pos → char → string
+| ⟨s⟩ i c := ⟨utf8_set_aux c s 0 i⟩
+
 @[extern cpp "lean::string_utf8_next"]
 def utf8_next (s : @& string) (p : utf8_pos) : utf8_pos :=
 let c := utf8_get s p in
 p + csize c
 
+private def utf8_prev_aux : list char → usize → usize → usize
+| []      i p := 0
+| (c::cs) i p :=
+  let cz := csize c in
+  let i' := i + cz in
+  if i' = p then i else utf8_prev_aux cs i' p
+
+@[extern cpp "lean::string_utf8_prev"]
+def utf8_prev : (@& string) → utf8_pos → utf8_pos
+| ⟨s⟩ p := if p = 0 then 0 else utf8_prev_aux s 0 p
+
 @[extern cpp "lean::string_utf8_at_end"]
 def utf8_at_end : (@& string) → utf8_pos → bool
 | s p := p ≥ utf8_byte_size s
@@ -99,9 +119,46 @@ private def utf8_extract_aux₁ : list char → usize → usize → usize → li
 | s@(c::cs) i b e := if i = b then utf8_extract_aux₂ s i e else utf8_extract_aux₁ cs (i + csize c) b e
 
 @[extern cpp "lean::string_utf8_extract"]
-def utf8_extract : (@& string) → utf8_pos → utf8_pos → string
+def extract : (@& string) → utf8_pos → utf8_pos → string
 | ⟨s⟩ b e := if b ≥ e then ⟨[]⟩ else ⟨utf8_extract_aux₁ s 0 b e⟩
 
+def bsize (s : string) : usize :=
+utf8_byte_size s
+
+def trim_left_aux (s : string) : nat → utf8_pos → utf8_pos
+| 0     i := i
+| (n+1) i :=
+  if i ≥ s.bsize then i
+  else let c := s.utf8_get i in
+       if !c.is_whitespace then i
+       else trim_left_aux n (i + csize c)
+
+def trim_left (s : string) : string :=
+let b := trim_left_aux s s.bsize.to_nat 0 in
+if b = 0 then s
+else s.extract b s.bsize
+
+def trim_right_aux (s : string) : nat → utf8_pos → utf8_pos
+| 0     i := i
+| (n+1) i :=
+  if i = 0 then i
+  else
+    let i' := s.utf8_prev i in
+    let c  := s.utf8_get i' in
+    if !c.is_whitespace then i
+    else trim_right_aux n i'
+
+def trim_right (s : string) : string :=
+let e := trim_right_aux s s.bsize.to_nat s.bsize in
+if e = s.bsize then s
+else s.extract 0 e
+
+def trim (s : string) : string :=
+let b := trim_left_aux s s.bsize.to_nat 0 in
+let e := trim_right_aux s s.bsize.to_nat s.bsize in
+if b = 0 && e = s.bsize then s
+else s.extract b e
+
 /- In the VM, the string iterator is implemented as a pointer to the string being iterated + index.
    TODO: mark it opaque. -/
 structure iterator :=
@@ -267,30 +324,6 @@ def popn_back (s : string) (n : nat) : string :=
 def backn (s : string) (n : nat) : string :=
 (s.mk_iterator.to_end.prevn n).remaining_to_string
 
-private def trim_left_aux : nat → iterator → iterator
-| 0 it := it
-| (n+1) it :=
-  if it.curr.is_whitespace then trim_left_aux n it.next
-  else it
-
-def trim_left (s : string) : string :=
-(trim_left_aux s.length s.mk_iterator).remaining_to_string
-
-private def trim_right_aux : nat → iterator → iterator
-| 0 it := it
-| (n+1) it :=
-  let it' := it.prev in
-  if it'.curr.is_whitespace then trim_right_aux n it'
-  else it
-
-def trim_right (s : string) : string :=
-(trim_right_aux s.length s.mk_iterator.to_end).prev_to_string
-
-def trim (s : string) : string :=
-let l := trim_left_aux s.length s.mk_iterator in
-let r := trim_right_aux s.length s.mk_iterator.to_end in
-(l.extract r).get_or_else ""
-
 private def line_column_aux : nat → string.iterator → nat × nat → nat × nat
 | 0     it r           := r
 | (k+1) it r@(line, col) :=
diff --git a/src/boot/init/data/string/basic.cpp b/src/boot/init/data/string/basic.cpp
index 0d5e3897dc..5e2e19b6e2 100644
--- a/src/boot/init/data/string/basic.cpp
+++ b/src/boot/init/data/string/basic.cpp
@@ -23,11 +23,17 @@ obj* string_iterator_prev_to_string(obj*);
 }
 usize l___private_init_data_string_basic_2__utf8__byte__size__aux___main(obj*, usize);
 uint32 l_string_front(obj*);
+obj* l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___main(obj*, usize, usize);
+usize l_string_trim__left__aux___main(obj*, obj*, usize);
+obj* l_string_trim__left___boxed(obj*);
 uint8 l_char_is__whitespace(uint32);
-obj* l___private_init_data_string_basic_5__utf8__extract__aux_u_2081___main(obj*, usize, usize, usize);
+obj* l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___main___boxed(obj*, obj*, obj*);
 obj* l_string_iterator_prev__to__string___boxed(obj*);
-obj* l___private_init_data_string_basic_7__trim__right__aux___main(obj*, obj*);
+namespace lean {
+obj* string_utf8_extract(obj*, usize, usize);
+}
 obj* l_string_pushn___boxed(obj*, obj*, obj*);
+usize l_string_trim__right__aux(obj*, obj*, usize);
 namespace lean {
 obj* nat_add(obj*, obj*);
 }
@@ -36,30 +42,34 @@ obj* l___private_init_data_string_basic_9__to__nat__core___main(obj*, obj*, obj*
 obj* l_string_iterator_remaining___boxed(obj*);
 obj* l_string_iterator_forward(obj*, obj*);
 obj* l_string_decidable__eq;
+obj* l___private_init_data_string_basic_7__utf8__extract__aux_u_2081___main___boxed(obj*, obj*, obj*, obj*);
 obj* l_string_line__column___closed__1;
 obj* l_list_foldl___main___at_string_join___spec__1___boxed(obj*, obj*);
 obj* l_string_singleton(uint32);
 obj* l_string_pushn(obj*, uint32, obj*);
 obj* l_list_as__string(obj*);
+obj* l___private_init_data_string_basic_4__utf8__set__aux___main___boxed(obj*, obj*, obj*, obj*);
 obj* l_string_iterator_forward___main(obj*, obj*);
 obj* l_string_iterator_has__next___boxed(obj*);
+obj* l_string_trim__right__aux___boxed(obj*, obj*, obj*);
 obj* l_nat_repeat__core___main___at_string_pushn___spec__1(uint32, obj*, obj*, obj*);
 obj* l_string_iterator_extract__core(obj*, obj*);
 obj* l_string_back___boxed(obj*);
-obj* l___private_init_data_string_basic_4__utf8__extract__aux_u_2082(obj*, usize, usize);
-namespace lean {
-obj* string_utf8_extract(obj*, usize, usize);
-}
+obj* l_string_trim___boxed(obj*);
 namespace lean {
 obj* string_iterator_next(obj*);
 }
 namespace lean {
 usize string_utf8_next(obj*, usize);
 }
+obj* l___private_init_data_string_basic_5__utf8__prev__aux___main___boxed(obj*, obj*, obj*);
+obj* l_string_trim__right___boxed(obj*);
+usize l___private_init_data_string_basic_5__utf8__prev__aux(obj*, usize, usize);
 namespace lean {
 usize string_utf8_byte_size(obj*);
 }
 obj* l_string_singleton___boxed(obj*);
+obj* l_string_bsize___boxed(obj*);
 usize l___private_init_data_string_basic_1__csize(uint32);
 namespace lean {
 obj* string_length(obj*);
@@ -79,12 +89,16 @@ obj* string_append(obj*, obj*);
 }
 obj* l_string_iterator_insert___boxed(obj*, obj*);
 obj* l_string_pop__back(obj*);
+usize l_string_trim__left__aux(obj*, obj*, usize);
 uint32 l___private_init_data_string_basic_3__utf8__get__aux___main(obj*, usize, usize);
 obj* l_string_intercalate(obj*, obj*);
 obj* l___private_init_data_string_basic_3__utf8__get__aux___main___boxed(obj*, obj*, obj*);
 namespace lean {
 uint8 string_dec_lt(obj*, obj*);
 }
+namespace lean {
+usize string_utf8_prev(obj*, usize);
+}
 obj* l_char_to__string___boxed(obj*);
 namespace lean {
 obj* string_iterator_to_end(obj*);
@@ -95,8 +109,6 @@ obj* string_iterator_extract(obj*, obj*);
 }
 uint32 l_string_back(obj*);
 obj* l_string_utf8__begin___boxed;
-obj* l_option_get__or__else___main___rarg(obj*, obj*);
-obj* l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___main___boxed(obj*, obj*, obj*);
 namespace lean {
 obj* string_data(obj*);
 }
@@ -109,6 +121,7 @@ uint8 string_iterator_has_next(obj*);
 obj* l___private_init_data_string_basic_8__line__column__aux(obj*, obj*, obj*);
 obj* l_string_utf8__at__end___boxed(obj*, obj*);
 obj* l___private_init_data_string_basic_9__to__nat__core___main___closed__1;
+obj* l___private_init_data_string_basic_7__utf8__extract__aux_u_2081(obj*, usize, usize, usize);
 namespace lean {
 uint8 nat_dec_eq(obj*, obj*);
 }
@@ -116,7 +129,10 @@ namespace lean {
 obj* string_iterator_remaining_to_string(obj*);
 }
 obj* l_string_line__column(obj*, obj*);
+obj* l___private_init_data_string_basic_4__utf8__set__aux___boxed(obj*, obj*, obj*, obj*);
 obj* l_string_iterator_nextn___main(obj*, obj*);
+obj* l_string_trim__right__aux___main___boxed(obj*, obj*, obj*);
+obj* l___private_init_data_string_basic_4__utf8__set__aux(uint32, obj*, usize, usize);
 obj* l_string_length___boxed(obj*);
 obj* l_string_iterator_to__string___boxed(obj*);
 obj* l_string_iterator_remove___boxed(obj*, obj*);
@@ -129,8 +145,8 @@ obj* l___private_init_data_string_basic_8__line__column__aux___main(obj*, obj*,
 namespace lean {
 obj* uint32_to_nat(uint32);
 }
-obj* l___private_init_data_string_basic_6__trim__left__aux(obj*, obj*);
 obj* l_string_utf8__get___boxed(obj*, obj*);
+obj* l_string_trim__left__aux___main___boxed(obj*, obj*, obj*);
 obj* l_string_has__append;
 namespace lean {
 obj* string_iterator_prev(obj*);
@@ -144,13 +160,12 @@ obj* l_list_intercalate___rarg(obj*, obj*);
 namespace lean {
 obj* string_iterator_offset(obj*);
 }
-obj* l___private_init_data_string_basic_5__utf8__extract__aux_u_2081___boxed(obj*, obj*, obj*, obj*);
 obj* l_string_utf8__byte__size___boxed(obj*);
 namespace lean {
 obj* string_mk(obj*);
 }
+usize l___private_init_data_string_basic_5__utf8__prev__aux___main(obj*, usize, usize);
 obj* l_string_inhabited;
-obj* l___private_init_data_string_basic_5__utf8__extract__aux_u_2081___main___boxed(obj*, obj*, obj*, obj*);
 obj* l_string_join(obj*);
 obj* l___private_init_data_string_basic_2__utf8__byte__size__aux___boxed(obj*, obj*);
 uint8 l_string_iterator_decidable__rel(obj*, obj*);
@@ -158,6 +173,7 @@ obj* l_string_push___boxed(obj*, obj*);
 obj* l_string_dec__eq___boxed(obj*, obj*);
 obj* l_string_mk__iterator___boxed(obj*);
 obj* l_string_iterator_decidable__rel___boxed(obj*, obj*);
+obj* l_string_utf8__prev___boxed(obj*, obj*);
 obj* l_string_utf8__next___boxed(obj*, obj*);
 obj* l_list_has__dec__eq___main___at_string_iterator_extract__core___main___spec__1___boxed(obj*, obj*);
 obj* l_string_iterator_nextn(obj*, obj*);
@@ -171,8 +187,10 @@ uint32 l_char_utf8__size(uint32);
 namespace lean {
 obj* string_iterator_insert(obj*, obj*);
 }
-obj* l___private_init_data_string_basic_6__trim__left__aux___main(obj*, obj*);
 obj* l___private_init_data_string_basic_3__utf8__get__aux___boxed(obj*, obj*, obj*);
+namespace lean {
+obj* string_utf8_set(obj*, usize, uint32);
+}
 obj* l_char_to__string(uint32);
 namespace lean {
 obj* string_iterator_remaining(obj*);
@@ -183,15 +201,17 @@ usize usize_of_nat(obj*);
 namespace lean {
 obj* string_mk_iterator(obj*);
 }
+usize l_string_bsize(obj*);
 obj* l_list_map___main___at_string_intercalate___spec__1(obj*);
-obj* l_string_utf8__extract___boxed(obj*, obj*, obj*);
 obj* l_string_has__sizeof;
 obj* l_string_to__list(obj*);
 obj* l_string_trim(obj*);
+obj* l_string_utf8__set___boxed(obj*, obj*, obj*);
 uint8 l_list_has__dec__eq___main___at_string_iterator_extract__core___main___spec__1(obj*, obj*);
-obj* l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___main(obj*, usize, usize);
+obj* l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___boxed(obj*, obj*, obj*);
 obj* l_string_iterator_set__curr___boxed(obj*, obj*);
 obj* l_nat_repeat__core___main___at_string_pushn___spec__1___boxed(obj*, obj*, obj*, obj*);
+obj* l_string_extract___boxed(obj*, obj*, obj*);
 obj* l_string_iterator_prev___boxed(obj*);
 namespace lean {
 uint32 uint32_of_nat(obj*);
@@ -200,6 +220,8 @@ namespace lean {
 obj* nat_mul(obj*, obj*);
 }
 obj* l_string_is__empty___boxed(obj*);
+obj* l___private_init_data_string_basic_4__utf8__set__aux___main(uint32, obj*, usize, usize);
+obj* l___private_init_data_string_basic_6__utf8__extract__aux_u_2082(obj*, usize, usize);
 namespace lean {
 uint8 string_iterator_has_prev(obj*);
 }
@@ -220,14 +242,19 @@ namespace lean {
 uint8 string_utf8_at_end(obj*, usize);
 }
 obj* l_string_iterator_remaining__to__string___boxed(obj*);
-obj* l___private_init_data_string_basic_5__utf8__extract__aux_u_2081(obj*, usize, usize, usize);
+usize l_string_trim__right__aux___main(obj*, obj*, usize);
 namespace lean {
 obj* string_iterator_to_string(obj*);
 }
-obj* l___private_init_data_string_basic_7__trim__right__aux(obj*, obj*);
 obj* l_string_iterator_has__prev___boxed(obj*);
+obj* l___private_init_data_string_basic_7__utf8__extract__aux_u_2081___main(obj*, usize, usize, usize);
+namespace lean {
+obj* usize_to_nat(usize);
+}
+obj* l___private_init_data_string_basic_7__utf8__extract__aux_u_2081___boxed(obj*, obj*, obj*, obj*);
+obj* l___private_init_data_string_basic_5__utf8__prev__aux___boxed(obj*, obj*, obj*);
 obj* l_string_dec__lt___boxed(obj*, obj*);
-obj* l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___boxed(obj*, obj*, obj*);
+obj* l_string_trim__left__aux___boxed(obj*, obj*, obj*);
 obj* l_string_join___boxed(obj*);
 obj* l_string_dec__eq___boxed(obj* x_0, obj* x_1) {
 _start:
@@ -484,6 +511,102 @@ lean::dec(x_0);
 return x_4;
 }
 }
+obj* l___private_init_data_string_basic_4__utf8__set__aux___main(uint32 x_0, obj* x_1, usize x_2, usize x_3) {
+_start:
+{
+if (lean::obj_tag(x_1) == 0)
+{
+return x_1;
+}
+else
+{
+obj* x_4; obj* x_6; obj* x_8; uint8 x_9; 
+x_4 = lean::cnstr_get(x_1, 0);
+x_6 = lean::cnstr_get(x_1, 1);
+if (lean::is_exclusive(x_1)) {
+ lean::cnstr_set(x_1, 0, lean::box(0));
+ lean::cnstr_set(x_1, 1, lean::box(0));
+ x_8 = x_1;
+} else {
+ lean::inc(x_4);
+ lean::inc(x_6);
+ lean::dec(x_1);
+ x_8 = lean::box(0);
+}
+x_9 = x_2 == x_3;
+if (x_9 == 0)
+{
+uint32 x_10; usize x_11; usize x_12; obj* x_13; obj* x_14; 
+x_10 = lean::unbox_uint32(x_4);
+x_11 = l___private_init_data_string_basic_1__csize(x_10);
+x_12 = x_2 + x_11;
+x_13 = l___private_init_data_string_basic_4__utf8__set__aux___main(x_0, x_6, x_12, x_3);
+if (lean::is_scalar(x_8)) {
+ x_14 = lean::alloc_cnstr(1, 2, 0);
+} else {
+ x_14 = x_8;
+}
+lean::cnstr_set(x_14, 0, x_4);
+lean::cnstr_set(x_14, 1, x_13);
+return x_14;
+}
+else
+{
+obj* x_16; obj* x_17; 
+lean::dec(x_4);
+x_16 = lean::box_uint32(x_0);
+if (lean::is_scalar(x_8)) {
+ x_17 = lean::alloc_cnstr(1, 2, 0);
+} else {
+ x_17 = x_8;
+}
+lean::cnstr_set(x_17, 0, x_16);
+lean::cnstr_set(x_17, 1, x_6);
+return x_17;
+}
+}
+}
+}
+obj* l___private_init_data_string_basic_4__utf8__set__aux___main___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
+_start:
+{
+uint32 x_4; usize x_5; usize x_6; obj* x_7; 
+x_4 = lean::unbox_uint32(x_0);
+x_5 = lean::unbox_size_t(x_2);
+x_6 = lean::unbox_size_t(x_3);
+x_7 = l___private_init_data_string_basic_4__utf8__set__aux___main(x_4, x_1, x_5, x_6);
+return x_7;
+}
+}
+obj* l___private_init_data_string_basic_4__utf8__set__aux(uint32 x_0, obj* x_1, usize x_2, usize x_3) {
+_start:
+{
+obj* x_4; 
+x_4 = l___private_init_data_string_basic_4__utf8__set__aux___main(x_0, x_1, x_2, x_3);
+return x_4;
+}
+}
+obj* l___private_init_data_string_basic_4__utf8__set__aux___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
+_start:
+{
+uint32 x_4; usize x_5; usize x_6; obj* x_7; 
+x_4 = lean::unbox_uint32(x_0);
+x_5 = lean::unbox_size_t(x_2);
+x_6 = lean::unbox_size_t(x_3);
+x_7 = l___private_init_data_string_basic_4__utf8__set__aux(x_4, x_1, x_5, x_6);
+return x_7;
+}
+}
+obj* l_string_utf8__set___boxed(obj* x_0, obj* x_1, obj* x_2) {
+_start:
+{
+usize x_3; uint32 x_4; obj* x_5; 
+x_3 = lean::unbox_size_t(x_1);
+x_4 = lean::unbox_uint32(x_2);
+x_5 = lean::string_utf8_set(x_0, x_3, x_4);
+return x_5;
+}
+}
 obj* l_string_utf8__next___boxed(obj* x_0, obj* x_1) {
 _start:
 {
@@ -495,6 +618,80 @@ lean::dec(x_0);
 return x_4;
 }
 }
+usize l___private_init_data_string_basic_5__utf8__prev__aux___main(obj* x_0, usize x_1, usize x_2) {
+_start:
+{
+if (lean::obj_tag(x_0) == 0)
+{
+usize x_3; 
+x_3 = 0;
+return x_3;
+}
+else
+{
+obj* x_4; obj* x_5; uint32 x_6; usize x_7; usize x_8; uint8 x_9; 
+x_4 = lean::cnstr_get(x_0, 0);
+x_5 = lean::cnstr_get(x_0, 1);
+x_6 = lean::unbox_uint32(x_4);
+x_7 = l___private_init_data_string_basic_1__csize(x_6);
+x_8 = x_1 + x_7;
+x_9 = x_8 == x_2;
+if (x_9 == 0)
+{
+x_0 = x_5;
+x_1 = x_8;
+goto _start;
+}
+else
+{
+return x_1;
+}
+}
+}
+}
+obj* l___private_init_data_string_basic_5__utf8__prev__aux___main___boxed(obj* x_0, obj* x_1, obj* x_2) {
+_start:
+{
+usize x_3; usize x_4; usize x_5; obj* x_6; 
+x_3 = lean::unbox_size_t(x_1);
+x_4 = lean::unbox_size_t(x_2);
+x_5 = l___private_init_data_string_basic_5__utf8__prev__aux___main(x_0, x_3, x_4);
+x_6 = lean::box_size_t(x_5);
+lean::dec(x_0);
+return x_6;
+}
+}
+usize l___private_init_data_string_basic_5__utf8__prev__aux(obj* x_0, usize x_1, usize x_2) {
+_start:
+{
+usize x_3; 
+x_3 = l___private_init_data_string_basic_5__utf8__prev__aux___main(x_0, x_1, x_2);
+return x_3;
+}
+}
+obj* l___private_init_data_string_basic_5__utf8__prev__aux___boxed(obj* x_0, obj* x_1, obj* x_2) {
+_start:
+{
+usize x_3; usize x_4; usize x_5; obj* x_6; 
+x_3 = lean::unbox_size_t(x_1);
+x_4 = lean::unbox_size_t(x_2);
+x_5 = l___private_init_data_string_basic_5__utf8__prev__aux(x_0, x_3, x_4);
+x_6 = lean::box_size_t(x_5);
+lean::dec(x_0);
+return x_6;
+}
+}
+obj* l_string_utf8__prev___boxed(obj* x_0, obj* x_1) {
+_start:
+{
+usize x_2; usize x_3; obj* x_4; 
+x_2 = lean::unbox_size_t(x_1);
+x_3 = lean::string_utf8_prev(x_0, x_2);
+x_4 = lean::box_size_t(x_3);
+lean::dec(x_0);
+return x_4;
+}
+}
 obj* l_string_utf8__at__end___boxed(obj* x_0, obj* x_1) {
 _start:
 {
@@ -506,7 +703,7 @@ lean::dec(x_0);
 return x_4;
 }
 }
-obj* l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___main(obj* x_0, usize x_1, usize x_2) {
+obj* l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___main(obj* x_0, usize x_1, usize x_2) {
 _start:
 {
 if (lean::obj_tag(x_0) == 0)
@@ -535,7 +732,7 @@ uint32 x_9; usize x_10; usize x_11; obj* x_12; obj* x_13;
 x_9 = lean::unbox_uint32(x_3);
 x_10 = l___private_init_data_string_basic_1__csize(x_9);
 x_11 = x_1 + x_10;
-x_12 = l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___main(x_5, x_11, x_2);
+x_12 = l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___main(x_5, x_11, x_2);
 if (lean::is_scalar(x_7)) {
  x_13 = lean::alloc_cnstr(1, 2, 0);
 } else {
@@ -557,35 +754,35 @@ return x_17;
 }
 }
 }
-obj* l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___main___boxed(obj* x_0, obj* x_1, obj* x_2) {
+obj* l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___main___boxed(obj* x_0, obj* x_1, obj* x_2) {
 _start:
 {
 usize x_3; usize x_4; obj* x_5; 
 x_3 = lean::unbox_size_t(x_1);
 x_4 = lean::unbox_size_t(x_2);
-x_5 = l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___main(x_0, x_3, x_4);
+x_5 = l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___main(x_0, x_3, x_4);
 return x_5;
 }
 }
-obj* l___private_init_data_string_basic_4__utf8__extract__aux_u_2082(obj* x_0, usize x_1, usize x_2) {
+obj* l___private_init_data_string_basic_6__utf8__extract__aux_u_2082(obj* x_0, usize x_1, usize x_2) {
 _start:
 {
 obj* x_3; 
-x_3 = l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___main(x_0, x_1, x_2);
+x_3 = l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___main(x_0, x_1, x_2);
 return x_3;
 }
 }
-obj* l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___boxed(obj* x_0, obj* x_1, obj* x_2) {
+obj* l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___boxed(obj* x_0, obj* x_1, obj* x_2) {
 _start:
 {
 usize x_3; usize x_4; obj* x_5; 
 x_3 = lean::unbox_size_t(x_1);
 x_4 = lean::unbox_size_t(x_2);
-x_5 = l___private_init_data_string_basic_4__utf8__extract__aux_u_2082(x_0, x_3, x_4);
+x_5 = l___private_init_data_string_basic_6__utf8__extract__aux_u_2082(x_0, x_3, x_4);
 return x_5;
 }
 }
-obj* l___private_init_data_string_basic_5__utf8__extract__aux_u_2081___main(obj* x_0, usize x_1, usize x_2, usize x_3) {
+obj* l___private_init_data_string_basic_7__utf8__extract__aux_u_2081___main(obj* x_0, usize x_1, usize x_2, usize x_3) {
 _start:
 {
 if (lean::obj_tag(x_0) == 0)
@@ -616,43 +813,43 @@ else
 obj* x_16; 
 lean::dec(x_6);
 lean::dec(x_4);
-x_16 = l___private_init_data_string_basic_4__utf8__extract__aux_u_2082___main(x_0, x_1, x_3);
+x_16 = l___private_init_data_string_basic_6__utf8__extract__aux_u_2082___main(x_0, x_1, x_3);
 return x_16;
 }
 }
 }
 }
-obj* l___private_init_data_string_basic_5__utf8__extract__aux_u_2081___main___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
+obj* l___private_init_data_string_basic_7__utf8__extract__aux_u_2081___main___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
 _start:
 {
 usize x_4; usize x_5; usize x_6; obj* x_7; 
 x_4 = lean::unbox_size_t(x_1);
 x_5 = lean::unbox_size_t(x_2);
 x_6 = lean::unbox_size_t(x_3);
-x_7 = l___private_init_data_string_basic_5__utf8__extract__aux_u_2081___main(x_0, x_4, x_5, x_6);
+x_7 = l___private_init_data_string_basic_7__utf8__extract__aux_u_2081___main(x_0, x_4, x_5, x_6);
 return x_7;
 }
 }
-obj* l___private_init_data_string_basic_5__utf8__extract__aux_u_2081(obj* x_0, usize x_1, usize x_2, usize x_3) {
+obj* l___private_init_data_string_basic_7__utf8__extract__aux_u_2081(obj* x_0, usize x_1, usize x_2, usize x_3) {
 _start:
 {
 obj* x_4; 
-x_4 = l___private_init_data_string_basic_5__utf8__extract__aux_u_2081___main(x_0, x_1, x_2, x_3);
+x_4 = l___private_init_data_string_basic_7__utf8__extract__aux_u_2081___main(x_0, x_1, x_2, x_3);
 return x_4;
 }
 }
-obj* l___private_init_data_string_basic_5__utf8__extract__aux_u_2081___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
+obj* l___private_init_data_string_basic_7__utf8__extract__aux_u_2081___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
 _start:
 {
 usize x_4; usize x_5; usize x_6; obj* x_7; 
 x_4 = lean::unbox_size_t(x_1);
 x_5 = lean::unbox_size_t(x_2);
 x_6 = lean::unbox_size_t(x_3);
-x_7 = l___private_init_data_string_basic_5__utf8__extract__aux_u_2081(x_0, x_4, x_5, x_6);
+x_7 = l___private_init_data_string_basic_7__utf8__extract__aux_u_2081(x_0, x_4, x_5, x_6);
 return x_7;
 }
 }
-obj* l_string_utf8__extract___boxed(obj* x_0, obj* x_1, obj* x_2) {
+obj* l_string_extract___boxed(obj* x_0, obj* x_1, obj* x_2) {
 _start:
 {
 usize x_3; usize x_4; obj* x_5; 
@@ -663,6 +860,283 @@ lean::dec(x_0);
 return x_5;
 }
 }
+usize l_string_bsize(obj* x_0) {
+_start:
+{
+usize x_1; 
+x_1 = lean::string_utf8_byte_size(x_0);
+return x_1;
+}
+}
+obj* l_string_bsize___boxed(obj* x_0) {
+_start:
+{
+usize x_1; obj* x_2; 
+x_1 = l_string_bsize(x_0);
+x_2 = lean::box_size_t(x_1);
+lean::dec(x_0);
+return x_2;
+}
+}
+usize l_string_trim__left__aux___main(obj* x_0, obj* x_1, usize x_2) {
+_start:
+{
+obj* x_3; uint8 x_4; 
+x_3 = lean::mk_nat_obj(0u);
+x_4 = lean::nat_dec_eq(x_1, x_3);
+if (x_4 == 0)
+{
+usize x_5; uint8 x_6; 
+x_5 = lean::string_utf8_byte_size(x_0);
+x_6 = x_5 <= x_2;
+if (x_6 == 0)
+{
+uint32 x_7; uint8 x_8; 
+x_7 = lean::string_utf8_get(x_0, x_2);
+x_8 = l_char_is__whitespace(x_7);
+if (x_8 == 0)
+{
+lean::dec(x_1);
+return x_2;
+}
+else
+{
+obj* x_10; obj* x_11; usize x_13; usize x_14; 
+x_10 = lean::mk_nat_obj(1u);
+x_11 = lean::nat_sub(x_1, x_10);
+lean::dec(x_1);
+x_13 = l___private_init_data_string_basic_1__csize(x_7);
+x_14 = x_2 + x_13;
+x_1 = x_11;
+x_2 = x_14;
+goto _start;
+}
+}
+else
+{
+lean::dec(x_1);
+return x_2;
+}
+}
+else
+{
+lean::dec(x_1);
+return x_2;
+}
+}
+}
+obj* l_string_trim__left__aux___main___boxed(obj* x_0, obj* x_1, obj* x_2) {
+_start:
+{
+usize x_3; usize x_4; obj* x_5; 
+x_3 = lean::unbox_size_t(x_2);
+x_4 = l_string_trim__left__aux___main(x_0, x_1, x_3);
+x_5 = lean::box_size_t(x_4);
+lean::dec(x_0);
+return x_5;
+}
+}
+usize l_string_trim__left__aux(obj* x_0, obj* x_1, usize x_2) {
+_start:
+{
+usize x_3; 
+x_3 = l_string_trim__left__aux___main(x_0, x_1, x_2);
+return x_3;
+}
+}
+obj* l_string_trim__left__aux___boxed(obj* x_0, obj* x_1, obj* x_2) {
+_start:
+{
+usize x_3; usize x_4; obj* x_5; 
+x_3 = lean::unbox_size_t(x_2);
+x_4 = l_string_trim__left__aux(x_0, x_1, x_3);
+x_5 = lean::box_size_t(x_4);
+lean::dec(x_0);
+return x_5;
+}
+}
+obj* l_string_trim__left(obj* x_0) {
+_start:
+{
+usize x_1; obj* x_2; usize x_3; usize x_4; uint8 x_5; 
+x_1 = lean::string_utf8_byte_size(x_0);
+x_2 = lean::usize_to_nat(x_1);
+x_3 = 0;
+x_4 = l_string_trim__left__aux___main(x_0, x_2, x_3);
+x_5 = x_4 == x_3;
+if (x_5 == 0)
+{
+obj* x_6; 
+x_6 = lean::string_utf8_extract(x_0, x_4, x_1);
+return x_6;
+}
+else
+{
+lean::inc(x_0);
+return x_0;
+}
+}
+}
+obj* l_string_trim__left___boxed(obj* x_0) {
+_start:
+{
+obj* x_1; 
+x_1 = l_string_trim__left(x_0);
+lean::dec(x_0);
+return x_1;
+}
+}
+usize l_string_trim__right__aux___main(obj* x_0, obj* x_1, usize x_2) {
+_start:
+{
+obj* x_3; uint8 x_4; 
+x_3 = lean::mk_nat_obj(0u);
+x_4 = lean::nat_dec_eq(x_1, x_3);
+if (x_4 == 0)
+{
+usize x_5; uint8 x_6; 
+x_5 = 0;
+x_6 = x_2 == x_5;
+if (x_6 == 0)
+{
+usize x_7; uint32 x_8; uint8 x_9; 
+x_7 = lean::string_utf8_prev(x_0, x_2);
+x_8 = lean::string_utf8_get(x_0, x_7);
+x_9 = l_char_is__whitespace(x_8);
+if (x_9 == 0)
+{
+lean::dec(x_1);
+return x_2;
+}
+else
+{
+obj* x_11; obj* x_12; 
+x_11 = lean::mk_nat_obj(1u);
+x_12 = lean::nat_sub(x_1, x_11);
+lean::dec(x_1);
+x_1 = x_12;
+x_2 = x_7;
+goto _start;
+}
+}
+else
+{
+lean::dec(x_1);
+return x_2;
+}
+}
+else
+{
+lean::dec(x_1);
+return x_2;
+}
+}
+}
+obj* l_string_trim__right__aux___main___boxed(obj* x_0, obj* x_1, obj* x_2) {
+_start:
+{
+usize x_3; usize x_4; obj* x_5; 
+x_3 = lean::unbox_size_t(x_2);
+x_4 = l_string_trim__right__aux___main(x_0, x_1, x_3);
+x_5 = lean::box_size_t(x_4);
+lean::dec(x_0);
+return x_5;
+}
+}
+usize l_string_trim__right__aux(obj* x_0, obj* x_1, usize x_2) {
+_start:
+{
+usize x_3; 
+x_3 = l_string_trim__right__aux___main(x_0, x_1, x_2);
+return x_3;
+}
+}
+obj* l_string_trim__right__aux___boxed(obj* x_0, obj* x_1, obj* x_2) {
+_start:
+{
+usize x_3; usize x_4; obj* x_5; 
+x_3 = lean::unbox_size_t(x_2);
+x_4 = l_string_trim__right__aux(x_0, x_1, x_3);
+x_5 = lean::box_size_t(x_4);
+lean::dec(x_0);
+return x_5;
+}
+}
+obj* l_string_trim__right(obj* x_0) {
+_start:
+{
+usize x_1; obj* x_2; usize x_3; uint8 x_4; 
+x_1 = lean::string_utf8_byte_size(x_0);
+x_2 = lean::usize_to_nat(x_1);
+x_3 = l_string_trim__right__aux___main(x_0, x_2, x_1);
+x_4 = x_3 == x_1;
+if (x_4 == 0)
+{
+usize x_5; obj* x_6; 
+x_5 = 0;
+x_6 = lean::string_utf8_extract(x_0, x_5, x_3);
+return x_6;
+}
+else
+{
+lean::inc(x_0);
+return x_0;
+}
+}
+}
+obj* l_string_trim__right___boxed(obj* x_0) {
+_start:
+{
+obj* x_1; 
+x_1 = l_string_trim__right(x_0);
+lean::dec(x_0);
+return x_1;
+}
+}
+obj* l_string_trim(obj* x_0) {
+_start:
+{
+usize x_1; obj* x_2; usize x_3; usize x_5; usize x_6; uint8 x_7; 
+x_1 = lean::string_utf8_byte_size(x_0);
+x_2 = lean::usize_to_nat(x_1);
+x_3 = 0;
+lean::inc(x_2);
+x_5 = l_string_trim__left__aux___main(x_0, x_2, x_3);
+x_6 = l_string_trim__right__aux___main(x_0, x_2, x_1);
+x_7 = x_5 == x_3;
+if (x_7 == 0)
+{
+obj* x_8; 
+x_8 = lean::string_utf8_extract(x_0, x_5, x_6);
+return x_8;
+}
+else
+{
+uint8 x_9; 
+x_9 = x_6 == x_1;
+if (x_9 == 0)
+{
+obj* x_10; 
+x_10 = lean::string_utf8_extract(x_0, x_5, x_6);
+return x_10;
+}
+else
+{
+lean::inc(x_0);
+return x_0;
+}
+}
+}
+}
+obj* l_string_trim___boxed(obj* x_0) {
+_start:
+{
+obj* x_1; 
+x_1 = l_string_trim(x_0);
+lean::dec(x_0);
+return x_1;
+}
+}
 obj* l_string_mk__iterator___boxed(obj* x_0) {
 _start:
 {
@@ -1449,140 +1923,6 @@ lean::dec(x_4);
 return x_5;
 }
 }
-obj* l___private_init_data_string_basic_6__trim__left__aux___main(obj* x_0, obj* x_1) {
-_start:
-{
-obj* x_2; uint8 x_3; 
-x_2 = lean::mk_nat_obj(0u);
-x_3 = lean::nat_dec_eq(x_0, x_2);
-if (x_3 == 0)
-{
-uint32 x_4; uint8 x_5; 
-x_4 = lean::string_iterator_curr(x_1);
-x_5 = l_char_is__whitespace(x_4);
-if (x_5 == 0)
-{
-lean::dec(x_0);
-return x_1;
-}
-else
-{
-obj* x_7; obj* x_8; obj* x_10; 
-x_7 = lean::mk_nat_obj(1u);
-x_8 = lean::nat_sub(x_0, x_7);
-lean::dec(x_0);
-x_10 = lean::string_iterator_next(x_1);
-x_0 = x_8;
-x_1 = x_10;
-goto _start;
-}
-}
-else
-{
-lean::dec(x_0);
-return x_1;
-}
-}
-}
-obj* l___private_init_data_string_basic_6__trim__left__aux(obj* x_0, obj* x_1) {
-_start:
-{
-obj* x_2; 
-x_2 = l___private_init_data_string_basic_6__trim__left__aux___main(x_0, x_1);
-return x_2;
-}
-}
-obj* l_string_trim__left(obj* x_0) {
-_start:
-{
-obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
-x_1 = lean::string_length(x_0);
-x_2 = lean::string_mk_iterator(x_0);
-x_3 = l___private_init_data_string_basic_6__trim__left__aux___main(x_1, x_2);
-x_4 = lean::string_iterator_remaining_to_string(x_3);
-lean::dec(x_3);
-return x_4;
-}
-}
-obj* l___private_init_data_string_basic_7__trim__right__aux___main(obj* x_0, obj* x_1) {
-_start:
-{
-obj* x_2; uint8 x_3; 
-x_2 = lean::mk_nat_obj(0u);
-x_3 = lean::nat_dec_eq(x_0, x_2);
-if (x_3 == 0)
-{
-obj* x_5; uint32 x_6; uint8 x_7; 
-lean::inc(x_1);
-x_5 = lean::string_iterator_prev(x_1);
-x_6 = lean::string_iterator_curr(x_5);
-x_7 = l_char_is__whitespace(x_6);
-if (x_7 == 0)
-{
-lean::dec(x_5);
-lean::dec(x_0);
-return x_1;
-}
-else
-{
-obj* x_11; obj* x_12; 
-lean::dec(x_1);
-x_11 = lean::mk_nat_obj(1u);
-x_12 = lean::nat_sub(x_0, x_11);
-lean::dec(x_0);
-x_0 = x_12;
-x_1 = x_5;
-goto _start;
-}
-}
-else
-{
-lean::dec(x_0);
-return x_1;
-}
-}
-}
-obj* l___private_init_data_string_basic_7__trim__right__aux(obj* x_0, obj* x_1) {
-_start:
-{
-obj* x_2; 
-x_2 = l___private_init_data_string_basic_7__trim__right__aux___main(x_0, x_1);
-return x_2;
-}
-}
-obj* l_string_trim__right(obj* x_0) {
-_start:
-{
-obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; 
-x_1 = lean::string_length(x_0);
-x_2 = lean::string_mk_iterator(x_0);
-x_3 = lean::string_iterator_to_end(x_2);
-x_4 = l___private_init_data_string_basic_7__trim__right__aux___main(x_1, x_3);
-x_5 = lean::string_iterator_prev_to_string(x_4);
-lean::dec(x_4);
-return x_5;
-}
-}
-obj* l_string_trim(obj* x_0) {
-_start:
-{
-obj* x_1; obj* x_2; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; 
-x_1 = lean::string_length(x_0);
-x_2 = lean::string_mk_iterator(x_0);
-lean::inc(x_2);
-lean::inc(x_1);
-x_5 = l___private_init_data_string_basic_6__trim__left__aux___main(x_1, x_2);
-x_6 = lean::string_iterator_to_end(x_2);
-x_7 = l___private_init_data_string_basic_7__trim__right__aux___main(x_1, x_6);
-x_8 = lean::string_iterator_extract(x_5, x_7);
-lean::dec(x_7);
-lean::dec(x_5);
-x_11 = l_string_join___closed__1;
-x_12 = l_option_get__or__else___main___rarg(x_8, x_11);
-lean::dec(x_8);
-return x_12;
-}
-}
 obj* l___private_init_data_string_basic_8__line__column__aux___main(obj* x_0, obj* x_1, obj* x_2) {
 _start:
 {
diff --git a/src/boot/init/lean/elaborator.cpp b/src/boot/init/lean/elaborator.cpp
index fdc11a8bf6..cd59fcb00a 100644
--- a/src/boot/init/lean/elaborator.cpp
+++ b/src/boot/init/lean/elaborator.cpp
@@ -21820,18 +21820,19 @@ return x_8;
 obj* _init_l_lean_elaborator_declaration_elaborate___closed__2() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("def");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-x_5 = lean::alloc_cnstr(0, 1, 0);
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
 lean::cnstr_set(x_5, 0, x_4);
-return x_5;
+x_6 = lean::alloc_cnstr(0, 1, 0);
+lean::cnstr_set(x_6, 0, x_5);
+return x_6;
 }
 }
 obj* _init_l_lean_elaborator_declaration_elaborate___closed__3() {
@@ -23989,7 +23990,7 @@ return x_13;
 }
 else
 {
-obj* x_14; obj* x_17; obj* x_20; obj* x_23; obj* x_25; obj* x_27; obj* x_30; obj* x_33; obj* x_34; obj* x_35; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_42; obj* x_44; obj* x_46; obj* x_49; 
+obj* x_14; obj* x_17; obj* x_20; obj* x_23; obj* x_25; obj* x_27; obj* x_30; obj* x_33; obj* x_35; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_45; obj* x_47; obj* x_50; 
 x_14 = lean::cnstr_get(x_1, 1);
 lean::inc(x_14);
 lean::dec(x_1);
@@ -24010,33 +24011,34 @@ x_30 = lean::cnstr_get(x_20, 1);
 lean::inc(x_30);
 lean::dec(x_20);
 x_33 = l_string_trim(x_30);
-x_34 = l_lean_elaborator_prec__to__nat___main(x_17);
-x_35 = lean::box(0);
+lean::dec(x_30);
+x_35 = l_lean_elaborator_prec__to__nat___main(x_17);
+x_36 = lean::box(0);
 lean::inc(x_33);
-x_37 = lean::alloc_cnstr(0, 3, 0);
-lean::cnstr_set(x_37, 0, x_33);
-lean::cnstr_set(x_37, 1, x_34);
-lean::cnstr_set(x_37, 2, x_35);
-x_38 = l_lean_parser_trie_insert___rarg(x_27, x_33, x_37);
-x_39 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_39, 0, x_25);
-lean::cnstr_set(x_39, 1, x_38);
-x_40 = lean::cnstr_get(x_0, 1);
-lean::inc(x_40);
-x_42 = lean::cnstr_get(x_0, 2);
-lean::inc(x_42);
-x_44 = lean::cnstr_get(x_0, 3);
-lean::inc(x_44);
-x_46 = lean::cnstr_get(x_0, 4);
-lean::inc(x_46);
+x_38 = lean::alloc_cnstr(0, 3, 0);
+lean::cnstr_set(x_38, 0, x_33);
+lean::cnstr_set(x_38, 1, x_35);
+lean::cnstr_set(x_38, 2, x_36);
+x_39 = l_lean_parser_trie_insert___rarg(x_27, x_33, x_38);
+x_40 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_40, 0, x_25);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = lean::cnstr_get(x_0, 1);
+lean::inc(x_41);
+x_43 = lean::cnstr_get(x_0, 2);
+lean::inc(x_43);
+x_45 = lean::cnstr_get(x_0, 3);
+lean::inc(x_45);
+x_47 = lean::cnstr_get(x_0, 4);
+lean::inc(x_47);
 lean::dec(x_0);
-x_49 = lean::alloc_cnstr(0, 5, 0);
-lean::cnstr_set(x_49, 0, x_39);
-lean::cnstr_set(x_49, 1, x_40);
-lean::cnstr_set(x_49, 2, x_42);
-lean::cnstr_set(x_49, 3, x_44);
-lean::cnstr_set(x_49, 4, x_46);
-x_0 = x_49;
+x_50 = lean::alloc_cnstr(0, 5, 0);
+lean::cnstr_set(x_50, 0, x_40);
+lean::cnstr_set(x_50, 1, x_41);
+lean::cnstr_set(x_50, 2, x_43);
+lean::cnstr_set(x_50, 3, x_45);
+lean::cnstr_set(x_50, 4, x_47);
+x_0 = x_50;
 x_1 = x_14;
 goto _start;
 }
@@ -24182,7 +24184,7 @@ goto lbl_8;
 }
 else
 {
-obj* x_18; obj* x_21; obj* x_24; obj* x_26; obj* x_27; obj* x_28; 
+obj* x_18; obj* x_21; obj* x_24; obj* x_27; obj* x_28; obj* x_29; 
 x_18 = lean::cnstr_get(x_13, 0);
 lean::inc(x_18);
 lean::dec(x_13);
@@ -24190,266 +24192,267 @@ x_21 = lean::cnstr_get(x_18, 1);
 lean::inc(x_21);
 lean::dec(x_18);
 x_24 = l_string_trim(x_21);
+lean::dec(x_21);
 lean::inc(x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_26, 0, x_24);
-x_27 = lean::mk_nat_obj(0u);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_28, 0, x_24);
-lean::closure_set(x_28, 1, x_27);
-lean::closure_set(x_28, 2, x_26);
-x_9 = x_28;
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_27, 0, x_24);
+x_28 = lean::mk_nat_obj(0u);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_29, 0, x_24);
+lean::closure_set(x_29, 1, x_28);
+lean::closure_set(x_29, 2, x_27);
+x_9 = x_29;
 goto lbl_10;
 }
 lbl_8:
 {
 if (lean::obj_tag(x_7) == 0)
 {
-obj* x_31; obj* x_33; obj* x_34; 
+obj* x_32; obj* x_34; obj* x_35; 
 lean::dec(x_6);
 lean::dec(x_4);
-x_31 = lean::cnstr_get(x_7, 0);
+x_32 = lean::cnstr_get(x_7, 0);
 if (lean::is_exclusive(x_7)) {
- x_33 = x_7;
+ x_34 = x_7;
 } else {
- lean::inc(x_31);
+ lean::inc(x_32);
  lean::dec(x_7);
- x_33 = lean::box(0);
+ x_34 = lean::box(0);
 }
-if (lean::is_scalar(x_33)) {
- x_34 = lean::alloc_cnstr(0, 1, 0);
+if (lean::is_scalar(x_34)) {
+ x_35 = lean::alloc_cnstr(0, 1, 0);
 } else {
- x_34 = x_33;
+ x_35 = x_34;
 }
-lean::cnstr_set(x_34, 0, x_31);
-return x_34;
+lean::cnstr_set(x_35, 0, x_32);
+return x_35;
 }
 else
 {
-obj* x_35; obj* x_38; 
-x_35 = lean::cnstr_get(x_7, 0);
-lean::inc(x_35);
+obj* x_36; obj* x_39; 
+x_36 = lean::cnstr_get(x_7, 0);
+lean::inc(x_36);
 lean::dec(x_7);
-x_38 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2(x_4);
-if (lean::obj_tag(x_38) == 0)
+x_39 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2(x_4);
+if (lean::obj_tag(x_39) == 0)
 {
-obj* x_41; obj* x_43; obj* x_44; 
+obj* x_42; obj* x_44; obj* x_45; 
 lean::dec(x_6);
-lean::dec(x_35);
-x_41 = lean::cnstr_get(x_38, 0);
-if (lean::is_exclusive(x_38)) {
- x_43 = x_38;
+lean::dec(x_36);
+x_42 = lean::cnstr_get(x_39, 0);
+if (lean::is_exclusive(x_39)) {
+ x_44 = x_39;
 } else {
- lean::inc(x_41);
- lean::dec(x_38);
- x_43 = lean::box(0);
+ lean::inc(x_42);
+ lean::dec(x_39);
+ x_44 = lean::box(0);
 }
-if (lean::is_scalar(x_43)) {
- x_44 = lean::alloc_cnstr(0, 1, 0);
+if (lean::is_scalar(x_44)) {
+ x_45 = lean::alloc_cnstr(0, 1, 0);
 } else {
- x_44 = x_43;
+ x_45 = x_44;
 }
-lean::cnstr_set(x_44, 0, x_41);
-return x_44;
+lean::cnstr_set(x_45, 0, x_42);
+return x_45;
 }
 else
 {
-obj* x_45; obj* x_47; obj* x_48; obj* x_49; 
-x_45 = lean::cnstr_get(x_38, 0);
-if (lean::is_exclusive(x_38)) {
- x_47 = x_38;
+obj* x_46; obj* x_48; obj* x_49; obj* x_50; 
+x_46 = lean::cnstr_get(x_39, 0);
+if (lean::is_exclusive(x_39)) {
+ x_48 = x_39;
 } else {
- lean::inc(x_45);
- lean::dec(x_38);
- x_47 = lean::box(0);
+ lean::inc(x_46);
+ lean::dec(x_39);
+ x_48 = lean::box(0);
 }
 if (lean::is_scalar(x_6)) {
- x_48 = lean::alloc_cnstr(1, 2, 0);
+ x_49 = lean::alloc_cnstr(1, 2, 0);
 } else {
- x_48 = x_6;
+ x_49 = x_6;
 }
-lean::cnstr_set(x_48, 0, x_35);
-lean::cnstr_set(x_48, 1, x_45);
-if (lean::is_scalar(x_47)) {
- x_49 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_49, 0, x_36);
+lean::cnstr_set(x_49, 1, x_46);
+if (lean::is_scalar(x_48)) {
+ x_50 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_49 = x_47;
+ x_50 = x_48;
 }
-lean::cnstr_set(x_49, 0, x_48);
-return x_49;
+lean::cnstr_set(x_50, 0, x_49);
+return x_50;
 }
 }
 }
 lbl_10:
 {
-obj* x_50; obj* x_52; 
-x_52 = lean::cnstr_get(x_2, 1);
-lean::inc(x_52);
+obj* x_51; obj* x_53; 
+x_53 = lean::cnstr_get(x_2, 1);
+lean::inc(x_53);
 lean::dec(x_2);
-if (lean::obj_tag(x_52) == 0)
+if (lean::obj_tag(x_53) == 0)
 {
-obj* x_55; 
-x_55 = l_lean_expander_no__expansion___closed__1;
-x_50 = x_55;
-goto lbl_51;
+obj* x_56; 
+x_56 = l_lean_expander_no__expansion___closed__1;
+x_51 = x_56;
+goto lbl_52;
 }
 else
 {
-obj* x_56; 
-x_56 = lean::cnstr_get(x_52, 0);
-lean::inc(x_56);
-lean::dec(x_52);
-switch (lean::obj_tag(x_56)) {
+obj* x_57; 
+x_57 = lean::cnstr_get(x_53, 0);
+lean::inc(x_57);
+lean::dec(x_53);
+switch (lean::obj_tag(x_57)) {
 case 0:
 {
-obj* x_60; 
-lean::dec(x_56);
-x_60 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2___closed__1;
-x_50 = x_60;
-goto lbl_51;
+obj* x_61; 
+lean::dec(x_57);
+x_61 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2___closed__1;
+x_51 = x_61;
+goto lbl_52;
 }
 case 1:
 {
-obj* x_62; 
-lean::dec(x_56);
-x_62 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2___closed__2;
-x_50 = x_62;
-goto lbl_51;
+obj* x_63; 
+lean::dec(x_57);
+x_63 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2___closed__2;
+x_51 = x_63;
+goto lbl_52;
 }
 default:
 {
-obj* x_63; obj* x_66; 
-x_63 = lean::cnstr_get(x_56, 0);
-lean::inc(x_63);
-lean::dec(x_56);
-x_66 = lean::cnstr_get(x_63, 1);
-lean::inc(x_66);
-lean::dec(x_63);
-if (lean::obj_tag(x_66) == 0)
+obj* x_64; obj* x_67; 
+x_64 = lean::cnstr_get(x_57, 0);
+lean::inc(x_64);
+lean::dec(x_57);
+x_67 = lean::cnstr_get(x_64, 1);
+lean::inc(x_67);
+lean::dec(x_64);
+if (lean::obj_tag(x_67) == 0)
 {
-obj* x_69; 
-x_69 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2___closed__3;
-x_50 = x_69;
-goto lbl_51;
+obj* x_70; 
+x_70 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2___closed__3;
+x_51 = x_70;
+goto lbl_52;
 }
 else
 {
-obj* x_70; obj* x_72; obj* x_73; 
-x_70 = lean::cnstr_get(x_66, 0);
-if (lean::is_exclusive(x_66)) {
- lean::cnstr_set(x_66, 0, lean::box(0));
- x_72 = x_66;
+obj* x_71; obj* x_73; obj* x_74; 
+x_71 = lean::cnstr_get(x_67, 0);
+if (lean::is_exclusive(x_67)) {
+ lean::cnstr_set(x_67, 0, lean::box(0));
+ x_73 = x_67;
 } else {
- lean::inc(x_70);
- lean::dec(x_66);
- x_72 = lean::box(0);
+ lean::inc(x_71);
+ lean::dec(x_67);
+ x_73 = lean::box(0);
 }
-x_73 = lean::cnstr_get(x_70, 1);
-lean::inc(x_73);
-lean::dec(x_70);
-switch (lean::obj_tag(x_73)) {
+x_74 = lean::cnstr_get(x_71, 1);
+lean::inc(x_74);
+lean::dec(x_71);
+switch (lean::obj_tag(x_74)) {
 case 0:
 {
-obj* x_76; obj* x_79; obj* x_80; obj* x_81; obj* x_82; 
-x_76 = lean::cnstr_get(x_73, 0);
-lean::inc(x_76);
-lean::dec(x_73);
-x_79 = l_lean_parser_command_notation__spec_precedence__term_view_to__nat___main(x_76);
-x_80 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_80, 0, x_79);
-if (lean::is_scalar(x_72)) {
- x_81 = lean::alloc_cnstr(1, 1, 0);
+obj* x_77; obj* x_80; obj* x_81; obj* x_82; obj* x_83; 
+x_77 = lean::cnstr_get(x_74, 0);
+lean::inc(x_77);
+lean::dec(x_74);
+x_80 = l_lean_parser_command_notation__spec_precedence__term_view_to__nat___main(x_77);
+x_81 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_81, 0, x_80);
+if (lean::is_scalar(x_73)) {
+ x_82 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_81 = x_72;
+ x_82 = x_73;
 }
-lean::cnstr_set(x_81, 0, x_80);
-x_82 = lean::alloc_cnstr(1, 1, 0);
 lean::cnstr_set(x_82, 0, x_81);
-x_50 = x_82;
-goto lbl_51;
+x_83 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_83, 0, x_82);
+x_51 = x_83;
+goto lbl_52;
 }
 case 2:
 {
-obj* x_83; obj* x_86; obj* x_89; obj* x_90; obj* x_91; obj* x_92; 
-x_83 = lean::cnstr_get(x_73, 0);
-lean::inc(x_83);
-lean::dec(x_73);
-x_86 = lean::cnstr_get(x_83, 2);
-lean::inc(x_86);
-lean::dec(x_83);
-x_89 = l_lean_elaborator_prec__to__nat___main(x_86);
-x_90 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_90, 0, x_89);
-if (lean::is_scalar(x_72)) {
- x_91 = lean::alloc_cnstr(1, 1, 0);
+obj* x_84; obj* x_87; obj* x_90; obj* x_91; obj* x_92; obj* x_93; 
+x_84 = lean::cnstr_get(x_74, 0);
+lean::inc(x_84);
+lean::dec(x_74);
+x_87 = lean::cnstr_get(x_84, 2);
+lean::inc(x_87);
+lean::dec(x_84);
+x_90 = l_lean_elaborator_prec__to__nat___main(x_87);
+x_91 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_91, 0, x_90);
+if (lean::is_scalar(x_73)) {
+ x_92 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_91 = x_72;
+ x_92 = x_73;
 }
-lean::cnstr_set(x_91, 0, x_90);
-x_92 = lean::alloc_cnstr(1, 1, 0);
 lean::cnstr_set(x_92, 0, x_91);
-x_50 = x_92;
-goto lbl_51;
+x_93 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_93, 0, x_92);
+x_51 = x_93;
+goto lbl_52;
 }
 default:
 {
-obj* x_95; 
+obj* x_96; 
 lean::dec(x_73);
-lean::dec(x_72);
-x_95 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2___closed__4;
-x_50 = x_95;
-goto lbl_51;
+lean::dec(x_74);
+x_96 = l_list_mmap___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__2___closed__4;
+x_51 = x_96;
+goto lbl_52;
 }
 }
 }
 }
 }
 }
-lbl_51:
+lbl_52:
 {
-if (lean::obj_tag(x_50) == 0)
+if (lean::obj_tag(x_51) == 0)
 {
-obj* x_97; obj* x_99; obj* x_100; 
+obj* x_98; obj* x_100; obj* x_101; 
 lean::dec(x_9);
-x_97 = lean::cnstr_get(x_50, 0);
-if (lean::is_exclusive(x_50)) {
- x_99 = x_50;
+x_98 = lean::cnstr_get(x_51, 0);
+if (lean::is_exclusive(x_51)) {
+ x_100 = x_51;
 } else {
- lean::inc(x_97);
- lean::dec(x_50);
- x_99 = lean::box(0);
+ lean::inc(x_98);
+ lean::dec(x_51);
+ x_100 = lean::box(0);
 }
-if (lean::is_scalar(x_99)) {
- x_100 = lean::alloc_cnstr(0, 1, 0);
+if (lean::is_scalar(x_100)) {
+ x_101 = lean::alloc_cnstr(0, 1, 0);
 } else {
- x_100 = x_99;
+ x_101 = x_100;
 }
-lean::cnstr_set(x_100, 0, x_97);
-x_7 = x_100;
+lean::cnstr_set(x_101, 0, x_98);
+x_7 = x_101;
 goto lbl_8;
 }
 else
 {
-obj* x_101; obj* x_103; obj* x_104; obj* x_105; obj* x_106; 
-x_101 = lean::cnstr_get(x_50, 0);
-if (lean::is_exclusive(x_50)) {
- x_103 = x_50;
+obj* x_102; obj* x_104; obj* x_105; obj* x_106; obj* x_107; 
+x_102 = lean::cnstr_get(x_51, 0);
+if (lean::is_exclusive(x_51)) {
+ x_104 = x_51;
 } else {
- lean::inc(x_101);
- lean::dec(x_50);
- x_103 = lean::box(0);
+ lean::inc(x_102);
+ lean::dec(x_51);
+ x_104 = lean::box(0);
 }
-x_104 = l_option_to__monad___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__1___rarg(x_101);
-x_105 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_105, 0, x_9);
-lean::cnstr_set(x_105, 1, x_104);
-if (lean::is_scalar(x_103)) {
- x_106 = lean::alloc_cnstr(1, 1, 0);
+x_105 = l_option_to__monad___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__1___rarg(x_102);
+x_106 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_106, 0, x_9);
+lean::cnstr_set(x_106, 1, x_105);
+if (lean::is_scalar(x_104)) {
+ x_107 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_106 = x_103;
+ x_107 = x_104;
 }
-lean::cnstr_set(x_106, 0, x_105);
-x_7 = x_106;
+lean::cnstr_set(x_107, 0, x_106);
+x_7 = x_107;
 goto lbl_8;
 }
 }
@@ -24671,179 +24674,180 @@ x_49 = lean::cnstr_get(x_46, 1);
 lean::inc(x_49);
 lean::dec(x_46);
 x_52 = l_string_trim(x_49);
+lean::dec(x_49);
 x_21 = x_52;
 goto lbl_22;
 }
 }
 lbl_22:
 {
-obj* x_53; obj* x_54; obj* x_55; 
-x_53 = l_list_map___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__3(x_18);
-x_54 = l_list_join___main___rarg(x_53);
-x_55 = lean::cnstr_get(x_1, 0);
-lean::inc(x_55);
+obj* x_54; obj* x_55; obj* x_56; 
+x_54 = l_list_map___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__3(x_18);
+x_55 = l_list_join___main___rarg(x_54);
+x_56 = lean::cnstr_get(x_1, 0);
+lean::inc(x_56);
 lean::dec(x_1);
-if (lean::obj_tag(x_55) == 0)
+if (lean::obj_tag(x_56) == 0)
 {
-obj* x_58; 
-x_58 = lean::cnstr_get(x_3, 0);
-lean::inc(x_58);
+obj* x_59; 
+x_59 = lean::cnstr_get(x_3, 0);
+lean::inc(x_59);
 lean::dec(x_3);
-if (lean::obj_tag(x_58) == 0)
+if (lean::obj_tag(x_59) == 0)
 {
-obj* x_61; obj* x_63; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_71; obj* x_73; obj* x_76; obj* x_77; 
-x_61 = lean::cnstr_get(x_2, 0);
-lean::inc(x_61);
-x_63 = lean::cnstr_get(x_2, 1);
-lean::inc(x_63);
-x_65 = lean::box(0);
-x_66 = lean_name_mk_string(x_65, x_21);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_67, 0, x_0);
-lean::closure_set(x_67, 1, x_54);
-x_68 = l_lean_parser_token__map_insert___rarg(x_63, x_66, x_67);
-x_69 = lean::cnstr_get(x_2, 2);
-lean::inc(x_69);
-x_71 = lean::cnstr_get(x_2, 3);
-lean::inc(x_71);
-x_73 = lean::cnstr_get(x_2, 4);
-lean::inc(x_73);
+obj* x_62; obj* x_64; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_72; obj* x_74; obj* x_77; obj* x_78; 
+x_62 = lean::cnstr_get(x_2, 0);
+lean::inc(x_62);
+x_64 = lean::cnstr_get(x_2, 1);
+lean::inc(x_64);
+x_66 = lean::box(0);
+x_67 = lean_name_mk_string(x_66, x_21);
+x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_68, 0, x_0);
+lean::closure_set(x_68, 1, x_55);
+x_69 = l_lean_parser_token__map_insert___rarg(x_64, x_67, x_68);
+x_70 = lean::cnstr_get(x_2, 2);
+lean::inc(x_70);
+x_72 = lean::cnstr_get(x_2, 3);
+lean::inc(x_72);
+x_74 = lean::cnstr_get(x_2, 4);
+lean::inc(x_74);
 lean::dec(x_2);
-x_76 = lean::alloc_cnstr(0, 5, 0);
-lean::cnstr_set(x_76, 0, x_61);
-lean::cnstr_set(x_76, 1, x_68);
-lean::cnstr_set(x_76, 2, x_69);
-lean::cnstr_set(x_76, 3, x_71);
-lean::cnstr_set(x_76, 4, x_73);
+x_77 = lean::alloc_cnstr(0, 5, 0);
+lean::cnstr_set(x_77, 0, x_62);
+lean::cnstr_set(x_77, 1, x_69);
+lean::cnstr_set(x_77, 2, x_70);
+lean::cnstr_set(x_77, 3, x_72);
+lean::cnstr_set(x_77, 4, x_74);
 if (lean::is_scalar(x_20)) {
- x_77 = lean::alloc_cnstr(1, 1, 0);
+ x_78 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_77 = x_20;
+ x_78 = x_20;
 }
-lean::cnstr_set(x_77, 0, x_76);
-return x_77;
+lean::cnstr_set(x_78, 0, x_77);
+return x_78;
 }
 else
 {
-obj* x_79; obj* x_81; obj* x_83; obj* x_85; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_94; obj* x_97; obj* x_98; 
-lean::dec(x_58);
-x_79 = lean::cnstr_get(x_2, 0);
-lean::inc(x_79);
-x_81 = lean::cnstr_get(x_2, 1);
-lean::inc(x_81);
-x_83 = lean::cnstr_get(x_2, 2);
-lean::inc(x_83);
-x_85 = lean::box(0);
-x_86 = lean_name_mk_string(x_85, x_21);
-x_87 = l_list_map___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__5(x_54);
-x_88 = l_lean_elaborator_command__parser__config_register__notation__parser___closed__1;
-x_89 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_89, 0, x_88);
-lean::cnstr_set(x_89, 1, x_87);
-x_90 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_term_sort__app_parser_lean_parser_has__tokens___spec__3), 8, 2);
-lean::closure_set(x_90, 0, x_0);
-lean::closure_set(x_90, 1, x_89);
-x_91 = l_lean_parser_token__map_insert___rarg(x_83, x_86, x_90);
-x_92 = lean::cnstr_get(x_2, 3);
-lean::inc(x_92);
-x_94 = lean::cnstr_get(x_2, 4);
-lean::inc(x_94);
+obj* x_80; obj* x_82; obj* x_84; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_95; obj* x_98; obj* x_99; 
+lean::dec(x_59);
+x_80 = lean::cnstr_get(x_2, 0);
+lean::inc(x_80);
+x_82 = lean::cnstr_get(x_2, 1);
+lean::inc(x_82);
+x_84 = lean::cnstr_get(x_2, 2);
+lean::inc(x_84);
+x_86 = lean::box(0);
+x_87 = lean_name_mk_string(x_86, x_21);
+x_88 = l_list_map___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__5(x_55);
+x_89 = l_lean_elaborator_command__parser__config_register__notation__parser___closed__1;
+x_90 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_90, 0, x_89);
+lean::cnstr_set(x_90, 1, x_88);
+x_91 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_term_sort__app_parser_lean_parser_has__tokens___spec__3), 8, 2);
+lean::closure_set(x_91, 0, x_0);
+lean::closure_set(x_91, 1, x_90);
+x_92 = l_lean_parser_token__map_insert___rarg(x_84, x_87, x_91);
+x_93 = lean::cnstr_get(x_2, 3);
+lean::inc(x_93);
+x_95 = lean::cnstr_get(x_2, 4);
+lean::inc(x_95);
 lean::dec(x_2);
-x_97 = lean::alloc_cnstr(0, 5, 0);
-lean::cnstr_set(x_97, 0, x_79);
-lean::cnstr_set(x_97, 1, x_81);
-lean::cnstr_set(x_97, 2, x_91);
-lean::cnstr_set(x_97, 3, x_92);
-lean::cnstr_set(x_97, 4, x_94);
+x_98 = lean::alloc_cnstr(0, 5, 0);
+lean::cnstr_set(x_98, 0, x_80);
+lean::cnstr_set(x_98, 1, x_82);
+lean::cnstr_set(x_98, 2, x_92);
+lean::cnstr_set(x_98, 3, x_93);
+lean::cnstr_set(x_98, 4, x_95);
 if (lean::is_scalar(x_20)) {
- x_98 = lean::alloc_cnstr(1, 1, 0);
+ x_99 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_98 = x_20;
+ x_99 = x_20;
 }
-lean::cnstr_set(x_98, 0, x_97);
-return x_98;
+lean::cnstr_set(x_99, 0, x_98);
+return x_99;
 }
 }
 else
 {
-obj* x_100; 
-lean::dec(x_55);
-x_100 = lean::cnstr_get(x_3, 0);
-lean::inc(x_100);
+obj* x_101; 
+lean::dec(x_56);
+x_101 = lean::cnstr_get(x_3, 0);
+lean::inc(x_101);
 lean::dec(x_3);
-if (lean::obj_tag(x_100) == 0)
+if (lean::obj_tag(x_101) == 0)
 {
-obj* x_103; obj* x_105; obj* x_107; obj* x_109; obj* x_111; obj* x_112; obj* x_113; obj* x_114; obj* x_115; obj* x_118; obj* x_119; 
-x_103 = lean::cnstr_get(x_2, 0);
-lean::inc(x_103);
-x_105 = lean::cnstr_get(x_2, 1);
-lean::inc(x_105);
-x_107 = lean::cnstr_get(x_2, 2);
-lean::inc(x_107);
-x_109 = lean::cnstr_get(x_2, 3);
-lean::inc(x_109);
-x_111 = lean::box(0);
-x_112 = lean_name_mk_string(x_111, x_21);
-x_113 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_113, 0, x_0);
-lean::closure_set(x_113, 1, x_54);
-x_114 = l_lean_parser_token__map_insert___rarg(x_109, x_112, x_113);
-x_115 = lean::cnstr_get(x_2, 4);
-lean::inc(x_115);
+obj* x_104; obj* x_106; obj* x_108; obj* x_110; obj* x_112; obj* x_113; obj* x_114; obj* x_115; obj* x_116; obj* x_119; obj* x_120; 
+x_104 = lean::cnstr_get(x_2, 0);
+lean::inc(x_104);
+x_106 = lean::cnstr_get(x_2, 1);
+lean::inc(x_106);
+x_108 = lean::cnstr_get(x_2, 2);
+lean::inc(x_108);
+x_110 = lean::cnstr_get(x_2, 3);
+lean::inc(x_110);
+x_112 = lean::box(0);
+x_113 = lean_name_mk_string(x_112, x_21);
+x_114 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_114, 0, x_0);
+lean::closure_set(x_114, 1, x_55);
+x_115 = l_lean_parser_token__map_insert___rarg(x_110, x_113, x_114);
+x_116 = lean::cnstr_get(x_2, 4);
+lean::inc(x_116);
 lean::dec(x_2);
-x_118 = lean::alloc_cnstr(0, 5, 0);
-lean::cnstr_set(x_118, 0, x_103);
-lean::cnstr_set(x_118, 1, x_105);
-lean::cnstr_set(x_118, 2, x_107);
-lean::cnstr_set(x_118, 3, x_114);
-lean::cnstr_set(x_118, 4, x_115);
+x_119 = lean::alloc_cnstr(0, 5, 0);
+lean::cnstr_set(x_119, 0, x_104);
+lean::cnstr_set(x_119, 1, x_106);
+lean::cnstr_set(x_119, 2, x_108);
+lean::cnstr_set(x_119, 3, x_115);
+lean::cnstr_set(x_119, 4, x_116);
 if (lean::is_scalar(x_20)) {
- x_119 = lean::alloc_cnstr(1, 1, 0);
+ x_120 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_119 = x_20;
+ x_120 = x_20;
 }
-lean::cnstr_set(x_119, 0, x_118);
-return x_119;
+lean::cnstr_set(x_120, 0, x_119);
+return x_120;
 }
 else
 {
-obj* x_121; obj* x_123; obj* x_125; obj* x_127; obj* x_129; obj* x_132; obj* x_133; obj* x_134; obj* x_135; obj* x_136; obj* x_137; obj* x_138; obj* x_139; obj* x_140; 
-lean::dec(x_100);
-x_121 = lean::cnstr_get(x_2, 0);
-lean::inc(x_121);
-x_123 = lean::cnstr_get(x_2, 1);
-lean::inc(x_123);
-x_125 = lean::cnstr_get(x_2, 2);
-lean::inc(x_125);
-x_127 = lean::cnstr_get(x_2, 3);
-lean::inc(x_127);
-x_129 = lean::cnstr_get(x_2, 4);
-lean::inc(x_129);
+obj* x_122; obj* x_124; obj* x_126; obj* x_128; obj* x_130; obj* x_133; obj* x_134; obj* x_135; obj* x_136; obj* x_137; obj* x_138; obj* x_139; obj* x_140; obj* x_141; 
+lean::dec(x_101);
+x_122 = lean::cnstr_get(x_2, 0);
+lean::inc(x_122);
+x_124 = lean::cnstr_get(x_2, 1);
+lean::inc(x_124);
+x_126 = lean::cnstr_get(x_2, 2);
+lean::inc(x_126);
+x_128 = lean::cnstr_get(x_2, 3);
+lean::inc(x_128);
+x_130 = lean::cnstr_get(x_2, 4);
+lean::inc(x_130);
 lean::dec(x_2);
-x_132 = lean::box(0);
-x_133 = lean_name_mk_string(x_132, x_21);
-x_134 = l_list_map___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__6(x_54);
-x_135 = l_lean_elaborator_command__parser__config_register__notation__parser___closed__1;
-x_136 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_136, 0, x_135);
-lean::cnstr_set(x_136, 1, x_134);
-x_137 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_term_sort__app_parser_lean_parser_has__tokens___spec__3), 8, 2);
-lean::closure_set(x_137, 0, x_0);
-lean::closure_set(x_137, 1, x_136);
-x_138 = l_lean_parser_token__map_insert___rarg(x_129, x_133, x_137);
-x_139 = lean::alloc_cnstr(0, 5, 0);
-lean::cnstr_set(x_139, 0, x_121);
-lean::cnstr_set(x_139, 1, x_123);
-lean::cnstr_set(x_139, 2, x_125);
-lean::cnstr_set(x_139, 3, x_127);
-lean::cnstr_set(x_139, 4, x_138);
+x_133 = lean::box(0);
+x_134 = lean_name_mk_string(x_133, x_21);
+x_135 = l_list_map___main___at_lean_elaborator_command__parser__config_register__notation__parser___spec__6(x_55);
+x_136 = l_lean_elaborator_command__parser__config_register__notation__parser___closed__1;
+x_137 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_137, 0, x_136);
+lean::cnstr_set(x_137, 1, x_135);
+x_138 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_term_sort__app_parser_lean_parser_has__tokens___spec__3), 8, 2);
+lean::closure_set(x_138, 0, x_0);
+lean::closure_set(x_138, 1, x_137);
+x_139 = l_lean_parser_token__map_insert___rarg(x_130, x_134, x_138);
+x_140 = lean::alloc_cnstr(0, 5, 0);
+lean::cnstr_set(x_140, 0, x_122);
+lean::cnstr_set(x_140, 1, x_124);
+lean::cnstr_set(x_140, 2, x_126);
+lean::cnstr_set(x_140, 3, x_128);
+lean::cnstr_set(x_140, 4, x_139);
 if (lean::is_scalar(x_20)) {
- x_140 = lean::alloc_cnstr(1, 1, 0);
+ x_141 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_140 = x_20;
+ x_141 = x_20;
 }
-lean::cnstr_set(x_140, 0, x_139);
-return x_140;
+lean::cnstr_set(x_141, 0, x_140);
+return x_141;
 }
 }
 }
@@ -25345,27 +25349,28 @@ return x_3;
 obj* _init_l_lean_elaborator_postprocess__notation__spec___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(":");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-x_5 = l_lean_parser_max__prec;
-x_6 = l_lean_parser_number_view_of__nat(x_5);
-x_7 = lean::alloc_cnstr(0, 1, 0);
-lean::cnstr_set(x_7, 0, x_6);
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+x_6 = l_lean_parser_max__prec;
+x_7 = l_lean_parser_number_view_of__nat(x_6);
 x_8 = lean::alloc_cnstr(0, 1, 0);
 lean::cnstr_set(x_8, 0, x_7);
-x_9 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_9, 0, x_4);
-lean::cnstr_set(x_9, 1, x_8);
-x_10 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_10, 0, x_9);
-return x_10;
+x_9 = lean::alloc_cnstr(0, 1, 0);
+lean::cnstr_set(x_9, 0, x_8);
+x_10 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 1, x_9);
+x_11 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_11, 0, x_10);
+return x_11;
 }
 }
 obj* l_lean_elaborator_postprocess__notation__spec(obj* x_0) {
@@ -25725,7 +25730,7 @@ return x_46;
 }
 else
 {
-obj* x_47; obj* x_49; obj* x_52; obj* x_55; obj* x_56; obj* x_59; uint8 x_60; 
+obj* x_47; obj* x_49; obj* x_52; obj* x_55; obj* x_57; obj* x_60; uint8 x_62; 
 x_47 = lean::cnstr_get(x_30, 3);
 lean::inc(x_47);
 x_49 = lean::cnstr_get(x_36, 0);
@@ -25735,16 +25740,18 @@ x_52 = lean::cnstr_get(x_27, 1);
 lean::inc(x_52);
 lean::dec(x_27);
 x_55 = l_string_trim(x_52);
-x_56 = lean::cnstr_get(x_49, 1);
-lean::inc(x_56);
+lean::dec(x_52);
+x_57 = lean::cnstr_get(x_49, 1);
+lean::inc(x_57);
 lean::dec(x_49);
-x_59 = l_string_trim(x_56);
-x_60 = lean::string_dec_eq(x_55, x_59);
-lean::dec(x_59);
+x_60 = l_string_trim(x_57);
+lean::dec(x_57);
+x_62 = lean::string_dec_eq(x_55, x_60);
+lean::dec(x_60);
 lean::dec(x_55);
-if (x_60 == 0)
+if (x_62 == 0)
 {
-obj* x_71; 
+obj* x_73; 
 lean::dec(x_6);
 lean::dec(x_29);
 lean::dec(x_30);
@@ -25753,30 +25760,30 @@ lean::dec(x_4);
 lean::dec(x_21);
 lean::dec(x_24);
 lean::dec(x_47);
-x_71 = lean::box(0);
-return x_71;
+x_73 = lean::box(0);
+return x_73;
 }
 else
 {
-uint8 x_72; 
-x_72 = l_lean_elaborator_match__precedence___main(x_24, x_47);
-if (x_72 == 0)
+uint8 x_74; 
+x_74 = l_lean_elaborator_match__precedence___main(x_24, x_47);
+if (x_74 == 0)
 {
-obj* x_79; 
+obj* x_81; 
 lean::dec(x_6);
 lean::dec(x_29);
 lean::dec(x_30);
 lean::dec(x_9);
 lean::dec(x_4);
 lean::dec(x_21);
-x_79 = lean::box(0);
-return x_79;
+x_81 = lean::box(0);
+return x_81;
 }
 else
 {
-obj* x_80; 
-x_80 = lean::box(0);
-x_34 = x_80;
+obj* x_82; 
+x_82 = lean::box(0);
+x_34 = x_82;
 goto lbl_35;
 }
 }
@@ -25785,143 +25792,143 @@ lbl_33:
 {
 if (lean::obj_tag(x_32) == 0)
 {
-obj* x_84; 
+obj* x_86; 
 lean::dec(x_6);
 lean::dec(x_30);
 lean::dec(x_4);
-x_84 = lean::box(0);
-return x_84;
+x_86 = lean::box(0);
+return x_86;
 }
 else
 {
-obj* x_85; obj* x_88; 
-x_85 = lean::cnstr_get(x_32, 0);
-lean::inc(x_85);
+obj* x_87; obj* x_90; 
+x_87 = lean::cnstr_get(x_32, 0);
+lean::inc(x_87);
 lean::dec(x_32);
-x_88 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_88, 0, x_30);
-lean::cnstr_set(x_88, 1, x_85);
-x_7 = x_88;
+x_90 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_90, 0, x_30);
+lean::cnstr_set(x_90, 1, x_87);
+x_7 = x_90;
 goto lbl_8;
 }
 }
 lbl_35:
 {
-obj* x_90; 
+obj* x_92; 
 lean::dec(x_34);
-x_90 = lean::cnstr_get(x_9, 1);
-lean::inc(x_90);
+x_92 = lean::cnstr_get(x_9, 1);
+lean::inc(x_92);
 lean::dec(x_9);
-if (lean::obj_tag(x_90) == 0)
+if (lean::obj_tag(x_92) == 0)
 {
-obj* x_93; 
-x_93 = lean::cnstr_get(x_21, 1);
-lean::inc(x_93);
+obj* x_95; 
+x_95 = lean::cnstr_get(x_21, 1);
+lean::inc(x_95);
 lean::dec(x_21);
-if (lean::obj_tag(x_93) == 0)
+if (lean::obj_tag(x_95) == 0)
 {
-obj* x_96; 
+obj* x_98; 
 if (lean::is_scalar(x_29)) {
- x_96 = lean::alloc_cnstr(1, 1, 0);
+ x_98 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_96 = x_29;
+ x_98 = x_29;
 }
-lean::cnstr_set(x_96, 0, x_93);
-x_32 = x_96;
+lean::cnstr_set(x_98, 0, x_95);
+x_32 = x_98;
 goto lbl_33;
 }
 else
 {
-obj* x_99; 
+obj* x_101; 
 lean::dec(x_29);
-lean::dec(x_93);
-x_99 = lean::box(0);
-x_32 = x_99;
+lean::dec(x_95);
+x_101 = lean::box(0);
+x_32 = x_101;
 goto lbl_33;
 }
 }
 else
 {
-obj* x_101; obj* x_103; 
+obj* x_103; obj* x_105; 
 lean::dec(x_29);
-x_101 = lean::cnstr_get(x_90, 0);
-if (lean::is_exclusive(x_90)) {
- lean::cnstr_set(x_90, 0, lean::box(0));
- x_103 = x_90;
+x_103 = lean::cnstr_get(x_92, 0);
+if (lean::is_exclusive(x_92)) {
+ lean::cnstr_set(x_92, 0, lean::box(0));
+ x_105 = x_92;
 } else {
- lean::inc(x_101);
- lean::dec(x_90);
- x_103 = lean::box(0);
+ lean::inc(x_103);
+ lean::dec(x_92);
+ x_105 = lean::box(0);
 }
-switch (lean::obj_tag(x_101)) {
+switch (lean::obj_tag(x_103)) {
 case 0:
 {
-obj* x_104; 
-x_104 = lean::cnstr_get(x_21, 1);
-lean::inc(x_104);
+obj* x_106; 
+x_106 = lean::cnstr_get(x_21, 1);
+lean::inc(x_106);
 lean::dec(x_21);
-if (lean::obj_tag(x_104) == 0)
+if (lean::obj_tag(x_106) == 0)
 {
-obj* x_109; 
-lean::dec(x_101);
+obj* x_111; 
+lean::dec(x_105);
 lean::dec(x_103);
-x_109 = lean::box(0);
-x_32 = x_109;
+x_111 = lean::box(0);
+x_32 = x_111;
 goto lbl_33;
 }
 else
 {
-obj* x_110; 
-x_110 = lean::cnstr_get(x_104, 0);
-lean::inc(x_110);
-switch (lean::obj_tag(x_110)) {
-case 0:
-{
-obj* x_112; obj* x_115; obj* x_118; obj* x_121; uint8 x_124; 
-x_112 = lean::cnstr_get(x_101, 0);
+obj* x_112; 
+x_112 = lean::cnstr_get(x_106, 0);
 lean::inc(x_112);
-lean::dec(x_101);
-x_115 = lean::cnstr_get(x_110, 0);
-lean::inc(x_115);
-lean::dec(x_110);
-x_118 = lean::cnstr_get(x_112, 1);
-lean::inc(x_118);
+switch (lean::obj_tag(x_112)) {
+case 0:
+{
+obj* x_114; obj* x_117; obj* x_120; obj* x_123; uint8 x_126; 
+x_114 = lean::cnstr_get(x_103, 0);
+lean::inc(x_114);
+lean::dec(x_103);
+x_117 = lean::cnstr_get(x_112, 0);
+lean::inc(x_117);
 lean::dec(x_112);
-x_121 = lean::cnstr_get(x_115, 1);
-lean::inc(x_121);
-lean::dec(x_115);
-x_124 = l_lean_elaborator_match__precedence___main(x_118, x_121);
-if (x_124 == 0)
+x_120 = lean::cnstr_get(x_114, 1);
+lean::inc(x_120);
+lean::dec(x_114);
+x_123 = lean::cnstr_get(x_117, 1);
+lean::inc(x_123);
+lean::dec(x_117);
+x_126 = l_lean_elaborator_match__precedence___main(x_120, x_123);
+if (x_126 == 0)
 {
-obj* x_127; 
-lean::dec(x_104);
-lean::dec(x_103);
-x_127 = lean::box(0);
-x_32 = x_127;
+obj* x_129; 
+lean::dec(x_105);
+lean::dec(x_106);
+x_129 = lean::box(0);
+x_32 = x_129;
 goto lbl_33;
 }
 else
 {
-obj* x_128; 
-if (lean::is_scalar(x_103)) {
- x_128 = lean::alloc_cnstr(1, 1, 0);
+obj* x_130; 
+if (lean::is_scalar(x_105)) {
+ x_130 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_128 = x_103;
+ x_130 = x_105;
 }
-lean::cnstr_set(x_128, 0, x_104);
-x_32 = x_128;
+lean::cnstr_set(x_130, 0, x_106);
+x_32 = x_130;
 goto lbl_33;
 }
 }
 default:
 {
-obj* x_133; 
-lean::dec(x_104);
-lean::dec(x_110);
-lean::dec(x_101);
+obj* x_135; 
+lean::dec(x_105);
 lean::dec(x_103);
-x_133 = lean::box(0);
-x_32 = x_133;
+lean::dec(x_106);
+lean::dec(x_112);
+x_135 = lean::box(0);
+x_32 = x_135;
 goto lbl_33;
 }
 }
@@ -25929,72 +25936,72 @@ goto lbl_33;
 }
 case 1:
 {
-obj* x_134; 
-x_134 = lean::cnstr_get(x_21, 1);
-lean::inc(x_134);
+obj* x_136; 
+x_136 = lean::cnstr_get(x_21, 1);
+lean::inc(x_136);
 lean::dec(x_21);
-if (lean::obj_tag(x_134) == 0)
+if (lean::obj_tag(x_136) == 0)
 {
-obj* x_139; 
-lean::dec(x_101);
+obj* x_141; 
+lean::dec(x_105);
 lean::dec(x_103);
-x_139 = lean::box(0);
-x_32 = x_139;
+x_141 = lean::box(0);
+x_32 = x_141;
 goto lbl_33;
 }
 else
 {
-obj* x_140; 
-x_140 = lean::cnstr_get(x_134, 0);
-lean::inc(x_140);
-switch (lean::obj_tag(x_140)) {
-case 1:
-{
-obj* x_142; obj* x_145; obj* x_148; obj* x_151; uint8 x_154; 
-x_142 = lean::cnstr_get(x_101, 0);
+obj* x_142; 
+x_142 = lean::cnstr_get(x_136, 0);
 lean::inc(x_142);
-lean::dec(x_101);
-x_145 = lean::cnstr_get(x_140, 0);
-lean::inc(x_145);
-lean::dec(x_140);
-x_148 = lean::cnstr_get(x_142, 1);
-lean::inc(x_148);
+switch (lean::obj_tag(x_142)) {
+case 1:
+{
+obj* x_144; obj* x_147; obj* x_150; obj* x_153; uint8 x_156; 
+x_144 = lean::cnstr_get(x_103, 0);
+lean::inc(x_144);
+lean::dec(x_103);
+x_147 = lean::cnstr_get(x_142, 0);
+lean::inc(x_147);
 lean::dec(x_142);
-x_151 = lean::cnstr_get(x_145, 1);
-lean::inc(x_151);
-lean::dec(x_145);
-x_154 = l_lean_elaborator_match__precedence___main(x_148, x_151);
-if (x_154 == 0)
+x_150 = lean::cnstr_get(x_144, 1);
+lean::inc(x_150);
+lean::dec(x_144);
+x_153 = lean::cnstr_get(x_147, 1);
+lean::inc(x_153);
+lean::dec(x_147);
+x_156 = l_lean_elaborator_match__precedence___main(x_150, x_153);
+if (x_156 == 0)
 {
-obj* x_157; 
-lean::dec(x_103);
-lean::dec(x_134);
-x_157 = lean::box(0);
-x_32 = x_157;
+obj* x_159; 
+lean::dec(x_105);
+lean::dec(x_136);
+x_159 = lean::box(0);
+x_32 = x_159;
 goto lbl_33;
 }
 else
 {
-obj* x_158; 
-if (lean::is_scalar(x_103)) {
- x_158 = lean::alloc_cnstr(1, 1, 0);
+obj* x_160; 
+if (lean::is_scalar(x_105)) {
+ x_160 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_158 = x_103;
+ x_160 = x_105;
 }
-lean::cnstr_set(x_158, 0, x_134);
-x_32 = x_158;
+lean::cnstr_set(x_160, 0, x_136);
+x_32 = x_160;
 goto lbl_33;
 }
 }
 default:
 {
-obj* x_163; 
-lean::dec(x_101);
+obj* x_165; 
+lean::dec(x_105);
 lean::dec(x_103);
-lean::dec(x_140);
-lean::dec(x_134);
-x_163 = lean::box(0);
-x_32 = x_163;
+lean::dec(x_136);
+lean::dec(x_142);
+x_165 = lean::box(0);
+x_32 = x_165;
 goto lbl_33;
 }
 }
@@ -26002,270 +26009,270 @@ goto lbl_33;
 }
 default:
 {
-obj* x_164; obj* x_166; obj* x_167; obj* x_169; 
-x_164 = lean::cnstr_get(x_101, 0);
-if (lean::is_exclusive(x_101)) {
- lean::cnstr_set(x_101, 0, lean::box(0));
- x_166 = x_101;
+obj* x_166; obj* x_168; obj* x_169; obj* x_171; 
+x_166 = lean::cnstr_get(x_103, 0);
+if (lean::is_exclusive(x_103)) {
+ lean::cnstr_set(x_103, 0, lean::box(0));
+ x_168 = x_103;
 } else {
- lean::inc(x_164);
- lean::dec(x_101);
- x_166 = lean::box(0);
+ lean::inc(x_166);
+ lean::dec(x_103);
+ x_168 = lean::box(0);
 }
-x_169 = lean::cnstr_get(x_21, 1);
-lean::inc(x_169);
+x_171 = lean::cnstr_get(x_21, 1);
+lean::inc(x_171);
 lean::dec(x_21);
-if (lean::obj_tag(x_169) == 0)
+if (lean::obj_tag(x_171) == 0)
 {
-obj* x_175; 
-lean::dec(x_164);
+obj* x_177; 
+lean::dec(x_105);
+lean::dec(x_168);
 lean::dec(x_166);
-lean::dec(x_103);
-x_175 = lean::box(0);
-x_32 = x_175;
+x_177 = lean::box(0);
+x_32 = x_177;
 goto lbl_33;
 }
 else
 {
-obj* x_176; obj* x_178; 
-x_176 = lean::cnstr_get(x_169, 0);
-if (lean::is_exclusive(x_169)) {
- lean::cnstr_set(x_169, 0, lean::box(0));
- x_178 = x_169;
+obj* x_178; obj* x_180; 
+x_178 = lean::cnstr_get(x_171, 0);
+if (lean::is_exclusive(x_171)) {
+ lean::cnstr_set(x_171, 0, lean::box(0));
+ x_180 = x_171;
 } else {
- lean::inc(x_176);
- lean::dec(x_169);
- x_178 = lean::box(0);
+ lean::inc(x_178);
+ lean::dec(x_171);
+ x_180 = lean::box(0);
 }
-switch (lean::obj_tag(x_176)) {
+switch (lean::obj_tag(x_178)) {
 case 2:
 {
-obj* x_179; obj* x_182; obj* x_184; 
-x_179 = lean::cnstr_get(x_176, 0);
-lean::inc(x_179);
-lean::dec(x_176);
-x_182 = lean::cnstr_get(x_164, 1);
-lean::inc(x_182);
-if (lean::obj_tag(x_182) == 0)
-{
-obj* x_186; 
-x_186 = lean::cnstr_get(x_179, 1);
-lean::inc(x_186);
-lean::dec(x_179);
-if (lean::obj_tag(x_186) == 0)
-{
-obj* x_190; 
+obj* x_181; obj* x_184; obj* x_186; 
+x_181 = lean::cnstr_get(x_178, 0);
+lean::inc(x_181);
 lean::dec(x_178);
-x_190 = lean::box(0);
-x_167 = x_190;
-goto lbl_168;
+x_184 = lean::cnstr_get(x_166, 1);
+lean::inc(x_184);
+if (lean::obj_tag(x_184) == 0)
+{
+obj* x_188; 
+x_188 = lean::cnstr_get(x_181, 1);
+lean::inc(x_188);
+lean::dec(x_181);
+if (lean::obj_tag(x_188) == 0)
+{
+obj* x_192; 
+lean::dec(x_180);
+x_192 = lean::box(0);
+x_169 = x_192;
+goto lbl_170;
 }
 else
 {
-obj* x_191; obj* x_193; 
-x_191 = lean::cnstr_get(x_186, 0);
-lean::inc(x_191);
-x_193 = lean::cnstr_get(x_191, 1);
+obj* x_193; obj* x_195; 
+x_193 = lean::cnstr_get(x_188, 0);
 lean::inc(x_193);
-lean::dec(x_191);
-switch (lean::obj_tag(x_193)) {
+x_195 = lean::cnstr_get(x_193, 1);
+lean::inc(x_195);
+lean::dec(x_193);
+switch (lean::obj_tag(x_195)) {
 case 0:
 {
-obj* x_197; 
-lean::dec(x_193);
-if (lean::is_scalar(x_178)) {
- x_197 = lean::alloc_cnstr(1, 1, 0);
+obj* x_199; 
+lean::dec(x_195);
+if (lean::is_scalar(x_180)) {
+ x_199 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_197 = x_178;
+ x_199 = x_180;
 }
-lean::cnstr_set(x_197, 0, x_186);
-x_167 = x_197;
-goto lbl_168;
+lean::cnstr_set(x_199, 0, x_188);
+x_169 = x_199;
+goto lbl_170;
 }
 default:
 {
-obj* x_201; 
-lean::dec(x_193);
-lean::dec(x_186);
-lean::dec(x_178);
-x_201 = lean::box(0);
-x_167 = x_201;
-goto lbl_168;
+obj* x_203; 
+lean::dec(x_195);
+lean::dec(x_188);
+lean::dec(x_180);
+x_203 = lean::box(0);
+x_169 = x_203;
+goto lbl_170;
 }
 }
 }
 }
 else
 {
-obj* x_203; obj* x_205; 
-lean::dec(x_178);
-x_203 = lean::cnstr_get(x_182, 0);
-lean::inc(x_203);
-x_205 = lean::cnstr_get(x_203, 1);
+obj* x_205; obj* x_207; 
+lean::dec(x_180);
+x_205 = lean::cnstr_get(x_184, 0);
 lean::inc(x_205);
-lean::dec(x_203);
-x_184 = x_205;
-goto lbl_185;
+x_207 = lean::cnstr_get(x_205, 1);
+lean::inc(x_207);
+lean::dec(x_205);
+x_186 = x_207;
+goto lbl_187;
 }
-lbl_185:
+lbl_187:
 {
-switch (lean::obj_tag(x_184)) {
+switch (lean::obj_tag(x_186)) {
 case 0:
 {
-obj* x_208; 
-x_208 = lean::cnstr_get(x_179, 1);
-lean::inc(x_208);
-lean::dec(x_179);
-if (lean::obj_tag(x_208) == 0)
+obj* x_210; 
+x_210 = lean::cnstr_get(x_181, 1);
+lean::inc(x_210);
+lean::dec(x_181);
+if (lean::obj_tag(x_210) == 0)
 {
-obj* x_213; 
+obj* x_215; 
 lean::dec(x_184);
-lean::dec(x_182);
-x_213 = lean::box(0);
-x_167 = x_213;
-goto lbl_168;
+lean::dec(x_186);
+x_215 = lean::box(0);
+x_169 = x_215;
+goto lbl_170;
 }
 else
 {
-obj* x_214; obj* x_216; obj* x_217; 
-x_214 = lean::cnstr_get(x_208, 0);
-if (lean::is_exclusive(x_208)) {
- lean::cnstr_set(x_208, 0, lean::box(0));
- x_216 = x_208;
+obj* x_216; obj* x_218; obj* x_219; 
+x_216 = lean::cnstr_get(x_210, 0);
+if (lean::is_exclusive(x_210)) {
+ lean::cnstr_set(x_210, 0, lean::box(0));
+ x_218 = x_210;
 } else {
- lean::inc(x_214);
- lean::dec(x_208);
- x_216 = lean::box(0);
+ lean::inc(x_216);
+ lean::dec(x_210);
+ x_218 = lean::box(0);
 }
-x_217 = lean::cnstr_get(x_214, 1);
-lean::inc(x_217);
-lean::dec(x_214);
-switch (lean::obj_tag(x_217)) {
+x_219 = lean::cnstr_get(x_216, 1);
+lean::inc(x_219);
+lean::dec(x_216);
+switch (lean::obj_tag(x_219)) {
 case 0:
 {
-obj* x_220; obj* x_223; obj* x_226; obj* x_227; uint8 x_228; 
-x_220 = lean::cnstr_get(x_184, 0);
-lean::inc(x_220);
-lean::dec(x_184);
-x_223 = lean::cnstr_get(x_217, 0);
-lean::inc(x_223);
-lean::dec(x_217);
-x_226 = l_lean_parser_command_notation__spec_precedence__term_view_to__nat___main(x_220);
-x_227 = l_lean_parser_command_notation__spec_precedence__term_view_to__nat___main(x_223);
-x_228 = lean::nat_dec_eq(x_226, x_227);
-lean::dec(x_227);
-lean::dec(x_226);
-if (x_228 == 0)
+obj* x_222; obj* x_225; obj* x_228; obj* x_229; uint8 x_230; 
+x_222 = lean::cnstr_get(x_186, 0);
+lean::inc(x_222);
+lean::dec(x_186);
+x_225 = lean::cnstr_get(x_219, 0);
+lean::inc(x_225);
+lean::dec(x_219);
+x_228 = l_lean_parser_command_notation__spec_precedence__term_view_to__nat___main(x_222);
+x_229 = l_lean_parser_command_notation__spec_precedence__term_view_to__nat___main(x_225);
+x_230 = lean::nat_dec_eq(x_228, x_229);
+lean::dec(x_229);
+lean::dec(x_228);
+if (x_230 == 0)
 {
-obj* x_233; 
-lean::dec(x_216);
-lean::dec(x_182);
-x_233 = lean::box(0);
-x_167 = x_233;
-goto lbl_168;
+obj* x_235; 
+lean::dec(x_218);
+lean::dec(x_184);
+x_235 = lean::box(0);
+x_169 = x_235;
+goto lbl_170;
 }
 else
 {
-obj* x_234; 
-if (lean::is_scalar(x_216)) {
- x_234 = lean::alloc_cnstr(1, 1, 0);
+obj* x_236; 
+if (lean::is_scalar(x_218)) {
+ x_236 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_234 = x_216;
+ x_236 = x_218;
 }
-lean::cnstr_set(x_234, 0, x_182);
-x_167 = x_234;
-goto lbl_168;
+lean::cnstr_set(x_236, 0, x_184);
+x_169 = x_236;
+goto lbl_170;
 }
 }
 default:
 {
-obj* x_239; 
-lean::dec(x_216);
+obj* x_241; 
+lean::dec(x_218);
+lean::dec(x_219);
 lean::dec(x_184);
-lean::dec(x_217);
-lean::dec(x_182);
-x_239 = lean::box(0);
-x_167 = x_239;
-goto lbl_168;
+lean::dec(x_186);
+x_241 = lean::box(0);
+x_169 = x_241;
+goto lbl_170;
 }
 }
 }
 }
 default:
 {
-obj* x_243; 
+obj* x_245; 
 lean::dec(x_184);
-lean::dec(x_179);
-lean::dec(x_182);
-x_243 = lean::box(0);
-x_167 = x_243;
-goto lbl_168;
+lean::dec(x_186);
+lean::dec(x_181);
+x_245 = lean::box(0);
+x_169 = x_245;
+goto lbl_170;
 }
 }
 }
 }
 default:
 {
-obj* x_249; 
-lean::dec(x_164);
+obj* x_251; 
+lean::dec(x_105);
+lean::dec(x_180);
 lean::dec(x_178);
+lean::dec(x_168);
 lean::dec(x_166);
-lean::dec(x_176);
-lean::dec(x_103);
-x_249 = lean::box(0);
-x_32 = x_249;
+x_251 = lean::box(0);
+x_32 = x_251;
 goto lbl_33;
 }
 }
 }
-lbl_168:
+lbl_170:
 {
-if (lean::obj_tag(x_167) == 0)
+if (lean::obj_tag(x_169) == 0)
 {
-obj* x_253; 
-lean::dec(x_164);
+obj* x_255; 
+lean::dec(x_105);
+lean::dec(x_168);
 lean::dec(x_166);
-lean::dec(x_103);
-x_253 = lean::box(0);
-x_32 = x_253;
+x_255 = lean::box(0);
+x_32 = x_255;
 goto lbl_33;
 }
 else
 {
-obj* x_254; obj* x_256; obj* x_257; obj* x_260; obj* x_261; obj* x_262; obj* x_263; 
-x_254 = lean::cnstr_get(x_167, 0);
-if (lean::is_exclusive(x_167)) {
- x_256 = x_167;
+obj* x_256; obj* x_258; obj* x_259; obj* x_262; obj* x_263; obj* x_264; obj* x_265; 
+x_256 = lean::cnstr_get(x_169, 0);
+if (lean::is_exclusive(x_169)) {
+ x_258 = x_169;
 } else {
- lean::inc(x_254);
- lean::dec(x_167);
- x_256 = lean::box(0);
+ lean::inc(x_256);
+ lean::dec(x_169);
+ x_258 = lean::box(0);
 }
-x_257 = lean::cnstr_get(x_164, 0);
-lean::inc(x_257);
-lean::dec(x_164);
-x_260 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_260, 0, x_257);
-lean::cnstr_set(x_260, 1, x_254);
-if (lean::is_scalar(x_166)) {
- x_261 = lean::alloc_cnstr(2, 1, 0);
+x_259 = lean::cnstr_get(x_166, 0);
+lean::inc(x_259);
+lean::dec(x_166);
+x_262 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_262, 0, x_259);
+lean::cnstr_set(x_262, 1, x_256);
+if (lean::is_scalar(x_168)) {
+ x_263 = lean::alloc_cnstr(2, 1, 0);
 } else {
- x_261 = x_166;
-}
-lean::cnstr_set(x_261, 0, x_260);
-if (lean::is_scalar(x_256)) {
- x_262 = lean::alloc_cnstr(1, 1, 0);
-} else {
- x_262 = x_256;
-}
-lean::cnstr_set(x_262, 0, x_261);
-if (lean::is_scalar(x_103)) {
- x_263 = lean::alloc_cnstr(1, 1, 0);
-} else {
- x_263 = x_103;
+ x_263 = x_168;
 }
 lean::cnstr_set(x_263, 0, x_262);
-x_32 = x_263;
+if (lean::is_scalar(x_258)) {
+ x_264 = lean::alloc_cnstr(1, 1, 0);
+} else {
+ x_264 = x_258;
+}
+lean::cnstr_set(x_264, 0, x_263);
+if (lean::is_scalar(x_105)) {
+ x_265 = lean::alloc_cnstr(1, 1, 0);
+} else {
+ x_265 = x_105;
+}
+lean::cnstr_set(x_265, 0, x_264);
+x_32 = x_265;
 goto lbl_33;
 }
 }
@@ -26276,41 +26283,41 @@ goto lbl_33;
 }
 lbl_8:
 {
-obj* x_264; 
-x_264 = l_list_mmap___main___at_lean_elaborator_match__spec___spec__1(x_4);
-if (lean::obj_tag(x_264) == 0)
+obj* x_266; 
+x_266 = l_list_mmap___main___at_lean_elaborator_match__spec___spec__1(x_4);
+if (lean::obj_tag(x_266) == 0)
 {
-obj* x_267; 
+obj* x_269; 
 lean::dec(x_6);
 lean::dec(x_7);
-x_267 = lean::box(0);
-return x_267;
+x_269 = lean::box(0);
+return x_269;
 }
 else
 {
-obj* x_268; obj* x_270; obj* x_271; obj* x_272; 
-x_268 = lean::cnstr_get(x_264, 0);
-if (lean::is_exclusive(x_264)) {
- x_270 = x_264;
+obj* x_270; obj* x_272; obj* x_273; obj* x_274; 
+x_270 = lean::cnstr_get(x_266, 0);
+if (lean::is_exclusive(x_266)) {
+ x_272 = x_266;
 } else {
- lean::inc(x_268);
- lean::dec(x_264);
- x_270 = lean::box(0);
+ lean::inc(x_270);
+ lean::dec(x_266);
+ x_272 = lean::box(0);
 }
 if (lean::is_scalar(x_6)) {
- x_271 = lean::alloc_cnstr(1, 2, 0);
+ x_273 = lean::alloc_cnstr(1, 2, 0);
 } else {
- x_271 = x_6;
+ x_273 = x_6;
 }
-lean::cnstr_set(x_271, 0, x_7);
-lean::cnstr_set(x_271, 1, x_268);
-if (lean::is_scalar(x_270)) {
- x_272 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_273, 0, x_7);
+lean::cnstr_set(x_273, 1, x_270);
+if (lean::is_scalar(x_272)) {
+ x_274 = lean::alloc_cnstr(1, 1, 0);
 } else {
- x_272 = x_270;
+ x_274 = x_272;
 }
-lean::cnstr_set(x_272, 0, x_271);
-return x_272;
+lean::cnstr_set(x_274, 0, x_273);
+return x_274;
 }
 }
 }
diff --git a/src/boot/init/lean/expander.cpp b/src/boot/init/lean/expander.cpp
index c5a4f197e9..f7f8cee662 100644
--- a/src/boot/init/lean/expander.cpp
+++ b/src/boot/init/lean/expander.cpp
@@ -841,31 +841,33 @@ return x_1;
 obj* _init_l_lean_expander_coe__binder__bracketed__binder___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("(");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_coe__binder__bracketed__binder___closed__2() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(")");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* l_lean_expander_coe__binder__bracketed__binder(obj* x_0) {
@@ -1169,16 +1171,17 @@ return x_3;
 obj* _init_l_list_mmap_x_27___main___at_lean_expander_mk__notation__transformer___spec__4___closed__3() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(",");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* l_list_mmap_x_27___main___at_lean_expander_mk__notation__transformer___spec__4(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -3069,16 +3072,17 @@ return x_13;
 obj* _init_l_lean_expander_mixfix__to__notation__spec___closed__4() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(":");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_mixfix__to__notation__spec___closed__5() {
@@ -3529,31 +3533,33 @@ return x_16;
 obj* _init_l_lean_expander_mixfix_transform___closed__3() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("notation");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_mixfix_transform___closed__4() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(":=");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_mixfix_transform___closed__5() {
@@ -3804,16 +3810,17 @@ return x_98;
 obj* _init_l_lean_expander_reserve__mixfix_transform___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("reserve");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* l_lean_expander_reserve__mixfix_transform(obj* x_0, obj* x_1) {
@@ -3888,106 +3895,113 @@ return x_30;
 obj* _init_l_lean_expander_mk__simple__binder___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(" : ");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_mk__simple__binder___closed__2() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("{");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_mk__simple__binder___closed__3() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("}");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_mk__simple__binder___closed__4() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("\xe2\xa6\x83");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_mk__simple__binder___closed__5() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("\xe2\xa6\x84");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_mk__simple__binder___closed__6() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("[");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_lean_expander_mk__simple__binder___closed__7() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("]");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* l_lean_expander_mk__simple__binder(obj* x_0, uint8 x_1, obj* x_2) {
@@ -4140,7 +4154,7 @@ return x_1;
 obj* _init_l_lean_expander_get__opt__type___main___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_10; 
 x_0 = l_lean_parser_term_hole_has__view;
 x_1 = lean::cnstr_get(x_0, 1);
 lean::inc(x_1);
@@ -4148,13 +4162,14 @@ lean::dec(x_0);
 x_4 = lean::box(0);
 x_5 = lean::mk_string("_");
 x_6 = l_string_trim(x_5);
-x_7 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_7, 0, x_4);
-lean::cnstr_set(x_7, 1, x_6);
-x_8 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_8, 0, x_7);
-x_9 = lean::apply_1(x_1, x_8);
-return x_9;
+lean::dec(x_5);
+x_8 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_8, 0, x_4);
+lean::cnstr_set(x_8, 1, x_6);
+x_9 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_9, 0, x_8);
+x_10 = lean::apply_1(x_1, x_9);
+return x_10;
 }
 }
 obj* l_lean_expander_get__opt__type___main(obj* x_0) {
@@ -5219,20 +5234,22 @@ _start:
 obj* x_0; obj* x_1; 
 x_0 = lean::mk_string(" : ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 return x_1;
 }
 }
 obj* _init_l_lean_expander_expand__bracketed__binder___main___closed__11() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(" : ");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-return x_3;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+return x_4;
 }
 }
 obj* _init_l_lean_expander_expand__bracketed__binder___main___closed__12() {
@@ -6920,16 +6937,17 @@ return x_13;
 obj* _init_l_list_mfoldr___main___at_lean_expander_expand__binders___spec__6___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("match ");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_list_mfoldr___main___at_lean_expander_expand__binders___spec__6___closed__2() {
@@ -6972,22 +6990,23 @@ return x_18;
 obj* _init_l_list_mfoldr___main___at_lean_expander_expand__binders___spec__6___closed__3() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(" with ");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* _init_l_list_mfoldr___main___at_lean_expander_expand__binders___spec__6___closed__4() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_6; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; uint8 x_20; obj* x_21; obj* x_22; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_6; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; uint8 x_21; obj* x_22; obj* x_23; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("x");
 x_2 = lean_name_mk_string(x_0, x_1);
@@ -7010,17 +7029,18 @@ lean::inc(x_12);
 lean::dec(x_11);
 x_15 = lean::mk_string("_");
 x_16 = l_string_trim(x_15);
-x_17 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_17, 0, x_3);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_18, 0, x_17);
-x_19 = lean::apply_1(x_12, x_18);
-x_20 = 0;
-x_21 = l_lean_expander_mk__simple__binder(x_10, x_20, x_19);
-x_22 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_22, 0, x_21);
-return x_22;
+lean::dec(x_15);
+x_18 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_18, 0, x_3);
+lean::cnstr_set(x_18, 1, x_16);
+x_19 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_19, 0, x_18);
+x_20 = lean::apply_1(x_12, x_19);
+x_21 = 0;
+x_22 = l_lean_expander_mk__simple__binder(x_10, x_21, x_20);
+x_23 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_23, 0, x_22);
+return x_23;
 }
 }
 obj* l_list_mfoldr___main___at_lean_expander_expand__binders___spec__6(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -7322,35 +7342,38 @@ _start:
 obj* x_0; obj* x_1; 
 x_0 = lean::mk_string("_");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 return x_1;
 }
 }
 obj* _init_l_lean_expander_expand__binders___closed__3() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("_");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-return x_3;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+return x_4;
 }
 }
 obj* _init_l_lean_expander_expand__binders___closed__4() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("_");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* l_lean_expander_expand__binders(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -8735,33 +8758,35 @@ return x_9;
 obj* _init_l_lean_expander_let_transform___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(" : ");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-x_5 = l_lean_parser_term_hole_has__view;
-x_6 = lean::cnstr_get(x_5, 1);
-lean::inc(x_6);
-lean::dec(x_5);
-x_9 = lean::mk_string("_");
-x_10 = l_string_trim(x_9);
-x_11 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_11, 0, x_0);
-lean::cnstr_set(x_11, 1, x_10);
-x_12 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_12, 0, x_11);
-x_13 = lean::apply_1(x_6, x_12);
-x_14 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_14, 0, x_4);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_15, 0, x_14);
-return x_15;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+x_6 = l_lean_parser_term_hole_has__view;
+x_7 = lean::cnstr_get(x_6, 1);
+lean::inc(x_7);
+lean::dec(x_6);
+x_10 = lean::mk_string("_");
+x_11 = l_string_trim(x_10);
+lean::dec(x_10);
+x_13 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_13, 0, x_0);
+lean::cnstr_set(x_13, 1, x_11);
+x_14 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_14, 0, x_13);
+x_15 = lean::apply_1(x_7, x_14);
+x_16 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_16, 0, x_5);
+lean::cnstr_set(x_16, 1, x_15);
+x_17 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_17, 0, x_16);
+return x_17;
 }
 }
 obj* l_lean_expander_let_transform(obj* x_0, obj* x_1) {
@@ -9190,28 +9215,30 @@ return x_2;
 obj* _init_l_lean_expander_declaration_transform___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("@[");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-x_5 = lean::box(0);
-x_6 = lean::mk_string("]");
-x_7 = l_string_trim(x_6);
-x_8 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_8, 0, x_0);
-lean::cnstr_set(x_8, 1, x_7);
-x_9 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_9, 0, x_8);
-x_10 = lean::alloc_cnstr(0, 3, 0);
-lean::cnstr_set(x_10, 0, x_4);
-lean::cnstr_set(x_10, 1, x_5);
-lean::cnstr_set(x_10, 2, x_9);
-return x_10;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+x_6 = lean::box(0);
+x_7 = lean::mk_string("]");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+x_10 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_10, 0, x_0);
+lean::cnstr_set(x_10, 1, x_8);
+x_11 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_11, 0, x_10);
+x_12 = lean::alloc_cnstr(0, 3, 0);
+lean::cnstr_set(x_12, 0, x_5);
+lean::cnstr_set(x_12, 1, x_6);
+lean::cnstr_set(x_12, 2, x_11);
+return x_12;
 }
 }
 obj* _init_l_lean_expander_declaration_transform___closed__2() {
@@ -9246,18 +9273,19 @@ return x_12;
 obj* _init_l_lean_expander_declaration_transform___closed__3() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("structure");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-x_5 = lean::alloc_cnstr(0, 1, 0);
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
 lean::cnstr_set(x_5, 0, x_4);
-return x_5;
+x_6 = lean::alloc_cnstr(0, 1, 0);
+lean::cnstr_set(x_6, 0, x_5);
+return x_6;
 }
 }
 obj* l_lean_expander_declaration_transform(obj* x_0, obj* x_1) {
@@ -9717,16 +9745,17 @@ return x_2;
 obj* _init_l_lean_expander_variable_transform___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("variables");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* l_lean_expander_variable_transform(obj* x_0, obj* x_1) {
@@ -9905,51 +9934,53 @@ return x_0;
 obj* _init_l_lean_expander_binding__annotation__update_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; 
 x_0 = lean::mk_string("dummy");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-x_8 = l_lean_parser_term__parser__m_monad;
-x_9 = l_lean_parser_term__parser__m_monad__except;
-x_10 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_11 = l_lean_parser_term__parser__m_alternative;
-x_12 = l_lean_expander_binding__annotation__update;
-x_13 = l_lean_expander_binding__annotation__update_has__view;
-x_14 = l_lean_parser_combinators_node_view___rarg(x_8, x_9, x_10, x_11, x_12, x_7, x_13);
-lean::dec(x_7);
-return x_14;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+x_9 = l_lean_parser_term__parser__m_monad;
+x_10 = l_lean_parser_term__parser__m_monad__except;
+x_11 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_12 = l_lean_parser_term__parser__m_alternative;
+x_13 = l_lean_expander_binding__annotation__update;
+x_14 = l_lean_expander_binding__annotation__update_has__view;
+x_15 = l_lean_parser_combinators_node_view___rarg(x_9, x_10, x_11, x_12, x_13, x_8, x_14);
+lean::dec(x_8);
+return x_15;
 }
 }
 obj* _init_l_lean_expander_binding__annotation__update_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; 
 x_0 = lean::mk_string("dummy");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-return x_7;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+return x_8;
 }
 }
 obj* l_lean_expander_binding__annotation__update_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -9965,33 +9996,35 @@ return x_7;
 obj* _init_l_list_mmap___main___at_lean_expander_variables_transform___spec__1___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(" : ");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-x_5 = l_lean_expander_binding__annotation__update_has__view;
-x_6 = lean::cnstr_get(x_5, 1);
-lean::inc(x_6);
-lean::dec(x_5);
-x_9 = lean::mk_string("dummy");
-x_10 = l_string_trim(x_9);
-x_11 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_11, 0, x_0);
-lean::cnstr_set(x_11, 1, x_10);
-x_12 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_12, 0, x_11);
-x_13 = lean::apply_1(x_6, x_12);
-x_14 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_14, 0, x_4);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_15, 0, x_14);
-return x_15;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+x_6 = l_lean_expander_binding__annotation__update_has__view;
+x_7 = lean::cnstr_get(x_6, 1);
+lean::inc(x_7);
+lean::dec(x_6);
+x_10 = lean::mk_string("dummy");
+x_11 = l_string_trim(x_10);
+lean::dec(x_10);
+x_13 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_13, 0, x_0);
+lean::cnstr_set(x_13, 1, x_11);
+x_14 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_14, 0, x_13);
+x_15 = lean::apply_1(x_7, x_14);
+x_16 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_16, 0, x_5);
+lean::cnstr_set(x_16, 1, x_15);
+x_17 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_17, 0, x_16);
+return x_17;
 }
 }
 obj* l_list_mmap___main___at_lean_expander_variables_transform___spec__1(obj* x_0, obj* x_1) {
@@ -10446,16 +10479,17 @@ return x_2;
 obj* _init_l_list_map___main___at_lean_expander_universes_transform___spec__1___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("universe");
 x_2 = l_string_trim(x_1);
-x_3 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_3, 0, x_0);
-lean::cnstr_set(x_3, 1, x_2);
-x_4 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_4, 0, x_3);
-return x_4;
+lean::dec(x_1);
+x_4 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_4, 0, x_0);
+lean::cnstr_set(x_4, 1, x_2);
+x_5 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_5, 0, x_4);
+return x_5;
 }
 }
 obj* l_list_map___main___at_lean_expander_universes_transform___spec__1(obj* x_0) {
@@ -10535,7 +10569,7 @@ return x_2;
 obj* _init_l_lean_expander_sorry_transform___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("sorry_ax");
 x_2 = lean_name_mk_string(x_0, x_1);
@@ -10547,30 +10581,31 @@ lean::dec(x_4);
 x_8 = lean::box(0);
 x_9 = lean::mk_string("_");
 x_10 = l_string_trim(x_9);
-x_11 = lean::alloc_cnstr(0, 2, 0);
-lean::cnstr_set(x_11, 0, x_8);
-lean::cnstr_set(x_11, 1, x_10);
-x_12 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_12, 0, x_11);
-x_13 = lean::apply_1(x_5, x_12);
-x_14 = lean::mk_string("bool");
-x_15 = lean_name_mk_string(x_0, x_14);
-x_16 = lean::mk_string("ff");
-x_17 = lean_name_mk_string(x_15, x_16);
-x_18 = l_lean_expander_glob__id(x_17);
-x_19 = lean::box(0);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_18);
-lean::cnstr_set(x_20, 1, x_19);
+lean::dec(x_9);
+x_12 = lean::alloc_cnstr(0, 2, 0);
+lean::cnstr_set(x_12, 0, x_8);
+lean::cnstr_set(x_12, 1, x_10);
+x_13 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_13, 0, x_12);
+x_14 = lean::apply_1(x_5, x_13);
+x_15 = lean::mk_string("bool");
+x_16 = lean_name_mk_string(x_0, x_15);
+x_17 = lean::mk_string("ff");
+x_18 = lean_name_mk_string(x_16, x_17);
+x_19 = l_lean_expander_glob__id(x_18);
+x_20 = lean::box(0);
 x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_13);
+lean::cnstr_set(x_21, 0, x_19);
 lean::cnstr_set(x_21, 1, x_20);
-x_22 = l_list_foldl___main___at_lean_parser_term_mk__app___spec__1(x_3, x_21);
-x_23 = lean::alloc_cnstr(1, 1, 0);
-lean::cnstr_set(x_23, 0, x_22);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_14);
+lean::cnstr_set(x_22, 1, x_21);
+x_23 = l_list_foldl___main___at_lean_parser_term_mk__app___spec__1(x_3, x_22);
 x_24 = lean::alloc_cnstr(1, 1, 0);
 lean::cnstr_set(x_24, 0, x_23);
-return x_24;
+x_25 = lean::alloc_cnstr(1, 1, 0);
+lean::cnstr_set(x_25, 0, x_24);
+return x_25;
 }
 }
 obj* l_lean_expander_sorry_transform(obj* x_0, obj* x_1) {
diff --git a/src/boot/init/lean/parser/command.cpp b/src/boot/init/lean/parser/command.cpp
index 90f4cafe96..162c84f445 100644
--- a/src/boot/init/lean/parser/command.cpp
+++ b/src/boot/init/lean/parser/command.cpp
@@ -5801,461 +5801,479 @@ return x_0;
 obj* _init_l_lean_parser_command_open__spec_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_25; obj* x_26; obj* x_27; obj* x_29; obj* x_30; obj* x_31; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_41; obj* x_42; obj* x_43; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_50; obj* x_51; obj* x_52; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_67; obj* x_68; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_84; obj* x_85; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_92; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_20; obj* x_21; obj* x_24; obj* x_25; obj* x_27; obj* x_28; obj* x_29; obj* x_32; obj* x_33; obj* x_34; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_45; obj* x_46; obj* x_47; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_55; obj* x_56; obj* x_57; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_64; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_73; obj* x_74; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_87; obj* x_88; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_94; obj* x_95; obj* x_96; obj* x_98; 
 x_0 = lean::mk_string("as");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-lean::inc(x_7);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_6);
-lean::inc(x_9);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_5);
-lean::cnstr_set(x_11, 1, x_9);
-x_12 = l_lean_parser_command_open__spec_as;
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_13, 0, x_12);
-lean::closure_set(x_13, 1, x_11);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+lean::inc(x_8);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_8);
+lean::cnstr_set(x_10, 1, x_7);
+lean::inc(x_10);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_6);
+lean::cnstr_set(x_12, 1, x_10);
+x_13 = l_lean_parser_command_open__spec_as;
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
 lean::closure_set(x_14, 0, x_13);
-x_15 = lean::mk_string("(");
-x_16 = l_string_trim(x_15);
-lean::inc(x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_18, 0, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_19, 0, x_16);
-lean::closure_set(x_19, 1, x_4);
-lean::closure_set(x_19, 2, x_18);
-lean::inc(x_9);
-lean::inc(x_19);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_19);
-lean::cnstr_set(x_22, 1, x_9);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
-lean::closure_set(x_23, 0, x_22);
-lean::inc(x_7);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
-lean::closure_set(x_25, 0, x_7);
-x_26 = lean::mk_string(")");
-x_27 = l_string_trim(x_26);
-lean::inc(x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_29, 0, x_27);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_30, 0, x_27);
-lean::closure_set(x_30, 1, x_4);
-lean::closure_set(x_30, 2, x_29);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_30);
-lean::cnstr_set(x_31, 1, x_6);
-lean::inc(x_31);
-x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_25);
-lean::cnstr_set(x_33, 1, x_31);
+lean::closure_set(x_14, 1, x_12);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_15, 0, x_14);
+x_16 = lean::mk_string("(");
+x_17 = l_string_trim(x_16);
+lean::dec(x_16);
+lean::inc(x_17);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_20, 0, x_17);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_21, 0, x_17);
+lean::closure_set(x_21, 1, x_5);
+lean::closure_set(x_21, 2, x_20);
+lean::inc(x_10);
+lean::inc(x_21);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_21);
+lean::cnstr_set(x_24, 1, x_10);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_25, 0, x_24);
+lean::inc(x_8);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
+lean::closure_set(x_27, 0, x_8);
+x_28 = lean::mk_string(")");
+x_29 = l_string_trim(x_28);
+lean::dec(x_28);
+lean::inc(x_29);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_32, 0, x_29);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_33, 0, x_29);
+lean::closure_set(x_33, 1, x_5);
+lean::closure_set(x_33, 2, x_32);
 x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_23);
-lean::cnstr_set(x_34, 1, x_33);
-x_35 = l_lean_parser_command_open__spec_only;
-x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_36, 0, x_35);
-lean::closure_set(x_36, 1, x_34);
-x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_37, 0, x_36);
-x_38 = lean::mk_string("renaming");
-x_39 = l_string_trim(x_38);
-lean::inc(x_39);
-x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_41, 0, x_39);
-x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_42, 0, x_39);
-lean::closure_set(x_42, 1, x_4);
-lean::closure_set(x_42, 2, x_41);
-x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_42);
-lean::cnstr_set(x_43, 1, x_6);
-lean::inc(x_19);
-x_45 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_45, 0, x_19);
-lean::cnstr_set(x_45, 1, x_43);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
-lean::closure_set(x_46, 0, x_45);
-x_47 = lean::mk_string("->");
-x_48 = l_string_trim(x_47);
-lean::inc(x_48);
-x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_50, 0, x_48);
-x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_51, 0, x_48);
-lean::closure_set(x_51, 1, x_4);
-lean::closure_set(x_51, 2, x_50);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_51);
-lean::cnstr_set(x_52, 1, x_9);
-lean::inc(x_7);
-x_54 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_54, 0, x_7);
-lean::cnstr_set(x_54, 1, x_52);
-x_55 = l_lean_parser_command_open__spec_renaming_item;
-x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_56, 0, x_55);
-lean::closure_set(x_56, 1, x_54);
-x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_57, 0, x_56);
-lean::inc(x_31);
+lean::cnstr_set(x_34, 0, x_33);
+lean::cnstr_set(x_34, 1, x_7);
+lean::inc(x_34);
+x_36 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_36, 0, x_27);
+lean::cnstr_set(x_36, 1, x_34);
+x_37 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_37, 0, x_25);
+lean::cnstr_set(x_37, 1, x_36);
+x_38 = l_lean_parser_command_open__spec_only;
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_39, 0, x_38);
+lean::closure_set(x_39, 1, x_37);
+x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_40, 0, x_39);
+x_41 = lean::mk_string("renaming");
+x_42 = l_string_trim(x_41);
+lean::dec(x_41);
+lean::inc(x_42);
+x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_45, 0, x_42);
+x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_46, 0, x_42);
+lean::closure_set(x_46, 1, x_5);
+lean::closure_set(x_46, 2, x_45);
+x_47 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_47, 0, x_46);
+lean::cnstr_set(x_47, 1, x_7);
+lean::inc(x_21);
+x_49 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_49, 0, x_21);
+lean::cnstr_set(x_49, 1, x_47);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_50, 0, x_49);
+x_51 = lean::mk_string("->");
+x_52 = l_string_trim(x_51);
+lean::dec(x_51);
+lean::inc(x_52);
+x_55 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_55, 0, x_52);
+x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_56, 0, x_52);
+lean::closure_set(x_56, 1, x_5);
+lean::closure_set(x_56, 2, x_55);
+x_57 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_57, 0, x_56);
+lean::cnstr_set(x_57, 1, x_10);
+lean::inc(x_8);
 x_59 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_59, 0, x_57);
-lean::cnstr_set(x_59, 1, x_31);
-x_60 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_60, 0, x_46);
-lean::cnstr_set(x_60, 1, x_59);
-x_61 = l_lean_parser_command_open__spec_renaming;
-x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::cnstr_set(x_59, 0, x_8);
+lean::cnstr_set(x_59, 1, x_57);
+x_60 = l_lean_parser_command_open__spec_renaming_item;
+x_61 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_61, 0, x_60);
+lean::closure_set(x_61, 1, x_59);
+x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
 lean::closure_set(x_62, 0, x_61);
-lean::closure_set(x_62, 1, x_60);
-x_63 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_63, 0, x_62);
-x_64 = lean::mk_string("hiding");
-x_65 = l_string_trim(x_64);
-lean::inc(x_65);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_67, 0, x_65);
-x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_68, 0, x_65);
-lean::closure_set(x_68, 1, x_4);
-lean::closure_set(x_68, 2, x_67);
-lean::inc(x_7);
-x_70 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_70, 0, x_7);
-x_71 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_71, 0, x_70);
-lean::cnstr_set(x_71, 1, x_31);
-x_72 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_72, 0, x_68);
-lean::cnstr_set(x_72, 1, x_71);
-x_73 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_73, 0, x_19);
-lean::cnstr_set(x_73, 1, x_72);
-x_74 = l_lean_parser_command_open__spec_hiding;
-x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_75, 0, x_74);
-lean::closure_set(x_75, 1, x_73);
-x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_76, 0, x_75);
+lean::inc(x_34);
+x_64 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_64, 0, x_62);
+lean::cnstr_set(x_64, 1, x_34);
+x_65 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_65, 0, x_50);
+lean::cnstr_set(x_65, 1, x_64);
+x_66 = l_lean_parser_command_open__spec_renaming;
+x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_67, 0, x_66);
+lean::closure_set(x_67, 1, x_65);
+x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_68, 0, x_67);
+x_69 = lean::mk_string("hiding");
+x_70 = l_string_trim(x_69);
+lean::dec(x_69);
+lean::inc(x_70);
+x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_73, 0, x_70);
+x_74 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_74, 0, x_70);
+lean::closure_set(x_74, 1, x_5);
+lean::closure_set(x_74, 2, x_73);
+lean::inc(x_8);
+x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_76, 0, x_8);
 x_77 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_77, 0, x_76);
-lean::cnstr_set(x_77, 1, x_6);
+lean::cnstr_set(x_77, 1, x_34);
 x_78 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_78, 0, x_63);
+lean::cnstr_set(x_78, 0, x_74);
 lean::cnstr_set(x_78, 1, x_77);
 x_79 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_79, 0, x_37);
+lean::cnstr_set(x_79, 0, x_21);
 lean::cnstr_set(x_79, 1, x_78);
-x_80 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_80, 0, x_14);
-lean::cnstr_set(x_80, 1, x_79);
-x_81 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_81, 0, x_7);
-lean::cnstr_set(x_81, 1, x_80);
-x_82 = l_lean_parser_command_open__spec;
-lean::inc(x_81);
-x_84 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_84, 0, x_82);
-lean::closure_set(x_84, 1, x_81);
-x_85 = l_lean_parser_command__parser__m_monad___closed__1;
-x_86 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_87 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_88 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_89 = l_lean_parser_command_open__spec_has__view;
-x_90 = l_lean_parser_combinators_node_view___rarg(x_85, x_86, x_87, x_88, x_82, x_81, x_89);
-lean::dec(x_81);
-x_92 = l_lean_parser_combinators_many1_view___rarg(x_85, x_86, x_87, x_88, x_84, x_90);
-lean::dec(x_84);
-return x_92;
+x_80 = l_lean_parser_command_open__spec_hiding;
+x_81 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_81, 0, x_80);
+lean::closure_set(x_81, 1, x_79);
+x_82 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_82, 0, x_81);
+x_83 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_83, 0, x_82);
+lean::cnstr_set(x_83, 1, x_7);
+x_84 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_84, 0, x_68);
+lean::cnstr_set(x_84, 1, x_83);
+x_85 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_85, 0, x_40);
+lean::cnstr_set(x_85, 1, x_84);
+x_86 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_86, 0, x_15);
+lean::cnstr_set(x_86, 1, x_85);
+x_87 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_87, 0, x_8);
+lean::cnstr_set(x_87, 1, x_86);
+x_88 = l_lean_parser_command_open__spec;
+lean::inc(x_87);
+x_90 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_90, 0, x_88);
+lean::closure_set(x_90, 1, x_87);
+x_91 = l_lean_parser_command__parser__m_monad___closed__1;
+x_92 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_93 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_94 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_95 = l_lean_parser_command_open__spec_has__view;
+x_96 = l_lean_parser_combinators_node_view___rarg(x_91, x_92, x_93, x_94, x_88, x_87, x_95);
+lean::dec(x_87);
+x_98 = l_lean_parser_combinators_many1_view___rarg(x_91, x_92, x_93, x_94, x_90, x_96);
+lean::dec(x_90);
+return x_98;
 }
 }
 obj* _init_l_lean_parser_command_open__spec_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_25; obj* x_27; obj* x_29; obj* x_31; obj* x_32; obj* x_33; obj* x_35; obj* x_37; obj* x_39; obj* x_41; obj* x_42; obj* x_43; obj* x_46; obj* x_48; obj* x_50; obj* x_52; obj* x_55; obj* x_58; obj* x_60; obj* x_62; obj* x_63; obj* x_64; obj* x_67; obj* x_70; obj* x_72; obj* x_74; obj* x_76; obj* x_79; obj* x_82; obj* x_85; obj* x_87; obj* x_89; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_5; obj* x_6; obj* x_8; obj* x_10; obj* x_12; obj* x_13; obj* x_15; obj* x_16; obj* x_18; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_26; obj* x_28; obj* x_30; obj* x_32; obj* x_34; obj* x_35; obj* x_37; obj* x_39; obj* x_41; obj* x_43; obj* x_45; obj* x_46; obj* x_48; obj* x_51; obj* x_53; obj* x_55; obj* x_57; obj* x_60; obj* x_63; obj* x_65; obj* x_67; obj* x_68; obj* x_70; obj* x_73; obj* x_76; obj* x_78; obj* x_80; obj* x_82; obj* x_85; obj* x_88; obj* x_91; obj* x_93; obj* x_95; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("as");
 x_2 = lean::mk_nat_obj(0u);
 x_3 = l_lean_parser_symbol_tokens___rarg(x_1, x_2);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_0, x_0);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_3, x_4);
+lean::dec(x_1);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_0, x_0);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_3, x_5);
 lean::dec(x_3);
-x_7 = l_lean_parser_tokens___rarg(x_5);
-lean::dec(x_5);
-x_9 = l_lean_parser_tokens___rarg(x_7);
-lean::dec(x_7);
-x_11 = lean::mk_string("(");
-x_12 = l_lean_parser_symbol_tokens___rarg(x_11, x_2);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_12, x_4);
-x_14 = l_lean_parser_tokens___rarg(x_13);
-lean::dec(x_13);
-x_16 = l_lean_parser_tokens___rarg(x_14);
-lean::dec(x_14);
-x_18 = l_lean_parser_tokens___rarg(x_0);
-x_19 = lean::mk_string(")");
-x_20 = l_lean_parser_symbol_tokens___rarg(x_19, x_2);
-x_21 = l_lean_parser_list_cons_tokens___rarg(x_20, x_0);
-lean::dec(x_20);
-x_23 = l_lean_parser_list_cons_tokens___rarg(x_18, x_21);
-lean::dec(x_18);
-x_25 = l_lean_parser_list_cons_tokens___rarg(x_16, x_23);
-lean::dec(x_16);
-x_27 = l_lean_parser_tokens___rarg(x_25);
-lean::dec(x_25);
-x_29 = l_lean_parser_tokens___rarg(x_27);
-lean::dec(x_27);
-x_31 = lean::mk_string("renaming");
-x_32 = l_lean_parser_symbol_tokens___rarg(x_31, x_2);
-x_33 = l_lean_parser_list_cons_tokens___rarg(x_32, x_0);
-lean::dec(x_32);
-x_35 = l_lean_parser_list_cons_tokens___rarg(x_12, x_33);
-lean::dec(x_33);
-x_37 = l_lean_parser_tokens___rarg(x_35);
-lean::dec(x_35);
-x_39 = l_lean_parser_tokens___rarg(x_37);
-lean::dec(x_37);
-x_41 = lean::mk_string("->");
-x_42 = l_lean_parser_symbol_tokens___rarg(x_41, x_2);
-x_43 = l_lean_parser_list_cons_tokens___rarg(x_42, x_4);
-lean::dec(x_4);
-lean::dec(x_42);
-x_46 = l_lean_parser_list_cons_tokens___rarg(x_0, x_43);
-lean::dec(x_43);
-x_48 = l_lean_parser_tokens___rarg(x_46);
-lean::dec(x_46);
-x_50 = l_lean_parser_tokens___rarg(x_48);
-lean::dec(x_48);
-x_52 = l_lean_parser_list_cons_tokens___rarg(x_50, x_21);
-lean::dec(x_21);
-lean::dec(x_50);
-x_55 = l_lean_parser_list_cons_tokens___rarg(x_39, x_52);
-lean::dec(x_52);
-lean::dec(x_39);
-x_58 = l_lean_parser_tokens___rarg(x_55);
-lean::dec(x_55);
-x_60 = l_lean_parser_tokens___rarg(x_58);
-lean::dec(x_58);
-x_62 = lean::mk_string("hiding");
-x_63 = l_lean_parser_symbol_tokens___rarg(x_62, x_2);
-x_64 = l_lean_parser_list_cons_tokens___rarg(x_63, x_23);
-lean::dec(x_23);
-lean::dec(x_63);
-x_67 = l_lean_parser_list_cons_tokens___rarg(x_12, x_64);
-lean::dec(x_64);
+x_8 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_6);
+x_10 = l_lean_parser_tokens___rarg(x_8);
+lean::dec(x_8);
+x_12 = lean::mk_string("(");
+x_13 = l_lean_parser_symbol_tokens___rarg(x_12, x_2);
 lean::dec(x_12);
-x_70 = l_lean_parser_tokens___rarg(x_67);
-lean::dec(x_67);
-x_72 = l_lean_parser_tokens___rarg(x_70);
-lean::dec(x_70);
-x_74 = l_lean_parser_list_cons_tokens___rarg(x_72, x_0);
-lean::dec(x_72);
-x_76 = l_lean_parser_list_cons_tokens___rarg(x_60, x_74);
-lean::dec(x_74);
+x_15 = l_lean_parser_list_cons_tokens___rarg(x_13, x_5);
+x_16 = l_lean_parser_tokens___rarg(x_15);
+lean::dec(x_15);
+x_18 = l_lean_parser_tokens___rarg(x_16);
+lean::dec(x_16);
+x_20 = l_lean_parser_tokens___rarg(x_0);
+x_21 = lean::mk_string(")");
+x_22 = l_lean_parser_symbol_tokens___rarg(x_21, x_2);
+lean::dec(x_21);
+x_24 = l_lean_parser_list_cons_tokens___rarg(x_22, x_0);
+lean::dec(x_22);
+x_26 = l_lean_parser_list_cons_tokens___rarg(x_20, x_24);
+lean::dec(x_20);
+x_28 = l_lean_parser_list_cons_tokens___rarg(x_18, x_26);
+lean::dec(x_18);
+x_30 = l_lean_parser_tokens___rarg(x_28);
+lean::dec(x_28);
+x_32 = l_lean_parser_tokens___rarg(x_30);
+lean::dec(x_30);
+x_34 = lean::mk_string("renaming");
+x_35 = l_lean_parser_symbol_tokens___rarg(x_34, x_2);
+lean::dec(x_34);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_35, x_0);
+lean::dec(x_35);
+x_39 = l_lean_parser_list_cons_tokens___rarg(x_13, x_37);
+lean::dec(x_37);
+x_41 = l_lean_parser_tokens___rarg(x_39);
+lean::dec(x_39);
+x_43 = l_lean_parser_tokens___rarg(x_41);
+lean::dec(x_41);
+x_45 = lean::mk_string("->");
+x_46 = l_lean_parser_symbol_tokens___rarg(x_45, x_2);
+lean::dec(x_45);
+x_48 = l_lean_parser_list_cons_tokens___rarg(x_46, x_5);
+lean::dec(x_5);
+lean::dec(x_46);
+x_51 = l_lean_parser_list_cons_tokens___rarg(x_0, x_48);
+lean::dec(x_48);
+x_53 = l_lean_parser_tokens___rarg(x_51);
+lean::dec(x_51);
+x_55 = l_lean_parser_tokens___rarg(x_53);
+lean::dec(x_53);
+x_57 = l_lean_parser_list_cons_tokens___rarg(x_55, x_24);
+lean::dec(x_24);
+lean::dec(x_55);
+x_60 = l_lean_parser_list_cons_tokens___rarg(x_43, x_57);
+lean::dec(x_57);
+lean::dec(x_43);
+x_63 = l_lean_parser_tokens___rarg(x_60);
 lean::dec(x_60);
-x_79 = l_lean_parser_list_cons_tokens___rarg(x_29, x_76);
+x_65 = l_lean_parser_tokens___rarg(x_63);
+lean::dec(x_63);
+x_67 = lean::mk_string("hiding");
+x_68 = l_lean_parser_symbol_tokens___rarg(x_67, x_2);
+lean::dec(x_67);
+x_70 = l_lean_parser_list_cons_tokens___rarg(x_68, x_26);
+lean::dec(x_26);
+lean::dec(x_68);
+x_73 = l_lean_parser_list_cons_tokens___rarg(x_13, x_70);
+lean::dec(x_70);
+lean::dec(x_13);
+x_76 = l_lean_parser_tokens___rarg(x_73);
+lean::dec(x_73);
+x_78 = l_lean_parser_tokens___rarg(x_76);
 lean::dec(x_76);
-lean::dec(x_29);
-x_82 = l_lean_parser_list_cons_tokens___rarg(x_9, x_79);
-lean::dec(x_79);
-lean::dec(x_9);
-x_85 = l_lean_parser_list_cons_tokens___rarg(x_0, x_82);
+x_80 = l_lean_parser_list_cons_tokens___rarg(x_78, x_0);
+lean::dec(x_78);
+x_82 = l_lean_parser_list_cons_tokens___rarg(x_65, x_80);
+lean::dec(x_80);
+lean::dec(x_65);
+x_85 = l_lean_parser_list_cons_tokens___rarg(x_32, x_82);
 lean::dec(x_82);
-x_87 = l_lean_parser_tokens___rarg(x_85);
+lean::dec(x_32);
+x_88 = l_lean_parser_list_cons_tokens___rarg(x_10, x_85);
 lean::dec(x_85);
-x_89 = l_lean_parser_tokens___rarg(x_87);
-lean::dec(x_87);
-return x_89;
+lean::dec(x_10);
+x_91 = l_lean_parser_list_cons_tokens___rarg(x_0, x_88);
+lean::dec(x_88);
+x_93 = l_lean_parser_tokens___rarg(x_91);
+lean::dec(x_91);
+x_95 = l_lean_parser_tokens___rarg(x_93);
+lean::dec(x_93);
+return x_95;
 }
 }
 obj* _init_l_lean_parser_command_open__spec_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_25; obj* x_26; obj* x_27; obj* x_29; obj* x_30; obj* x_31; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_41; obj* x_42; obj* x_43; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_50; obj* x_51; obj* x_52; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_67; obj* x_68; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_20; obj* x_21; obj* x_24; obj* x_25; obj* x_27; obj* x_28; obj* x_29; obj* x_32; obj* x_33; obj* x_34; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_45; obj* x_46; obj* x_47; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_55; obj* x_56; obj* x_57; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_64; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_73; obj* x_74; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_87; obj* x_88; obj* x_89; 
 x_0 = lean::mk_string("as");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-lean::inc(x_7);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_6);
-lean::inc(x_9);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_5);
-lean::cnstr_set(x_11, 1, x_9);
-x_12 = l_lean_parser_command_open__spec_as;
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_13, 0, x_12);
-lean::closure_set(x_13, 1, x_11);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+lean::inc(x_8);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_8);
+lean::cnstr_set(x_10, 1, x_7);
+lean::inc(x_10);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_6);
+lean::cnstr_set(x_12, 1, x_10);
+x_13 = l_lean_parser_command_open__spec_as;
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
 lean::closure_set(x_14, 0, x_13);
-x_15 = lean::mk_string("(");
-x_16 = l_string_trim(x_15);
-lean::inc(x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_18, 0, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_19, 0, x_16);
-lean::closure_set(x_19, 1, x_4);
-lean::closure_set(x_19, 2, x_18);
-lean::inc(x_9);
-lean::inc(x_19);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_19);
-lean::cnstr_set(x_22, 1, x_9);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
-lean::closure_set(x_23, 0, x_22);
-lean::inc(x_7);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
-lean::closure_set(x_25, 0, x_7);
-x_26 = lean::mk_string(")");
-x_27 = l_string_trim(x_26);
-lean::inc(x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_29, 0, x_27);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_30, 0, x_27);
-lean::closure_set(x_30, 1, x_4);
-lean::closure_set(x_30, 2, x_29);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_30);
-lean::cnstr_set(x_31, 1, x_6);
-lean::inc(x_31);
-x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_25);
-lean::cnstr_set(x_33, 1, x_31);
+lean::closure_set(x_14, 1, x_12);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_15, 0, x_14);
+x_16 = lean::mk_string("(");
+x_17 = l_string_trim(x_16);
+lean::dec(x_16);
+lean::inc(x_17);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_20, 0, x_17);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_21, 0, x_17);
+lean::closure_set(x_21, 1, x_5);
+lean::closure_set(x_21, 2, x_20);
+lean::inc(x_10);
+lean::inc(x_21);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_21);
+lean::cnstr_set(x_24, 1, x_10);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_25, 0, x_24);
+lean::inc(x_8);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
+lean::closure_set(x_27, 0, x_8);
+x_28 = lean::mk_string(")");
+x_29 = l_string_trim(x_28);
+lean::dec(x_28);
+lean::inc(x_29);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_32, 0, x_29);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_33, 0, x_29);
+lean::closure_set(x_33, 1, x_5);
+lean::closure_set(x_33, 2, x_32);
 x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_23);
-lean::cnstr_set(x_34, 1, x_33);
-x_35 = l_lean_parser_command_open__spec_only;
-x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_36, 0, x_35);
-lean::closure_set(x_36, 1, x_34);
-x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_37, 0, x_36);
-x_38 = lean::mk_string("renaming");
-x_39 = l_string_trim(x_38);
-lean::inc(x_39);
-x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_41, 0, x_39);
-x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_42, 0, x_39);
-lean::closure_set(x_42, 1, x_4);
-lean::closure_set(x_42, 2, x_41);
-x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_42);
-lean::cnstr_set(x_43, 1, x_6);
-lean::inc(x_19);
-x_45 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_45, 0, x_19);
-lean::cnstr_set(x_45, 1, x_43);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
-lean::closure_set(x_46, 0, x_45);
-x_47 = lean::mk_string("->");
-x_48 = l_string_trim(x_47);
-lean::inc(x_48);
-x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_50, 0, x_48);
-x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_51, 0, x_48);
-lean::closure_set(x_51, 1, x_4);
-lean::closure_set(x_51, 2, x_50);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_51);
-lean::cnstr_set(x_52, 1, x_9);
-lean::inc(x_7);
-x_54 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_54, 0, x_7);
-lean::cnstr_set(x_54, 1, x_52);
-x_55 = l_lean_parser_command_open__spec_renaming_item;
-x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_56, 0, x_55);
-lean::closure_set(x_56, 1, x_54);
-x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_57, 0, x_56);
-lean::inc(x_31);
+lean::cnstr_set(x_34, 0, x_33);
+lean::cnstr_set(x_34, 1, x_7);
+lean::inc(x_34);
+x_36 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_36, 0, x_27);
+lean::cnstr_set(x_36, 1, x_34);
+x_37 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_37, 0, x_25);
+lean::cnstr_set(x_37, 1, x_36);
+x_38 = l_lean_parser_command_open__spec_only;
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_39, 0, x_38);
+lean::closure_set(x_39, 1, x_37);
+x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_40, 0, x_39);
+x_41 = lean::mk_string("renaming");
+x_42 = l_string_trim(x_41);
+lean::dec(x_41);
+lean::inc(x_42);
+x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_45, 0, x_42);
+x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_46, 0, x_42);
+lean::closure_set(x_46, 1, x_5);
+lean::closure_set(x_46, 2, x_45);
+x_47 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_47, 0, x_46);
+lean::cnstr_set(x_47, 1, x_7);
+lean::inc(x_21);
+x_49 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_49, 0, x_21);
+lean::cnstr_set(x_49, 1, x_47);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_50, 0, x_49);
+x_51 = lean::mk_string("->");
+x_52 = l_string_trim(x_51);
+lean::dec(x_51);
+lean::inc(x_52);
+x_55 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_55, 0, x_52);
+x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_56, 0, x_52);
+lean::closure_set(x_56, 1, x_5);
+lean::closure_set(x_56, 2, x_55);
+x_57 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_57, 0, x_56);
+lean::cnstr_set(x_57, 1, x_10);
+lean::inc(x_8);
 x_59 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_59, 0, x_57);
-lean::cnstr_set(x_59, 1, x_31);
-x_60 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_60, 0, x_46);
-lean::cnstr_set(x_60, 1, x_59);
-x_61 = l_lean_parser_command_open__spec_renaming;
-x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::cnstr_set(x_59, 0, x_8);
+lean::cnstr_set(x_59, 1, x_57);
+x_60 = l_lean_parser_command_open__spec_renaming_item;
+x_61 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_61, 0, x_60);
+lean::closure_set(x_61, 1, x_59);
+x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
 lean::closure_set(x_62, 0, x_61);
-lean::closure_set(x_62, 1, x_60);
-x_63 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_63, 0, x_62);
-x_64 = lean::mk_string("hiding");
-x_65 = l_string_trim(x_64);
-lean::inc(x_65);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_67, 0, x_65);
-x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_68, 0, x_65);
-lean::closure_set(x_68, 1, x_4);
-lean::closure_set(x_68, 2, x_67);
-lean::inc(x_7);
-x_70 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_70, 0, x_7);
-x_71 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_71, 0, x_70);
-lean::cnstr_set(x_71, 1, x_31);
-x_72 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_72, 0, x_68);
-lean::cnstr_set(x_72, 1, x_71);
-x_73 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_73, 0, x_19);
-lean::cnstr_set(x_73, 1, x_72);
-x_74 = l_lean_parser_command_open__spec_hiding;
-x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_75, 0, x_74);
-lean::closure_set(x_75, 1, x_73);
-x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_76, 0, x_75);
+lean::inc(x_34);
+x_64 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_64, 0, x_62);
+lean::cnstr_set(x_64, 1, x_34);
+x_65 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_65, 0, x_50);
+lean::cnstr_set(x_65, 1, x_64);
+x_66 = l_lean_parser_command_open__spec_renaming;
+x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_67, 0, x_66);
+lean::closure_set(x_67, 1, x_65);
+x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_68, 0, x_67);
+x_69 = lean::mk_string("hiding");
+x_70 = l_string_trim(x_69);
+lean::dec(x_69);
+lean::inc(x_70);
+x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_73, 0, x_70);
+x_74 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_74, 0, x_70);
+lean::closure_set(x_74, 1, x_5);
+lean::closure_set(x_74, 2, x_73);
+lean::inc(x_8);
+x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_76, 0, x_8);
 x_77 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_77, 0, x_76);
-lean::cnstr_set(x_77, 1, x_6);
+lean::cnstr_set(x_77, 1, x_34);
 x_78 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_78, 0, x_63);
+lean::cnstr_set(x_78, 0, x_74);
 lean::cnstr_set(x_78, 1, x_77);
 x_79 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_79, 0, x_37);
+lean::cnstr_set(x_79, 0, x_21);
 lean::cnstr_set(x_79, 1, x_78);
-x_80 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_80, 0, x_14);
-lean::cnstr_set(x_80, 1, x_79);
-x_81 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_81, 0, x_7);
-lean::cnstr_set(x_81, 1, x_80);
-x_82 = l_lean_parser_command_open__spec;
-x_83 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_83, 0, x_82);
-lean::closure_set(x_83, 1, x_81);
-return x_83;
+x_80 = l_lean_parser_command_open__spec_hiding;
+x_81 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_81, 0, x_80);
+lean::closure_set(x_81, 1, x_79);
+x_82 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_82, 0, x_81);
+x_83 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_83, 0, x_82);
+lean::cnstr_set(x_83, 1, x_7);
+x_84 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_84, 0, x_68);
+lean::cnstr_set(x_84, 1, x_83);
+x_85 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_85, 0, x_40);
+lean::cnstr_set(x_85, 1, x_84);
+x_86 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_86, 0, x_15);
+lean::cnstr_set(x_86, 1, x_85);
+x_87 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_87, 0, x_8);
+lean::cnstr_set(x_87, 1, x_86);
+x_88 = l_lean_parser_command_open__spec;
+x_89 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_89, 0, x_88);
+lean::closure_set(x_89, 1, x_87);
+return x_89;
 }
 }
 obj* l_lean_parser_command_open__spec_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -6645,44 +6663,46 @@ return x_0;
 obj* _init_l_lean_parser_command_open_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_10; 
 x_0 = lean::mk_string("open");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_command_open__spec_parser_lean_parser_has__tokens;
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
-lean::dec(x_5);
-lean::dec(x_2);
-x_9 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_command_open__spec_parser_lean_parser_has__tokens;
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
 lean::dec(x_6);
-return x_9;
+lean::dec(x_2);
+x_10 = l_lean_parser_tokens___rarg(x_7);
+lean::dec(x_7);
+return x_10;
 }
 }
 obj* _init_l_lean_parser_command_open_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
 x_0 = lean::mk_string("open");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_open__spec_parser), 4, 0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_7);
-lean::cnstr_set(x_8, 1, x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_open__spec_parser), 4, 0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
-lean::cnstr_set(x_9, 1, x_8);
-return x_9;
+lean::cnstr_set(x_9, 0, x_8);
+lean::cnstr_set(x_9, 1, x_7);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+return x_10;
 }
 }
 obj* l_lean_parser_command_open_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -7034,44 +7054,46 @@ return x_0;
 obj* _init_l_lean_parser_command_export_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_10; 
 x_0 = lean::mk_string("export");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_command_open__spec_parser_lean_parser_has__tokens;
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
-lean::dec(x_5);
-lean::dec(x_2);
-x_9 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_command_open__spec_parser_lean_parser_has__tokens;
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
 lean::dec(x_6);
-return x_9;
+lean::dec(x_2);
+x_10 = l_lean_parser_tokens___rarg(x_7);
+lean::dec(x_7);
+return x_10;
 }
 }
 obj* _init_l_lean_parser_command_export_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
 x_0 = lean::mk_string("export");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_open__spec_parser), 4, 0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_7);
-lean::cnstr_set(x_8, 1, x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_open__spec_parser), 4, 0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
-lean::cnstr_set(x_9, 1, x_8);
-return x_9;
+lean::cnstr_set(x_9, 0, x_8);
+lean::cnstr_set(x_9, 1, x_7);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+return x_10;
 }
 }
 obj* l_lean_parser_command_export_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -7614,47 +7636,49 @@ return x_0;
 obj* _init_l_lean_parser_command_section_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; 
 x_0 = lean::mk_string("section");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-lean::dec(x_4);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
 lean::dec(x_5);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
+lean::dec(x_6);
 lean::dec(x_2);
-x_10 = l_lean_parser_tokens___rarg(x_7);
-lean::dec(x_7);
-return x_10;
+x_11 = l_lean_parser_tokens___rarg(x_8);
+lean::dec(x_8);
+return x_11;
 }
 }
 obj* _init_l_lean_parser_command_section_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string("section");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-return x_10;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_command_section_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -7983,43 +8007,45 @@ return x_0;
 obj* _init_l_lean_parser_command_namespace_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_9; 
 x_0 = lean::mk_string("namespace");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_3, x_3);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_2, x_4);
-lean::dec(x_4);
-lean::dec(x_2);
-x_8 = l_lean_parser_tokens___rarg(x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_4);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
 lean::dec(x_5);
-return x_8;
+lean::dec(x_2);
+x_9 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_6);
+return x_9;
 }
 }
 obj* _init_l_lean_parser_command_namespace_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
 x_0 = lean::mk_string("namespace");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_7);
-lean::cnstr_set(x_8, 1, x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
-lean::cnstr_set(x_9, 1, x_8);
-return x_9;
+lean::cnstr_set(x_9, 0, x_8);
+lean::cnstr_set(x_9, 1, x_7);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+return x_10;
 }
 }
 obj* l_lean_parser_command_namespace_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -8399,48 +8425,50 @@ return x_0;
 obj* _init_l_lean_parser_command_variable_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_12; 
 x_0 = lean::mk_string("variable");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_term_binder_parser_lean_parser_has__tokens;
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
-lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
+lean::dec(x_0);
+x_4 = l_lean_parser_term_binder_parser_lean_parser_has__tokens;
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = lean::box(0);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_5, x_6);
+lean::dec(x_5);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_2, x_7);
+lean::dec(x_7);
 lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
-lean::dec(x_8);
-return x_11;
+x_12 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+return x_12;
 }
 }
 obj* _init_l_lean_parser_command_variable_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string("variable");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binder_parser), 5, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binder_parser), 5, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-return x_10;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_command_variable_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -8807,48 +8835,50 @@ return x_0;
 obj* _init_l_lean_parser_command_variables_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_12; 
 x_0 = lean::mk_string("variables");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_term_bracketed__binders_parser_lean_parser_has__tokens;
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
-lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
+lean::dec(x_0);
+x_4 = l_lean_parser_term_bracketed__binders_parser_lean_parser_has__tokens;
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = lean::box(0);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_5, x_6);
+lean::dec(x_5);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_2, x_7);
+lean::dec(x_7);
 lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
-lean::dec(x_8);
-return x_11;
+x_12 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+return x_12;
 }
 }
 obj* _init_l_lean_parser_command_variables_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string("variables");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binders_parser), 5, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binders_parser), 5, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-return x_10;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_command_variables_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -9282,47 +9312,49 @@ return x_0;
 obj* _init_l_lean_parser_command_include_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; 
 x_0 = lean::mk_string("include ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-lean::dec(x_4);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
 lean::dec(x_5);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
+lean::dec(x_6);
 lean::dec(x_2);
-x_10 = l_lean_parser_tokens___rarg(x_7);
-lean::dec(x_7);
-return x_10;
+x_11 = l_lean_parser_tokens___rarg(x_8);
+lean::dec(x_8);
+return x_11;
 }
 }
 obj* _init_l_lean_parser_command_include_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string("include ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-return x_10;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_command_include_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -9756,47 +9788,49 @@ return x_0;
 obj* _init_l_lean_parser_command_omit_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; 
 x_0 = lean::mk_string("omit ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-lean::dec(x_4);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
 lean::dec(x_5);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
+lean::dec(x_6);
 lean::dec(x_2);
-x_10 = l_lean_parser_tokens___rarg(x_7);
-lean::dec(x_7);
-return x_10;
+x_11 = l_lean_parser_tokens___rarg(x_8);
+lean::dec(x_8);
+return x_11;
 }
 }
 obj* _init_l_lean_parser_command_omit_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string("omit ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-return x_10;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_command_omit_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -10339,47 +10373,49 @@ return x_0;
 obj* _init_l_lean_parser_command_end_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; 
 x_0 = lean::mk_string("end");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-lean::dec(x_4);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
 lean::dec(x_5);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
+lean::dec(x_6);
 lean::dec(x_2);
-x_10 = l_lean_parser_tokens___rarg(x_7);
-lean::dec(x_7);
-return x_10;
+x_11 = l_lean_parser_tokens___rarg(x_8);
+lean::dec(x_8);
+return x_11;
 }
 }
 obj* _init_l_lean_parser_command_end_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string("end");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-return x_10;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_command_end_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -11126,35 +11162,37 @@ return x_0;
 obj* _init_l_lean_parser_command_universe_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_20; obj* x_22; obj* x_25; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_20; obj* x_22; obj* x_24; obj* x_27; 
 x_0 = lean::mk_string("universes");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-lean::dec(x_4);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
 lean::dec(x_5);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
+lean::dec(x_6);
 lean::dec(x_2);
-x_10 = l_lean_parser_tokens___rarg(x_7);
-lean::dec(x_7);
-x_12 = lean::mk_string("universe");
-x_13 = l_lean_parser_symbol_tokens___rarg(x_12, x_1);
-x_14 = l_lean_parser_list_cons_tokens___rarg(x_3, x_3);
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_13, x_14);
-lean::dec(x_14);
+x_11 = l_lean_parser_tokens___rarg(x_8);
+lean::dec(x_8);
+x_13 = lean::mk_string("universe");
+x_14 = l_lean_parser_symbol_tokens___rarg(x_13, x_1);
 lean::dec(x_13);
-x_18 = l_lean_parser_tokens___rarg(x_15);
-lean::dec(x_15);
-x_20 = l_lean_parser_list_cons_tokens___rarg(x_18, x_3);
-lean::dec(x_18);
-x_22 = l_lean_parser_list_cons_tokens___rarg(x_10, x_20);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_4, x_4);
+x_17 = l_lean_parser_list_cons_tokens___rarg(x_14, x_16);
+lean::dec(x_16);
+lean::dec(x_14);
+x_20 = l_lean_parser_tokens___rarg(x_17);
+lean::dec(x_17);
+x_22 = l_lean_parser_list_cons_tokens___rarg(x_20, x_4);
 lean::dec(x_20);
-lean::dec(x_10);
-x_25 = l_lean_parser_tokens___rarg(x_22);
+x_24 = l_lean_parser_list_cons_tokens___rarg(x_11, x_22);
 lean::dec(x_22);
-return x_25;
+lean::dec(x_11);
+x_27 = l_lean_parser_tokens___rarg(x_24);
+lean::dec(x_24);
+return x_27;
 }
 }
 obj* l_reader__t_orelse___at_lean_parser_command_universe_parser___spec__2___rarg(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5) {
@@ -11326,58 +11364,60 @@ return x_18;
 obj* _init_l_lean_parser_command_universe_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; 
 x_0 = lean::mk_string("universes");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-lean::inc(x_6);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_8, 0, x_6);
-x_9 = lean::box(0);
-x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_8);
-lean::cnstr_set(x_10, 1, x_9);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+lean::inc(x_7);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_9, 0, x_7);
+x_10 = lean::box(0);
 x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_5);
+lean::cnstr_set(x_11, 0, x_9);
 lean::cnstr_set(x_11, 1, x_10);
-x_12 = l_lean_parser_command_universes;
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_13, 0, x_12);
-lean::closure_set(x_13, 1, x_11);
-x_14 = lean::mk_string("universe");
-x_15 = l_string_trim(x_14);
-lean::inc(x_15);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_17, 0, x_15);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_18, 0, x_15);
-lean::closure_set(x_18, 1, x_4);
-lean::closure_set(x_18, 2, x_17);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_6);
-lean::cnstr_set(x_19, 1, x_9);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_18);
-lean::cnstr_set(x_20, 1, x_19);
-x_21 = l_lean_parser_command_universe;
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_22, 0, x_21);
-lean::closure_set(x_22, 1, x_20);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_22);
-lean::cnstr_set(x_23, 1, x_9);
-x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_13);
-lean::cnstr_set(x_24, 1, x_23);
-return x_24;
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_6);
+lean::cnstr_set(x_12, 1, x_11);
+x_13 = l_lean_parser_command_universes;
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_14, 0, x_13);
+lean::closure_set(x_14, 1, x_12);
+x_15 = lean::mk_string("universe");
+x_16 = l_string_trim(x_15);
+lean::dec(x_15);
+lean::inc(x_16);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_19, 0, x_16);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_20, 0, x_16);
+lean::closure_set(x_20, 1, x_5);
+lean::closure_set(x_20, 2, x_19);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_7);
+lean::cnstr_set(x_21, 1, x_10);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_20);
+lean::cnstr_set(x_22, 1, x_21);
+x_23 = l_lean_parser_command_universe;
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_24, 0, x_23);
+lean::closure_set(x_24, 1, x_22);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_24);
+lean::cnstr_set(x_25, 1, x_10);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_14);
+lean::cnstr_set(x_26, 1, x_25);
+return x_26;
 }
 }
 obj* l_lean_parser_command_universe_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -11661,85 +11701,88 @@ return x_0;
 obj* _init_l_lean_parser_command_check_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_12; 
 x_0 = lean::mk_string("#check");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
-lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
+lean::dec(x_0);
+x_4 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = lean::box(0);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_5, x_6);
+lean::dec(x_5);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_2, x_7);
+lean::dec(x_7);
 lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
-lean::dec(x_8);
-return x_11;
+x_12 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+return x_12;
 }
 }
 obj* _init_l_lean_parser_command_check_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; 
 x_0 = lean::mk_string("#check");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-x_11 = l_lean_parser_command__parser__m_monad___closed__1;
-x_12 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_13 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_14 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_15 = l_lean_parser_command_check;
-x_16 = l_lean_parser_command_check_has__view;
-x_17 = l_lean_parser_combinators_node_view___rarg(x_11, x_12, x_13, x_14, x_15, x_10, x_16);
-lean::dec(x_10);
-return x_17;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+x_12 = l_lean_parser_command__parser__m_monad___closed__1;
+x_13 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_14 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_15 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_16 = l_lean_parser_command_check;
+x_17 = l_lean_parser_command_check_has__view;
+x_18 = l_lean_parser_combinators_node_view___rarg(x_12, x_13, x_14, x_15, x_16, x_11, x_17);
+lean::dec(x_11);
+return x_18;
 }
 }
 obj* _init_l_lean_parser_command_check_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string("#check");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-return x_10;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_command_check_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -13279,237 +13322,252 @@ return x_0;
 obj* _init_l_lean_parser_command_attribute_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_29; obj* x_32; obj* x_35; obj* x_38; obj* x_41; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_12; obj* x_15; obj* x_17; obj* x_19; obj* x_20; obj* x_22; obj* x_23; obj* x_25; obj* x_26; obj* x_28; obj* x_29; obj* x_31; obj* x_32; obj* x_34; obj* x_37; obj* x_40; obj* x_43; obj* x_46; 
 x_0 = lean::mk_string("local ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_tokens___rarg(x_2);
+lean::dec(x_0);
+x_4 = l_lean_parser_tokens___rarg(x_2);
 lean::dec(x_2);
-x_5 = lean::mk_string("attribute ");
-x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_1);
-x_7 = lean::box(0);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_6, x_7);
+x_6 = lean::mk_string("attribute ");
+x_7 = l_lean_parser_symbol_tokens___rarg(x_6, x_1);
 lean::dec(x_6);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_3, x_8);
-lean::dec(x_8);
-lean::dec(x_3);
-x_13 = l_lean_parser_tokens___rarg(x_10);
+x_9 = lean::box(0);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_7, x_9);
+lean::dec(x_7);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_4, x_10);
 lean::dec(x_10);
-x_15 = l_lean_parser_tokens___rarg(x_13);
-lean::dec(x_13);
-x_17 = lean::mk_string("[");
-x_18 = l_lean_parser_symbol_tokens___rarg(x_17, x_1);
-x_19 = lean::mk_string(", ");
-x_20 = l_lean_parser_symbol_tokens___rarg(x_19, x_1);
-x_21 = l_lean_parser_command_attr__instance_parser_lean_parser_has__tokens;
-x_22 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_21, x_20);
-lean::dec(x_20);
-x_24 = lean::mk_string("] ");
-x_25 = l_lean_parser_symbol_tokens___rarg(x_24, x_1);
-x_26 = l_lean_parser_tokens___rarg(x_7);
-x_27 = l_lean_parser_list_cons_tokens___rarg(x_26, x_7);
-lean::dec(x_26);
-x_29 = l_lean_parser_list_cons_tokens___rarg(x_25, x_27);
-lean::dec(x_27);
-lean::dec(x_25);
-x_32 = l_lean_parser_list_cons_tokens___rarg(x_22, x_29);
-lean::dec(x_29);
-lean::dec(x_22);
-x_35 = l_lean_parser_list_cons_tokens___rarg(x_18, x_32);
-lean::dec(x_32);
-lean::dec(x_18);
-x_38 = l_lean_parser_list_cons_tokens___rarg(x_15, x_35);
-lean::dec(x_35);
+lean::dec(x_4);
+x_15 = l_lean_parser_tokens___rarg(x_12);
+lean::dec(x_12);
+x_17 = l_lean_parser_tokens___rarg(x_15);
 lean::dec(x_15);
-x_41 = l_lean_parser_tokens___rarg(x_38);
-lean::dec(x_38);
-return x_41;
+x_19 = lean::mk_string("[");
+x_20 = l_lean_parser_symbol_tokens___rarg(x_19, x_1);
+lean::dec(x_19);
+x_22 = lean::mk_string(", ");
+x_23 = l_lean_parser_symbol_tokens___rarg(x_22, x_1);
+lean::dec(x_22);
+x_25 = l_lean_parser_command_attr__instance_parser_lean_parser_has__tokens;
+x_26 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_25, x_23);
+lean::dec(x_23);
+x_28 = lean::mk_string("] ");
+x_29 = l_lean_parser_symbol_tokens___rarg(x_28, x_1);
+lean::dec(x_28);
+x_31 = l_lean_parser_tokens___rarg(x_9);
+x_32 = l_lean_parser_list_cons_tokens___rarg(x_31, x_9);
+lean::dec(x_31);
+x_34 = l_lean_parser_list_cons_tokens___rarg(x_29, x_32);
+lean::dec(x_32);
+lean::dec(x_29);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_26, x_34);
+lean::dec(x_34);
+lean::dec(x_26);
+x_40 = l_lean_parser_list_cons_tokens___rarg(x_20, x_37);
+lean::dec(x_37);
+lean::dec(x_20);
+x_43 = l_lean_parser_list_cons_tokens___rarg(x_17, x_40);
+lean::dec(x_40);
+lean::dec(x_17);
+x_46 = l_lean_parser_tokens___rarg(x_43);
+lean::dec(x_43);
+return x_46;
 }
 }
 obj* _init_l_lean_parser_command_attribute_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_25; obj* x_26; uint8 x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_28; obj* x_29; obj* x_30; uint8 x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; 
 x_0 = lean::mk_string("local ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_6, 0, x_5);
-x_7 = lean::mk_string("attribute ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::box(0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_11);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_6);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
-lean::closure_set(x_15, 0, x_14);
-x_16 = lean::mk_string("[");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_4);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::mk_string(", ");
-x_22 = l_string_trim(x_21);
-lean::inc(x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_24, 0, x_22);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_25, 0, x_22);
-lean::closure_set(x_25, 1, x_4);
-lean::closure_set(x_25, 2, x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_attr__instance_parser), 4, 0);
-x_27 = 1;
-x_28 = lean::box(x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_29, 0, x_26);
-lean::closure_set(x_29, 1, x_25);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_7, 0, x_6);
+x_8 = lean::mk_string("attribute ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::box(0);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_13);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_16, 0, x_7);
+lean::cnstr_set(x_16, 1, x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_17, 0, x_16);
+x_18 = lean::mk_string("[");
+x_19 = l_string_trim(x_18);
+lean::dec(x_18);
+lean::inc(x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_22, 0, x_19);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_23, 0, x_19);
+lean::closure_set(x_23, 1, x_5);
+lean::closure_set(x_23, 2, x_22);
+x_24 = lean::mk_string(", ");
+x_25 = l_string_trim(x_24);
+lean::dec(x_24);
+lean::inc(x_25);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_28, 0, x_25);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_29, 0, x_25);
+lean::closure_set(x_29, 1, x_5);
 lean::closure_set(x_29, 2, x_28);
-x_30 = lean::mk_string("] ");
-x_31 = l_string_trim(x_30);
-lean::inc(x_31);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_33, 0, x_31);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_34, 0, x_31);
-lean::closure_set(x_34, 1, x_4);
-lean::closure_set(x_34, 2, x_33);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
-lean::closure_set(x_36, 0, x_35);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_36);
-lean::cnstr_set(x_37, 1, x_12);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_34);
-lean::cnstr_set(x_38, 1, x_37);
-x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_29);
-lean::cnstr_set(x_39, 1, x_38);
-x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_20);
-lean::cnstr_set(x_40, 1, x_39);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_15);
-lean::cnstr_set(x_41, 1, x_40);
-x_42 = l_lean_parser_command__parser__m_monad___closed__1;
-x_43 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_44 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_45 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_46 = l_lean_parser_command_attribute;
-x_47 = l_lean_parser_command_attribute_has__view;
-x_48 = l_lean_parser_combinators_node_view___rarg(x_42, x_43, x_44, x_45, x_46, x_41, x_47);
-lean::dec(x_41);
-return x_48;
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_attr__instance_parser), 4, 0);
+x_31 = 1;
+x_32 = lean::box(x_31);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_33, 0, x_30);
+lean::closure_set(x_33, 1, x_29);
+lean::closure_set(x_33, 2, x_32);
+x_34 = lean::mk_string("] ");
+x_35 = l_string_trim(x_34);
+lean::dec(x_34);
+lean::inc(x_35);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_38, 0, x_35);
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_39, 0, x_35);
+lean::closure_set(x_39, 1, x_5);
+lean::closure_set(x_39, 2, x_38);
+x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
+lean::closure_set(x_41, 0, x_40);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_41);
+lean::cnstr_set(x_42, 1, x_14);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_39);
+lean::cnstr_set(x_43, 1, x_42);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_33);
+lean::cnstr_set(x_44, 1, x_43);
+x_45 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_45, 0, x_23);
+lean::cnstr_set(x_45, 1, x_44);
+x_46 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_46, 0, x_17);
+lean::cnstr_set(x_46, 1, x_45);
+x_47 = l_lean_parser_command__parser__m_monad___closed__1;
+x_48 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_49 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_50 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_51 = l_lean_parser_command_attribute;
+x_52 = l_lean_parser_command_attribute_has__view;
+x_53 = l_lean_parser_combinators_node_view___rarg(x_47, x_48, x_49, x_50, x_51, x_46, x_52);
+lean::dec(x_46);
+return x_53;
 }
 }
 obj* _init_l_lean_parser_command_attribute_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_25; obj* x_26; uint8 x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_28; obj* x_29; obj* x_30; uint8 x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; 
 x_0 = lean::mk_string("local ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_6, 0, x_5);
-x_7 = lean::mk_string("attribute ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::box(0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_11);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_6);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
-lean::closure_set(x_15, 0, x_14);
-x_16 = lean::mk_string("[");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_4);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::mk_string(", ");
-x_22 = l_string_trim(x_21);
-lean::inc(x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_24, 0, x_22);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_25, 0, x_22);
-lean::closure_set(x_25, 1, x_4);
-lean::closure_set(x_25, 2, x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_attr__instance_parser), 4, 0);
-x_27 = 1;
-x_28 = lean::box(x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_29, 0, x_26);
-lean::closure_set(x_29, 1, x_25);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_7, 0, x_6);
+x_8 = lean::mk_string("attribute ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::box(0);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_13);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_16, 0, x_7);
+lean::cnstr_set(x_16, 1, x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_17, 0, x_16);
+x_18 = lean::mk_string("[");
+x_19 = l_string_trim(x_18);
+lean::dec(x_18);
+lean::inc(x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_22, 0, x_19);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_23, 0, x_19);
+lean::closure_set(x_23, 1, x_5);
+lean::closure_set(x_23, 2, x_22);
+x_24 = lean::mk_string(", ");
+x_25 = l_string_trim(x_24);
+lean::dec(x_24);
+lean::inc(x_25);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_28, 0, x_25);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_29, 0, x_25);
+lean::closure_set(x_29, 1, x_5);
 lean::closure_set(x_29, 2, x_28);
-x_30 = lean::mk_string("] ");
-x_31 = l_string_trim(x_30);
-lean::inc(x_31);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_33, 0, x_31);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_34, 0, x_31);
-lean::closure_set(x_34, 1, x_4);
-lean::closure_set(x_34, 2, x_33);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
-lean::closure_set(x_36, 0, x_35);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_36);
-lean::cnstr_set(x_37, 1, x_12);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_34);
-lean::cnstr_set(x_38, 1, x_37);
-x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_29);
-lean::cnstr_set(x_39, 1, x_38);
-x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_20);
-lean::cnstr_set(x_40, 1, x_39);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_15);
-lean::cnstr_set(x_41, 1, x_40);
-return x_41;
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_attr__instance_parser), 4, 0);
+x_31 = 1;
+x_32 = lean::box(x_31);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_33, 0, x_30);
+lean::closure_set(x_33, 1, x_29);
+lean::closure_set(x_33, 2, x_32);
+x_34 = lean::mk_string("] ");
+x_35 = l_string_trim(x_34);
+lean::dec(x_34);
+lean::inc(x_35);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_38, 0, x_35);
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_39, 0, x_35);
+lean::closure_set(x_39, 1, x_5);
+lean::closure_set(x_39, 2, x_38);
+x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
+lean::closure_set(x_41, 0, x_40);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_41);
+lean::cnstr_set(x_42, 1, x_14);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_39);
+lean::cnstr_set(x_43, 1, x_42);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_33);
+lean::cnstr_set(x_44, 1, x_43);
+x_45 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_45, 0, x_23);
+lean::cnstr_set(x_45, 1, x_44);
+x_46 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_46, 0, x_17);
+lean::cnstr_set(x_46, 1, x_45);
+return x_46;
 }
 }
 obj* l_lean_parser_command_attribute_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -13618,66 +13676,69 @@ return x_0;
 obj* _init_l_lean_parser_command_init__quot_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_6; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; 
 x_0 = lean::mk_string("init_quot");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_2, x_3);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_2, x_4);
 lean::dec(x_2);
-x_6 = l_lean_parser_tokens___rarg(x_4);
-lean::dec(x_4);
-return x_6;
+x_7 = l_lean_parser_tokens___rarg(x_5);
+lean::dec(x_5);
+return x_7;
 }
 }
 obj* _init_l_lean_parser_command_init__quot_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; 
 x_0 = lean::mk_string("init_quot");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-x_8 = l_lean_parser_command__parser__m_monad___closed__1;
-x_9 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_10 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_11 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_12 = l_lean_parser_command_init__quot;
-x_13 = l_lean_parser_command_init__quot_has__view;
-x_14 = l_lean_parser_combinators_node_view___rarg(x_8, x_9, x_10, x_11, x_12, x_7, x_13);
-lean::dec(x_7);
-return x_14;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+x_9 = l_lean_parser_command__parser__m_monad___closed__1;
+x_10 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_11 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_12 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_13 = l_lean_parser_command_init__quot;
+x_14 = l_lean_parser_command_init__quot_has__view;
+x_15 = l_lean_parser_combinators_node_view___rarg(x_9, x_10, x_11, x_12, x_13, x_8, x_14);
+lean::dec(x_8);
+return x_15;
 }
 }
 obj* _init_l_lean_parser_command_init__quot_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; 
 x_0 = lean::mk_string("init_quot");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-return x_7;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+return x_8;
 }
 }
 obj* l_lean_parser_command_init__quot_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -15472,38 +15533,39 @@ return x_75;
 obj* _init_l_lean_parser_command_set__option_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_12; obj* x_15; obj* x_17; obj* x_19; obj* x_21; obj* x_23; obj* x_25; obj* x_28; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_11; obj* x_13; obj* x_16; obj* x_18; obj* x_20; obj* x_22; obj* x_24; obj* x_26; obj* x_29; 
 x_0 = lean::mk_string("set_option");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_3, x_3);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_3, x_4);
-lean::dec(x_4);
-x_7 = l_lean_parser_tokens___rarg(x_5);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_3);
-lean::dec(x_7);
-x_10 = l_lean_parser_tokens___rarg(x_8);
-lean::dec(x_8);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_10, x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_4);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
 lean::dec(x_5);
-lean::dec(x_10);
-x_15 = l_lean_parser_tokens___rarg(x_12);
-lean::dec(x_12);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_15, x_3);
-lean::dec(x_15);
-x_19 = l_lean_parser_tokens___rarg(x_17);
-lean::dec(x_17);
-x_21 = l_lean_parser_list_cons_tokens___rarg(x_19, x_3);
-lean::dec(x_19);
-x_23 = l_lean_parser_list_cons_tokens___rarg(x_3, x_21);
-lean::dec(x_21);
-x_25 = l_lean_parser_list_cons_tokens___rarg(x_2, x_23);
-lean::dec(x_23);
+x_8 = l_lean_parser_tokens___rarg(x_6);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_8, x_4);
+lean::dec(x_8);
+x_11 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+x_13 = l_lean_parser_list_cons_tokens___rarg(x_11, x_6);
+lean::dec(x_6);
+lean::dec(x_11);
+x_16 = l_lean_parser_tokens___rarg(x_13);
+lean::dec(x_13);
+x_18 = l_lean_parser_list_cons_tokens___rarg(x_16, x_4);
+lean::dec(x_16);
+x_20 = l_lean_parser_tokens___rarg(x_18);
+lean::dec(x_18);
+x_22 = l_lean_parser_list_cons_tokens___rarg(x_20, x_4);
+lean::dec(x_20);
+x_24 = l_lean_parser_list_cons_tokens___rarg(x_4, x_22);
+lean::dec(x_22);
+x_26 = l_lean_parser_list_cons_tokens___rarg(x_2, x_24);
+lean::dec(x_24);
 lean::dec(x_2);
-x_28 = l_lean_parser_tokens___rarg(x_25);
-lean::dec(x_25);
-return x_28;
+x_29 = l_lean_parser_tokens___rarg(x_26);
+lean::dec(x_26);
+return x_29;
 }
 }
 obj* l_lean_parser_symbol__or__ident___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__1___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -15536,147 +15598,149 @@ return x_4;
 obj* _init_l_lean_parser_command_set__option_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; 
 x_0 = lean::mk_string("set_option");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("true");
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__1___boxed), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-lean::inc(x_7);
-x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_7);
-lean::cnstr_set(x_10, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("true");
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__1___boxed), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
+lean::inc(x_8);
 x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_7);
-lean::cnstr_set(x_11, 1, x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_12, 0, x_11);
-lean::closure_set(x_12, 1, x_4);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_12);
-lean::cnstr_set(x_13, 1, x_8);
-x_14 = l_lean_parser_command_bool__option__value;
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_15, 0, x_14);
-lean::closure_set(x_15, 1, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__3___boxed), 4, 0);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_16);
-lean::cnstr_set(x_17, 1, x_8);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_string__lit_parser___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__2___boxed), 4, 0);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_18);
-lean::cnstr_set(x_19, 1, x_17);
+lean::cnstr_set(x_11, 0, x_8);
+lean::cnstr_set(x_11, 1, x_9);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_8);
+lean::cnstr_set(x_12, 1, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_13, 0, x_12);
+lean::closure_set(x_13, 1, x_5);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_13);
+lean::cnstr_set(x_14, 1, x_9);
+x_15 = l_lean_parser_command_bool__option__value;
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_16, 0, x_15);
+lean::closure_set(x_16, 1, x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__3___boxed), 4, 0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_9);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_string__lit_parser___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__2___boxed), 4, 0);
 x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_15);
-lean::cnstr_set(x_20, 1, x_19);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_21, 0, x_20);
-lean::closure_set(x_21, 1, x_4);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_8);
-x_23 = l_lean_parser_command_option__value;
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_24, 0, x_23);
-lean::closure_set(x_24, 1, x_22);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_8);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_26);
-lean::cnstr_set(x_27, 1, x_25);
+lean::cnstr_set(x_20, 0, x_19);
+lean::cnstr_set(x_20, 1, x_18);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_16);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_22, 0, x_21);
+lean::closure_set(x_22, 1, x_5);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_9);
+x_24 = l_lean_parser_command_option__value;
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_23);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_25);
+lean::cnstr_set(x_26, 1, x_9);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
 x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_5);
-lean::cnstr_set(x_28, 1, x_27);
-x_29 = l_lean_parser_command__parser__m_monad___closed__1;
-x_30 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_31 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_32 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_33 = l_lean_parser_command_set__option;
-x_34 = l_lean_parser_command_set__option_has__view;
-x_35 = l_lean_parser_combinators_node_view___rarg(x_29, x_30, x_31, x_32, x_33, x_28, x_34);
-lean::dec(x_28);
-return x_35;
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_26);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_6);
+lean::cnstr_set(x_29, 1, x_28);
+x_30 = l_lean_parser_command__parser__m_monad___closed__1;
+x_31 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_32 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_33 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_34 = l_lean_parser_command_set__option;
+x_35 = l_lean_parser_command_set__option_has__view;
+x_36 = l_lean_parser_combinators_node_view___rarg(x_30, x_31, x_32, x_33, x_34, x_29, x_35);
+lean::dec(x_29);
+return x_36;
 }
 }
 obj* _init_l_lean_parser_command_set__option_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; 
 x_0 = lean::mk_string("set_option");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("true");
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__1___boxed), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-lean::inc(x_7);
-x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_7);
-lean::cnstr_set(x_10, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("true");
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__1___boxed), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
+lean::inc(x_8);
 x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_7);
-lean::cnstr_set(x_11, 1, x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_12, 0, x_11);
-lean::closure_set(x_12, 1, x_4);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_12);
-lean::cnstr_set(x_13, 1, x_8);
-x_14 = l_lean_parser_command_bool__option__value;
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_15, 0, x_14);
-lean::closure_set(x_15, 1, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__3___boxed), 4, 0);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_16);
-lean::cnstr_set(x_17, 1, x_8);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_string__lit_parser___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__2___boxed), 4, 0);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_18);
-lean::cnstr_set(x_19, 1, x_17);
+lean::cnstr_set(x_11, 0, x_8);
+lean::cnstr_set(x_11, 1, x_9);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_8);
+lean::cnstr_set(x_12, 1, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_13, 0, x_12);
+lean::closure_set(x_13, 1, x_5);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_13);
+lean::cnstr_set(x_14, 1, x_9);
+x_15 = l_lean_parser_command_bool__option__value;
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_16, 0, x_15);
+lean::closure_set(x_16, 1, x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__3___boxed), 4, 0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_9);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_string__lit_parser___at_lean_parser_command_set__option_parser_lean_parser_has__tokens___spec__2___boxed), 4, 0);
 x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_15);
-lean::cnstr_set(x_20, 1, x_19);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_21, 0, x_20);
-lean::closure_set(x_21, 1, x_4);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_8);
-x_23 = l_lean_parser_command_option__value;
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_24, 0, x_23);
-lean::closure_set(x_24, 1, x_22);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_8);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_26);
-lean::cnstr_set(x_27, 1, x_25);
+lean::cnstr_set(x_20, 0, x_19);
+lean::cnstr_set(x_20, 1, x_18);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_16);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_22, 0, x_21);
+lean::closure_set(x_22, 1, x_5);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_9);
+x_24 = l_lean_parser_command_option__value;
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_23);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_25);
+lean::cnstr_set(x_26, 1, x_9);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
 x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_5);
-lean::cnstr_set(x_28, 1, x_27);
-return x_28;
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_26);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_6);
+lean::cnstr_set(x_29, 1, x_28);
+return x_29;
 }
 }
 obj* l_lean_parser_command_set__option_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
diff --git a/src/boot/init/lean/parser/declaration.cpp b/src/boot/init/lean/parser/declaration.cpp
index d8849b97a6..b4da629714 100644
--- a/src/boot/init/lean/parser/declaration.cpp
+++ b/src/boot/init/lean/parser/declaration.cpp
@@ -3611,23 +3611,25 @@ return x_2;
 obj* _init_l_lean_parser_command_doc__comment_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_10; obj* x_13; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_10; obj* x_12; obj* x_15; 
 x_0 = lean::mk_string("/--");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = lean::mk_string("-/");
-x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_3);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = lean::mk_string("-/");
+x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_1);
 lean::dec(x_5);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_3, x_6);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_6, x_4);
 lean::dec(x_6);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_2, x_8);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_4, x_8);
 lean::dec(x_8);
-lean::dec(x_2);
-x_13 = l_lean_parser_tokens___rarg(x_10);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_2, x_10);
 lean::dec(x_10);
-return x_13;
+lean::dec(x_2);
+x_15 = l_lean_parser_tokens___rarg(x_12);
+lean::dec(x_12);
+return x_15;
 }
 }
 obj* l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6) {
@@ -4780,61 +4782,63 @@ return x_34;
 obj* _init_l_lean_parser_command_doc__comment_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; 
 x_0 = lean::mk_string("/--");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("-/");
-lean::inc(x_6);
-x_8 = l_string_quote(x_6);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_with__trailing___rarg___lambda__1), 2, 0);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_lift___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__1___rarg___boxed), 4, 1);
-lean::closure_set(x_12, 0, x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_lift___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__8___rarg___boxed), 5, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("-/");
+lean::inc(x_7);
+x_9 = l_string_quote(x_7);
+lean::inc(x_9);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_with__trailing___rarg___lambda__1), 2, 0);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_lift___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__1___rarg___boxed), 4, 1);
 lean::closure_set(x_13, 0, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_doc__comment_parser_lean_parser_has__view___lambda__1___boxed), 7, 2);
-lean::closure_set(x_14, 0, x_8);
-lean::closure_set(x_14, 1, x_10);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_bind___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__11___rarg), 6, 2);
-lean::closure_set(x_15, 0, x_13);
-lean::closure_set(x_15, 1, x_14);
-x_16 = l_string_trim(x_6);
-lean::inc(x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_18, 0, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_19, 0, x_16);
-lean::closure_set(x_19, 1, x_4);
-lean::closure_set(x_19, 2, x_18);
-x_20 = lean::box(0);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_19);
-lean::cnstr_set(x_21, 1, x_20);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_15);
-lean::cnstr_set(x_22, 1, x_21);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_lift___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__8___rarg___boxed), 5, 1);
+lean::closure_set(x_14, 0, x_13);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_doc__comment_parser_lean_parser_has__view___lambda__1___boxed), 7, 2);
+lean::closure_set(x_15, 0, x_9);
+lean::closure_set(x_15, 1, x_11);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_bind___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__11___rarg), 6, 2);
+lean::closure_set(x_16, 0, x_14);
+lean::closure_set(x_16, 1, x_15);
+x_17 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_17);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_20, 0, x_17);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_21, 0, x_17);
+lean::closure_set(x_21, 1, x_5);
+lean::closure_set(x_21, 2, x_20);
+x_22 = lean::box(0);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_5);
+lean::cnstr_set(x_23, 0, x_21);
 lean::cnstr_set(x_23, 1, x_22);
-x_24 = l_lean_parser_command__parser__m_monad___closed__1;
-x_25 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_26 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_27 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_28 = l_lean_parser_command_doc__comment;
-x_29 = l_lean_parser_command_doc__comment_has__view;
-x_30 = l_lean_parser_combinators_node_view___rarg(x_24, x_25, x_26, x_27, x_28, x_23, x_29);
-lean::dec(x_23);
-return x_30;
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_16);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_6);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = l_lean_parser_command__parser__m_monad___closed__1;
+x_27 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_28 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_29 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_30 = l_lean_parser_command_doc__comment;
+x_31 = l_lean_parser_command_doc__comment_has__view;
+x_32 = l_lean_parser_combinators_node_view___rarg(x_26, x_27, x_28, x_29, x_30, x_25, x_31);
+lean::dec(x_25);
+return x_32;
 }
 }
 obj* l_lean_parser_parsec__t_lookahead___at_lean_parser_command_doc__comment_parser_lean_parser_has__view___spec__1___rarg___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -6057,53 +6061,55 @@ return x_34;
 obj* _init_l_lean_parser_command_doc__comment_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; 
 x_0 = lean::mk_string("/--");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("-/");
-lean::inc(x_6);
-x_8 = l_string_quote(x_6);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_with__trailing___rarg___lambda__1), 2, 0);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_lift___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__1___rarg___boxed), 4, 1);
-lean::closure_set(x_12, 0, x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_lift___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__8___rarg___boxed), 5, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("-/");
+lean::inc(x_7);
+x_9 = l_string_quote(x_7);
+lean::inc(x_9);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_with__trailing___rarg___lambda__1), 2, 0);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_lift___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__1___rarg___boxed), 4, 1);
 lean::closure_set(x_13, 0, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_doc__comment_parser___lambda__1___boxed), 7, 2);
-lean::closure_set(x_14, 0, x_8);
-lean::closure_set(x_14, 1, x_10);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_bind___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__11___rarg), 6, 2);
-lean::closure_set(x_15, 0, x_13);
-lean::closure_set(x_15, 1, x_14);
-x_16 = l_string_trim(x_6);
-lean::inc(x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_18, 0, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_19, 0, x_16);
-lean::closure_set(x_19, 1, x_4);
-lean::closure_set(x_19, 2, x_18);
-x_20 = lean::box(0);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_19);
-lean::cnstr_set(x_21, 1, x_20);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_15);
-lean::cnstr_set(x_22, 1, x_21);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_lift___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__8___rarg___boxed), 5, 1);
+lean::closure_set(x_14, 0, x_13);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_doc__comment_parser___lambda__1___boxed), 7, 2);
+lean::closure_set(x_15, 0, x_9);
+lean::closure_set(x_15, 1, x_11);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_reader__t_bind___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__11___rarg), 6, 2);
+lean::closure_set(x_16, 0, x_14);
+lean::closure_set(x_16, 1, x_15);
+x_17 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_17);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_20, 0, x_17);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_21, 0, x_17);
+lean::closure_set(x_21, 1, x_5);
+lean::closure_set(x_21, 2, x_20);
+x_22 = lean::box(0);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_5);
+lean::cnstr_set(x_23, 0, x_21);
 lean::cnstr_set(x_23, 1, x_22);
-return x_23;
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_16);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_6);
+lean::cnstr_set(x_25, 1, x_24);
+return x_25;
 }
 }
 obj* l_lean_parser_command_doc__comment_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -9167,29 +9173,32 @@ return x_22;
 obj* _init_l_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_13; obj* x_16; obj* x_19; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_16; obj* x_19; obj* x_22; 
 x_0 = lean::mk_string("@[");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(",");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = l_lean_parser_command_attr__instance_parser_lean_parser_has__tokens;
-x_6 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_5, x_4);
+lean::dec(x_0);
+x_4 = lean::mk_string(",");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_8 = lean::mk_string("]");
-x_9 = l_lean_parser_symbol_tokens___rarg(x_8, x_1);
-x_10 = lean::box(0);
-x_11 = l_lean_parser_list_cons_tokens___rarg(x_9, x_10);
-lean::dec(x_9);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_6, x_11);
+x_7 = l_lean_parser_command_attr__instance_parser_lean_parser_has__tokens;
+x_8 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_7, x_5);
+lean::dec(x_5);
+x_10 = lean::mk_string("]");
+x_11 = l_lean_parser_symbol_tokens___rarg(x_10, x_1);
+lean::dec(x_10);
+x_13 = lean::box(0);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_11, x_13);
 lean::dec(x_11);
-lean::dec(x_6);
-x_16 = l_lean_parser_list_cons_tokens___rarg(x_2, x_13);
-lean::dec(x_13);
-lean::dec(x_2);
-x_19 = l_lean_parser_tokens___rarg(x_16);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_8, x_14);
+lean::dec(x_14);
+lean::dec(x_8);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_2, x_16);
 lean::dec(x_16);
-return x_19;
+lean::dec(x_2);
+x_22 = l_lean_parser_tokens___rarg(x_19);
+lean::dec(x_19);
+return x_22;
 }
 }
 obj* l___private_init_lean_parser_combinators_2__sep__by__aux___main___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__2___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6, obj* x_7, obj* x_8, obj* x_9) {
@@ -9215,113 +9224,119 @@ return x_8;
 obj* _init_l_lean_parser_command_decl__attributes_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; uint8 x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; uint8 x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; 
 x_0 = lean::mk_string("@[");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(",");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_attr__instance_parser), 4, 0);
-x_12 = 1;
-x_13 = lean::box(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_14, 0, x_11);
-lean::closure_set(x_14, 1, x_10);
-lean::closure_set(x_14, 2, x_13);
-x_15 = lean::mk_string("]");
-x_16 = l_string_trim(x_15);
-lean::inc(x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_18, 0, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_19, 0, x_16);
-lean::closure_set(x_19, 1, x_4);
-lean::closure_set(x_19, 2, x_18);
-x_20 = lean::box(0);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_19);
-lean::cnstr_set(x_21, 1, x_20);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_14);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_5);
-lean::cnstr_set(x_23, 1, x_22);
-x_24 = l_lean_parser_command__parser__m_monad___closed__1;
-x_25 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_26 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_27 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_28 = l_lean_parser_command_decl__attributes;
-x_29 = l_lean_parser_command_decl__attributes_has__view;
-x_30 = l_lean_parser_combinators_node_view___rarg(x_24, x_25, x_26, x_27, x_28, x_23, x_29);
-lean::dec(x_23);
-return x_30;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(",");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_attr__instance_parser), 4, 0);
+x_14 = 1;
+x_15 = lean::box(x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_16, 0, x_13);
+lean::closure_set(x_16, 1, x_12);
+lean::closure_set(x_16, 2, x_15);
+x_17 = lean::mk_string("]");
+x_18 = l_string_trim(x_17);
+lean::dec(x_17);
+lean::inc(x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_21, 0, x_18);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_22, 0, x_18);
+lean::closure_set(x_22, 1, x_5);
+lean::closure_set(x_22, 2, x_21);
+x_23 = lean::box(0);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_22);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_16);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_6);
+lean::cnstr_set(x_26, 1, x_25);
+x_27 = l_lean_parser_command__parser__m_monad___closed__1;
+x_28 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_29 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_30 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_31 = l_lean_parser_command_decl__attributes;
+x_32 = l_lean_parser_command_decl__attributes_has__view;
+x_33 = l_lean_parser_combinators_node_view___rarg(x_27, x_28, x_29, x_30, x_31, x_26, x_32);
+lean::dec(x_26);
+return x_33;
 }
 }
 obj* _init_l_lean_parser_command_decl__attributes_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; uint8 x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; uint8 x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; 
 x_0 = lean::mk_string("@[");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(",");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_attr__instance_parser), 4, 0);
-x_12 = 1;
-x_13 = lean::box(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_14, 0, x_11);
-lean::closure_set(x_14, 1, x_10);
-lean::closure_set(x_14, 2, x_13);
-x_15 = lean::mk_string("]");
-x_16 = l_string_trim(x_15);
-lean::inc(x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_18, 0, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_19, 0, x_16);
-lean::closure_set(x_19, 1, x_4);
-lean::closure_set(x_19, 2, x_18);
-x_20 = lean::box(0);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_19);
-lean::cnstr_set(x_21, 1, x_20);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_14);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_5);
-lean::cnstr_set(x_23, 1, x_22);
-return x_23;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(",");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_attr__instance_parser), 4, 0);
+x_14 = 1;
+x_15 = lean::box(x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_16, 0, x_13);
+lean::closure_set(x_16, 1, x_12);
+lean::closure_set(x_16, 2, x_15);
+x_17 = lean::mk_string("]");
+x_18 = l_string_trim(x_17);
+lean::dec(x_17);
+lean::inc(x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_21, 0, x_18);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_22, 0, x_18);
+lean::closure_set(x_22, 1, x_5);
+lean::closure_set(x_22, 2, x_21);
+x_23 = lean::box(0);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_22);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_16);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_6);
+lean::cnstr_set(x_26, 1, x_25);
+return x_26;
 }
 }
 obj* l_lean_parser_command_decl__attributes_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -11912,7 +11927,7 @@ return x_95;
 obj* _init_l_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_15; obj* x_17; obj* x_19; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_27; obj* x_28; obj* x_29; obj* x_31; obj* x_33; obj* x_36; obj* x_39; obj* x_42; obj* x_45; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_14; obj* x_17; obj* x_19; obj* x_21; obj* x_23; obj* x_25; obj* x_26; obj* x_28; obj* x_30; obj* x_31; obj* x_33; obj* x_35; obj* x_37; obj* x_40; obj* x_43; obj* x_46; obj* x_49; 
 x_0 = l_lean_parser_command_doc__comment_parser_lean_parser_has__tokens;
 x_1 = l_lean_parser_tokens___rarg(x_0);
 x_2 = l_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens;
@@ -11920,53 +11935,57 @@ x_3 = l_lean_parser_tokens___rarg(x_2);
 x_4 = lean::mk_string("private");
 x_5 = lean::mk_nat_obj(0u);
 x_6 = l_lean_parser_symbol_tokens___rarg(x_4, x_5);
-x_7 = lean::mk_string("protected");
-x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_5);
-x_9 = lean::box(0);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_8, x_9);
+lean::dec(x_4);
+x_8 = lean::mk_string("protected");
+x_9 = l_lean_parser_symbol_tokens___rarg(x_8, x_5);
 lean::dec(x_8);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_6, x_10);
-lean::dec(x_10);
-lean::dec(x_6);
-x_15 = l_lean_parser_tokens___rarg(x_12);
+x_11 = lean::box(0);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_9, x_11);
+lean::dec(x_9);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_6, x_12);
 lean::dec(x_12);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_15, x_9);
-lean::dec(x_15);
-x_19 = l_lean_parser_tokens___rarg(x_17);
+lean::dec(x_6);
+x_17 = l_lean_parser_tokens___rarg(x_14);
+lean::dec(x_14);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_17, x_11);
 lean::dec(x_17);
 x_21 = l_lean_parser_tokens___rarg(x_19);
 lean::dec(x_19);
-x_23 = lean::mk_string("noncomputable");
-x_24 = l_lean_parser_symbol_tokens___rarg(x_23, x_5);
-x_25 = l_lean_parser_tokens___rarg(x_24);
-lean::dec(x_24);
-x_27 = lean::mk_string("meta");
-x_28 = l_lean_parser_symbol_tokens___rarg(x_27, x_5);
-x_29 = l_lean_parser_tokens___rarg(x_28);
-lean::dec(x_28);
-x_31 = l_lean_parser_list_cons_tokens___rarg(x_29, x_9);
-lean::dec(x_29);
-x_33 = l_lean_parser_list_cons_tokens___rarg(x_25, x_31);
-lean::dec(x_31);
-lean::dec(x_25);
-x_36 = l_lean_parser_list_cons_tokens___rarg(x_21, x_33);
-lean::dec(x_33);
+x_23 = l_lean_parser_tokens___rarg(x_21);
 lean::dec(x_21);
-x_39 = l_lean_parser_list_cons_tokens___rarg(x_3, x_36);
-lean::dec(x_36);
+x_25 = lean::mk_string("noncomputable");
+x_26 = l_lean_parser_symbol_tokens___rarg(x_25, x_5);
+lean::dec(x_25);
+x_28 = l_lean_parser_tokens___rarg(x_26);
+lean::dec(x_26);
+x_30 = lean::mk_string("meta");
+x_31 = l_lean_parser_symbol_tokens___rarg(x_30, x_5);
+lean::dec(x_30);
+x_33 = l_lean_parser_tokens___rarg(x_31);
+lean::dec(x_31);
+x_35 = l_lean_parser_list_cons_tokens___rarg(x_33, x_11);
+lean::dec(x_33);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_28, x_35);
+lean::dec(x_35);
+lean::dec(x_28);
+x_40 = l_lean_parser_list_cons_tokens___rarg(x_23, x_37);
+lean::dec(x_37);
+lean::dec(x_23);
+x_43 = l_lean_parser_list_cons_tokens___rarg(x_3, x_40);
+lean::dec(x_40);
 lean::dec(x_3);
-x_42 = l_lean_parser_list_cons_tokens___rarg(x_1, x_39);
-lean::dec(x_39);
+x_46 = l_lean_parser_list_cons_tokens___rarg(x_1, x_43);
+lean::dec(x_43);
 lean::dec(x_1);
-x_45 = l_lean_parser_tokens___rarg(x_42);
-lean::dec(x_42);
-return x_45;
+x_49 = l_lean_parser_tokens___rarg(x_46);
+lean::dec(x_46);
+return x_49;
 }
 }
 obj* _init_l_lean_parser_command_decl__modifiers_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; 
 x_0 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_doc__comment_parser), 4, 0);
 x_1 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
 lean::closure_set(x_1, 0, x_0);
@@ -11975,94 +11994,98 @@ x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_opti
 lean::closure_set(x_3, 0, x_2);
 x_4 = lean::mk_string("private");
 x_5 = l_string_trim(x_4);
+lean::dec(x_4);
 lean::inc(x_5);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_7, 0, x_5);
-x_8 = lean::mk_nat_obj(0u);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_9, 0, x_5);
-lean::closure_set(x_9, 1, x_8);
-lean::closure_set(x_9, 2, x_7);
-x_10 = lean::mk_string("protected");
-x_11 = l_string_trim(x_10);
-lean::inc(x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_13, 0, x_11);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_14, 0, x_11);
-lean::closure_set(x_14, 1, x_8);
-lean::closure_set(x_14, 2, x_13);
-x_15 = lean::box(0);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_14);
-lean::cnstr_set(x_16, 1, x_15);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_9);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_8);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_8, 0, x_5);
+x_9 = lean::mk_nat_obj(0u);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_10, 0, x_5);
+lean::closure_set(x_10, 1, x_9);
+lean::closure_set(x_10, 2, x_8);
+x_11 = lean::mk_string("protected");
+x_12 = l_string_trim(x_11);
+lean::dec(x_11);
+lean::inc(x_12);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_15, 0, x_12);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_16, 0, x_12);
+lean::closure_set(x_16, 1, x_9);
+lean::closure_set(x_16, 2, x_15);
+x_17 = lean::box(0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_16);
+lean::cnstr_set(x_18, 1, x_17);
 x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_18);
-lean::cnstr_set(x_19, 1, x_15);
-x_20 = l_lean_parser_command_visibility;
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_21, 0, x_20);
-lean::closure_set(x_21, 1, x_19);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_22, 0, x_21);
-x_23 = lean::mk_string("noncomputable");
-x_24 = l_string_trim(x_23);
-lean::inc(x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_26, 0, x_24);
-x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_27, 0, x_24);
-lean::closure_set(x_27, 1, x_8);
-lean::closure_set(x_27, 2, x_26);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_28, 0, x_27);
-x_29 = lean::mk_string("meta");
-x_30 = l_string_trim(x_29);
-lean::inc(x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_32, 0, x_30);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_33, 0, x_30);
-lean::closure_set(x_33, 1, x_8);
-lean::closure_set(x_33, 2, x_32);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_34, 0, x_33);
-x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_34);
-lean::cnstr_set(x_35, 1, x_15);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_28);
-lean::cnstr_set(x_36, 1, x_35);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_22);
-lean::cnstr_set(x_37, 1, x_36);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_3);
-lean::cnstr_set(x_38, 1, x_37);
+lean::cnstr_set(x_19, 0, x_10);
+lean::cnstr_set(x_19, 1, x_18);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_20, 0, x_19);
+lean::closure_set(x_20, 1, x_9);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_20);
+lean::cnstr_set(x_21, 1, x_17);
+x_22 = l_lean_parser_command_visibility;
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_23, 0, x_22);
+lean::closure_set(x_23, 1, x_21);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_24, 0, x_23);
+x_25 = lean::mk_string("noncomputable");
+x_26 = l_string_trim(x_25);
+lean::dec(x_25);
+lean::inc(x_26);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_29, 0, x_26);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_30, 0, x_26);
+lean::closure_set(x_30, 1, x_9);
+lean::closure_set(x_30, 2, x_29);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_31, 0, x_30);
+x_32 = lean::mk_string("meta");
+x_33 = l_string_trim(x_32);
+lean::dec(x_32);
+lean::inc(x_33);
+x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_36, 0, x_33);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_37, 0, x_33);
+lean::closure_set(x_37, 1, x_9);
+lean::closure_set(x_37, 2, x_36);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_38, 0, x_37);
 x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_1);
-lean::cnstr_set(x_39, 1, x_38);
-x_40 = l_lean_parser_command__parser__m_monad___closed__1;
-x_41 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_42 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_43 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_44 = l_lean_parser_command_decl__modifiers;
-x_45 = l_lean_parser_command_decl__modifiers_has__view;
-x_46 = l_lean_parser_combinators_node_view___rarg(x_40, x_41, x_42, x_43, x_44, x_39, x_45);
-lean::dec(x_39);
-return x_46;
+lean::cnstr_set(x_39, 0, x_38);
+lean::cnstr_set(x_39, 1, x_17);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_31);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_24);
+lean::cnstr_set(x_41, 1, x_40);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_3);
+lean::cnstr_set(x_42, 1, x_41);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_1);
+lean::cnstr_set(x_43, 1, x_42);
+x_44 = l_lean_parser_command__parser__m_monad___closed__1;
+x_45 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_46 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_47 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_48 = l_lean_parser_command_decl__modifiers;
+x_49 = l_lean_parser_command_decl__modifiers_has__view;
+x_50 = l_lean_parser_combinators_node_view___rarg(x_44, x_45, x_46, x_47, x_48, x_43, x_49);
+lean::dec(x_43);
+return x_50;
 }
 }
 obj* _init_l_lean_parser_command_decl__modifiers_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; 
 x_0 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_doc__comment_parser), 4, 0);
 x_1 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
 lean::closure_set(x_1, 0, x_0);
@@ -12071,80 +12094,84 @@ x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_opti
 lean::closure_set(x_3, 0, x_2);
 x_4 = lean::mk_string("private");
 x_5 = l_string_trim(x_4);
+lean::dec(x_4);
 lean::inc(x_5);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_7, 0, x_5);
-x_8 = lean::mk_nat_obj(0u);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_9, 0, x_5);
-lean::closure_set(x_9, 1, x_8);
-lean::closure_set(x_9, 2, x_7);
-x_10 = lean::mk_string("protected");
-x_11 = l_string_trim(x_10);
-lean::inc(x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_13, 0, x_11);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_14, 0, x_11);
-lean::closure_set(x_14, 1, x_8);
-lean::closure_set(x_14, 2, x_13);
-x_15 = lean::box(0);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_14);
-lean::cnstr_set(x_16, 1, x_15);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_9);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_8);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_8, 0, x_5);
+x_9 = lean::mk_nat_obj(0u);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_10, 0, x_5);
+lean::closure_set(x_10, 1, x_9);
+lean::closure_set(x_10, 2, x_8);
+x_11 = lean::mk_string("protected");
+x_12 = l_string_trim(x_11);
+lean::dec(x_11);
+lean::inc(x_12);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_15, 0, x_12);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_16, 0, x_12);
+lean::closure_set(x_16, 1, x_9);
+lean::closure_set(x_16, 2, x_15);
+x_17 = lean::box(0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_16);
+lean::cnstr_set(x_18, 1, x_17);
 x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_18);
-lean::cnstr_set(x_19, 1, x_15);
-x_20 = l_lean_parser_command_visibility;
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_21, 0, x_20);
-lean::closure_set(x_21, 1, x_19);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_22, 0, x_21);
-x_23 = lean::mk_string("noncomputable");
-x_24 = l_string_trim(x_23);
-lean::inc(x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_26, 0, x_24);
-x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_27, 0, x_24);
-lean::closure_set(x_27, 1, x_8);
-lean::closure_set(x_27, 2, x_26);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_28, 0, x_27);
-x_29 = lean::mk_string("meta");
-x_30 = l_string_trim(x_29);
-lean::inc(x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_32, 0, x_30);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_33, 0, x_30);
-lean::closure_set(x_33, 1, x_8);
-lean::closure_set(x_33, 2, x_32);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_34, 0, x_33);
-x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_34);
-lean::cnstr_set(x_35, 1, x_15);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_28);
-lean::cnstr_set(x_36, 1, x_35);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_22);
-lean::cnstr_set(x_37, 1, x_36);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_3);
-lean::cnstr_set(x_38, 1, x_37);
+lean::cnstr_set(x_19, 0, x_10);
+lean::cnstr_set(x_19, 1, x_18);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_20, 0, x_19);
+lean::closure_set(x_20, 1, x_9);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_20);
+lean::cnstr_set(x_21, 1, x_17);
+x_22 = l_lean_parser_command_visibility;
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_23, 0, x_22);
+lean::closure_set(x_23, 1, x_21);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_24, 0, x_23);
+x_25 = lean::mk_string("noncomputable");
+x_26 = l_string_trim(x_25);
+lean::dec(x_25);
+lean::inc(x_26);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_29, 0, x_26);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_30, 0, x_26);
+lean::closure_set(x_30, 1, x_9);
+lean::closure_set(x_30, 2, x_29);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_31, 0, x_30);
+x_32 = lean::mk_string("meta");
+x_33 = l_string_trim(x_32);
+lean::dec(x_32);
+lean::inc(x_33);
+x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_36, 0, x_33);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_37, 0, x_33);
+lean::closure_set(x_37, 1, x_9);
+lean::closure_set(x_37, 2, x_36);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_38, 0, x_37);
 x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_1);
-lean::cnstr_set(x_39, 1, x_38);
-return x_39;
+lean::cnstr_set(x_39, 0, x_38);
+lean::cnstr_set(x_39, 1, x_17);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_31);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_24);
+lean::cnstr_set(x_41, 1, x_40);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_3);
+lean::cnstr_set(x_42, 1, x_41);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_1);
+lean::cnstr_set(x_43, 1, x_42);
+return x_43;
 }
 }
 obj* l_lean_parser_command_decl__modifiers_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -14060,138 +14087,144 @@ return x_0;
 obj* _init_l_lean_parser_command_equation_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_14; obj* x_17; obj* x_20; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_13; obj* x_16; obj* x_19; obj* x_22; 
 x_0 = lean::mk_string("|");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_4 = l_lean_parser_tokens___rarg(x_3);
+lean::dec(x_0);
+x_4 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
 x_5 = l_lean_parser_tokens___rarg(x_4);
-x_6 = lean::mk_string(":=");
-x_7 = l_lean_parser_symbol_tokens___rarg(x_6, x_1);
-x_8 = lean::box(0);
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_4, x_8);
-lean::dec(x_4);
-x_11 = l_lean_parser_list_cons_tokens___rarg(x_7, x_9);
-lean::dec(x_9);
+x_6 = l_lean_parser_tokens___rarg(x_5);
+x_7 = lean::mk_string(":=");
+x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_1);
 lean::dec(x_7);
-x_14 = l_lean_parser_list_cons_tokens___rarg(x_5, x_11);
-lean::dec(x_11);
+x_10 = lean::box(0);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_5, x_10);
 lean::dec(x_5);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_2, x_14);
-lean::dec(x_14);
+x_13 = l_lean_parser_list_cons_tokens___rarg(x_8, x_11);
+lean::dec(x_11);
+lean::dec(x_8);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_6, x_13);
+lean::dec(x_13);
+lean::dec(x_6);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_2, x_16);
+lean::dec(x_16);
 lean::dec(x_2);
-x_20 = l_lean_parser_tokens___rarg(x_17);
-lean::dec(x_17);
-return x_20;
+x_22 = l_lean_parser_tokens___rarg(x_19);
+lean::dec(x_19);
+return x_22;
 }
 }
 obj* _init_l_lean_parser_command_equation_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; 
 x_0 = lean::mk_string("|");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = l_lean_parser_max__prec;
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = l_lean_parser_max__prec;
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
 lean::closure_set(x_8, 0, x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
 lean::closure_set(x_9, 0, x_8);
-x_10 = lean::mk_string(":=");
-x_11 = l_string_trim(x_10);
-lean::inc(x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_13, 0, x_11);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_14, 0, x_11);
-lean::closure_set(x_14, 1, x_4);
-lean::closure_set(x_14, 2, x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_15, 0, x_4);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_16, 0, x_15);
-x_17 = lean::box(0);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_16);
-lean::cnstr_set(x_18, 1, x_17);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_14);
-lean::cnstr_set(x_19, 1, x_18);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_10, 0, x_9);
+x_11 = lean::mk_string(":=");
+x_12 = l_string_trim(x_11);
+lean::dec(x_11);
+lean::inc(x_12);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_15, 0, x_12);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_16, 0, x_12);
+lean::closure_set(x_16, 1, x_5);
+lean::closure_set(x_16, 2, x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_17, 0, x_5);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_18, 0, x_17);
+x_19 = lean::box(0);
 x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_9);
+lean::cnstr_set(x_20, 0, x_18);
 lean::cnstr_set(x_20, 1, x_19);
 x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_5);
+lean::cnstr_set(x_21, 0, x_16);
 lean::cnstr_set(x_21, 1, x_20);
-x_22 = l_lean_parser_command__parser__m_monad___closed__1;
-x_23 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_24 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_25 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_26 = l_lean_parser_command_equation;
-x_27 = l_lean_parser_command_equation_has__view;
-x_28 = l_lean_parser_combinators_node_view___rarg(x_22, x_23, x_24, x_25, x_26, x_21, x_27);
-lean::dec(x_21);
-return x_28;
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_10);
+lean::cnstr_set(x_22, 1, x_21);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_6);
+lean::cnstr_set(x_23, 1, x_22);
+x_24 = l_lean_parser_command__parser__m_monad___closed__1;
+x_25 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_26 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_27 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_28 = l_lean_parser_command_equation;
+x_29 = l_lean_parser_command_equation_has__view;
+x_30 = l_lean_parser_combinators_node_view___rarg(x_24, x_25, x_26, x_27, x_28, x_23, x_29);
+lean::dec(x_23);
+return x_30;
 }
 }
 obj* _init_l_lean_parser_command_equation_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
 x_0 = lean::mk_string("|");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = l_lean_parser_max__prec;
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = l_lean_parser_max__prec;
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
 lean::closure_set(x_8, 0, x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
 lean::closure_set(x_9, 0, x_8);
-x_10 = lean::mk_string(":=");
-x_11 = l_string_trim(x_10);
-lean::inc(x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_13, 0, x_11);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_14, 0, x_11);
-lean::closure_set(x_14, 1, x_4);
-lean::closure_set(x_14, 2, x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_15, 0, x_4);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_16, 0, x_15);
-x_17 = lean::box(0);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_16);
-lean::cnstr_set(x_18, 1, x_17);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_14);
-lean::cnstr_set(x_19, 1, x_18);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_10, 0, x_9);
+x_11 = lean::mk_string(":=");
+x_12 = l_string_trim(x_11);
+lean::dec(x_11);
+lean::inc(x_12);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_15, 0, x_12);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_16, 0, x_12);
+lean::closure_set(x_16, 1, x_5);
+lean::closure_set(x_16, 2, x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_17, 0, x_5);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_18, 0, x_17);
+x_19 = lean::box(0);
 x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_9);
+lean::cnstr_set(x_20, 0, x_18);
 lean::cnstr_set(x_20, 1, x_19);
 x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_5);
+lean::cnstr_set(x_21, 0, x_16);
 lean::cnstr_set(x_21, 1, x_20);
-return x_21;
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_10);
+lean::cnstr_set(x_22, 1, x_21);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_6);
+lean::cnstr_set(x_23, 1, x_22);
+return x_23;
 }
 }
 obj* l_lean_parser_command_equation_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -15016,165 +15049,171 @@ return x_0;
 obj* _init_l_lean_parser_command_decl__val_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_22; obj* x_25; obj* x_27; obj* x_29; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_12; obj* x_14; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_21; obj* x_24; obj* x_27; obj* x_29; obj* x_31; 
 x_0 = lean::mk_string(":=");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
-lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
+lean::dec(x_0);
+x_4 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = lean::box(0);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_5, x_6);
+lean::dec(x_5);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_2, x_7);
+lean::dec(x_7);
 lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
-lean::dec(x_8);
-x_13 = lean::mk_string(".");
-x_14 = l_lean_parser_symbol_tokens___rarg(x_13, x_1);
-x_15 = l_lean_parser_command_equation_parser_lean_parser_has__tokens;
-x_16 = l_lean_parser_tokens___rarg(x_15);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_16, x_5);
-lean::dec(x_16);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_14, x_17);
-lean::dec(x_17);
+x_12 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+x_14 = lean::mk_string(".");
+x_15 = l_lean_parser_symbol_tokens___rarg(x_14, x_1);
 lean::dec(x_14);
-x_22 = l_lean_parser_list_cons_tokens___rarg(x_11, x_19);
+x_17 = l_lean_parser_command_equation_parser_lean_parser_has__tokens;
+x_18 = l_lean_parser_tokens___rarg(x_17);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_18, x_6);
+lean::dec(x_18);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_15, x_19);
 lean::dec(x_19);
-lean::dec(x_11);
-x_25 = l_lean_parser_tokens___rarg(x_22);
-lean::dec(x_22);
-x_27 = l_lean_parser_list_cons_tokens___rarg(x_25, x_5);
-lean::dec(x_25);
-x_29 = l_lean_parser_tokens___rarg(x_27);
+lean::dec(x_15);
+x_24 = l_lean_parser_list_cons_tokens___rarg(x_12, x_21);
+lean::dec(x_21);
+lean::dec(x_12);
+x_27 = l_lean_parser_tokens___rarg(x_24);
+lean::dec(x_24);
+x_29 = l_lean_parser_list_cons_tokens___rarg(x_27, x_6);
 lean::dec(x_27);
-return x_29;
+x_31 = l_lean_parser_tokens___rarg(x_29);
+lean::dec(x_29);
+return x_31;
 }
 }
 obj* _init_l_lean_parser_command_decl__val_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; 
 x_0 = lean::mk_string(":=");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-x_11 = l_lean_parser_command_simple__decl__val;
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_12, 0, x_11);
-lean::closure_set(x_12, 1, x_10);
-x_13 = lean::mk_string(".");
-x_14 = l_string_trim(x_13);
-lean::inc(x_14);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_16, 0, x_14);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_17, 0, x_14);
-lean::closure_set(x_17, 1, x_4);
-lean::closure_set(x_17, 2, x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_equation_parser), 4, 0);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_19, 0, x_18);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_19);
-lean::cnstr_set(x_20, 1, x_8);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_17);
-lean::cnstr_set(x_21, 1, x_20);
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+x_12 = l_lean_parser_command_simple__decl__val;
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_13, 0, x_12);
+lean::closure_set(x_13, 1, x_11);
+x_14 = lean::mk_string(".");
+x_15 = l_string_trim(x_14);
+lean::dec(x_14);
+lean::inc(x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_18, 0, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_19, 0, x_15);
+lean::closure_set(x_19, 1, x_5);
+lean::closure_set(x_19, 2, x_18);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_equation_parser), 4, 0);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_21, 0, x_20);
 x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_12);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_23, 0, x_22);
-lean::closure_set(x_23, 1, x_4);
+lean::cnstr_set(x_22, 0, x_21);
+lean::cnstr_set(x_22, 1, x_9);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_19);
+lean::cnstr_set(x_23, 1, x_22);
 x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_23);
-lean::cnstr_set(x_24, 1, x_8);
-x_25 = l_lean_parser_command__parser__m_monad___closed__1;
-x_26 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_27 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_28 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_29 = l_lean_parser_command_decl__val;
-x_30 = l_lean_parser_command_decl__val_has__view;
-x_31 = l_lean_parser_combinators_node_view___rarg(x_25, x_26, x_27, x_28, x_29, x_24, x_30);
-lean::dec(x_24);
-return x_31;
+lean::cnstr_set(x_24, 0, x_13);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_5);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_25);
+lean::cnstr_set(x_26, 1, x_9);
+x_27 = l_lean_parser_command__parser__m_monad___closed__1;
+x_28 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_29 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_30 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_31 = l_lean_parser_command_decl__val;
+x_32 = l_lean_parser_command_decl__val_has__view;
+x_33 = l_lean_parser_combinators_node_view___rarg(x_27, x_28, x_29, x_30, x_31, x_26, x_32);
+lean::dec(x_26);
+return x_33;
 }
 }
 obj* _init_l_lean_parser_command_decl__val_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; 
 x_0 = lean::mk_string(":=");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-x_11 = l_lean_parser_command_simple__decl__val;
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_12, 0, x_11);
-lean::closure_set(x_12, 1, x_10);
-x_13 = lean::mk_string(".");
-x_14 = l_string_trim(x_13);
-lean::inc(x_14);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_16, 0, x_14);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_17, 0, x_14);
-lean::closure_set(x_17, 1, x_4);
-lean::closure_set(x_17, 2, x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_equation_parser), 4, 0);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_19, 0, x_18);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_19);
-lean::cnstr_set(x_20, 1, x_8);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_17);
-lean::cnstr_set(x_21, 1, x_20);
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+x_12 = l_lean_parser_command_simple__decl__val;
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_13, 0, x_12);
+lean::closure_set(x_13, 1, x_11);
+x_14 = lean::mk_string(".");
+x_15 = l_string_trim(x_14);
+lean::dec(x_14);
+lean::inc(x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_18, 0, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_19, 0, x_15);
+lean::closure_set(x_19, 1, x_5);
+lean::closure_set(x_19, 2, x_18);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_equation_parser), 4, 0);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_21, 0, x_20);
 x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_12);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_23, 0, x_22);
-lean::closure_set(x_23, 1, x_4);
+lean::cnstr_set(x_22, 0, x_21);
+lean::cnstr_set(x_22, 1, x_9);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_19);
+lean::cnstr_set(x_23, 1, x_22);
 x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_23);
-lean::cnstr_set(x_24, 1, x_8);
-return x_24;
+lean::cnstr_set(x_24, 0, x_13);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_5);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_25);
+lean::cnstr_set(x_26, 1, x_9);
+return x_26;
 }
 }
 obj* l_lean_parser_command_decl__val_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -16448,47 +16487,51 @@ return x_0;
 obj* _init_l_lean_parser_command_infer__modifier_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_21; obj* x_24; obj* x_26; obj* x_28; obj* x_30; obj* x_33; obj* x_35; obj* x_37; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_17; obj* x_18; obj* x_20; obj* x_21; obj* x_23; obj* x_25; obj* x_28; obj* x_30; obj* x_32; obj* x_34; obj* x_37; obj* x_39; obj* x_41; 
 x_0 = lean::mk_string("{");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string("}");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
+lean::dec(x_0);
+x_4 = lean::mk_string("}");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
-lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
+x_7 = lean::box(0);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_5, x_7);
+lean::dec(x_5);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_2, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_tokens___rarg(x_11);
-lean::dec(x_11);
-x_15 = lean::mk_string("(");
-x_16 = l_lean_parser_symbol_tokens___rarg(x_15, x_1);
-x_17 = lean::mk_string(")");
-x_18 = l_lean_parser_symbol_tokens___rarg(x_17, x_1);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_18, x_5);
-lean::dec(x_18);
-x_21 = l_lean_parser_list_cons_tokens___rarg(x_16, x_19);
-lean::dec(x_19);
-lean::dec(x_16);
-x_24 = l_lean_parser_tokens___rarg(x_21);
-lean::dec(x_21);
-x_26 = l_lean_parser_tokens___rarg(x_24);
-lean::dec(x_24);
-x_28 = l_lean_parser_list_cons_tokens___rarg(x_26, x_5);
-lean::dec(x_26);
-x_30 = l_lean_parser_list_cons_tokens___rarg(x_13, x_28);
-lean::dec(x_28);
+lean::dec(x_2);
+x_13 = l_lean_parser_tokens___rarg(x_10);
+lean::dec(x_10);
+x_15 = l_lean_parser_tokens___rarg(x_13);
 lean::dec(x_13);
-x_33 = l_lean_parser_tokens___rarg(x_30);
+x_17 = lean::mk_string("(");
+x_18 = l_lean_parser_symbol_tokens___rarg(x_17, x_1);
+lean::dec(x_17);
+x_20 = lean::mk_string(")");
+x_21 = l_lean_parser_symbol_tokens___rarg(x_20, x_1);
+lean::dec(x_20);
+x_23 = l_lean_parser_list_cons_tokens___rarg(x_21, x_7);
+lean::dec(x_21);
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_18, x_23);
+lean::dec(x_23);
+lean::dec(x_18);
+x_28 = l_lean_parser_tokens___rarg(x_25);
+lean::dec(x_25);
+x_30 = l_lean_parser_tokens___rarg(x_28);
+lean::dec(x_28);
+x_32 = l_lean_parser_list_cons_tokens___rarg(x_30, x_7);
 lean::dec(x_30);
-x_35 = l_lean_parser_list_cons_tokens___rarg(x_33, x_5);
-lean::dec(x_33);
-x_37 = l_lean_parser_tokens___rarg(x_35);
-lean::dec(x_35);
-return x_37;
+x_34 = l_lean_parser_list_cons_tokens___rarg(x_15, x_32);
+lean::dec(x_32);
+lean::dec(x_15);
+x_37 = l_lean_parser_tokens___rarg(x_34);
+lean::dec(x_34);
+x_39 = l_lean_parser_list_cons_tokens___rarg(x_37, x_7);
+lean::dec(x_37);
+x_41 = l_lean_parser_tokens___rarg(x_39);
+lean::dec(x_39);
+return x_41;
 }
 }
 obj* l_lean_parser_command_infer__modifier_parser_lean_parser_has__view___lambda__1(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -16548,155 +16591,163 @@ return x_13;
 obj* _init_l_lean_parser_command_infer__modifier_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; 
 x_0 = lean::mk_string("{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("}");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser_lean_parser_has__view___lambda__1), 5, 1);
-lean::closure_set(x_14, 0, x_13);
-x_15 = lean::mk_string("(");
-x_16 = l_string_trim(x_15);
-lean::inc(x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_18, 0, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_19, 0, x_16);
-lean::closure_set(x_19, 1, x_4);
-lean::closure_set(x_19, 2, x_18);
-x_20 = lean::mk_string(")");
-x_21 = l_string_trim(x_20);
-lean::inc(x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_23, 0, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_24, 0, x_21);
-lean::closure_set(x_24, 1, x_4);
-lean::closure_set(x_24, 2, x_23);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_11);
-x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_19);
-lean::cnstr_set(x_26, 1, x_25);
-x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser_lean_parser_has__view___lambda__2), 5, 1);
-lean::closure_set(x_27, 0, x_26);
-x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_27);
-lean::cnstr_set(x_28, 1, x_11);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("}");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_16, 0, x_15);
+x_17 = lean::mk_string("(");
+x_18 = l_string_trim(x_17);
+lean::dec(x_17);
+lean::inc(x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_21, 0, x_18);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_22, 0, x_18);
+lean::closure_set(x_22, 1, x_5);
+lean::closure_set(x_22, 2, x_21);
+x_23 = lean::mk_string(")");
+x_24 = l_string_trim(x_23);
+lean::dec(x_23);
+lean::inc(x_24);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_27, 0, x_24);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_28, 0, x_24);
+lean::closure_set(x_28, 1, x_5);
+lean::closure_set(x_28, 2, x_27);
 x_29 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_29, 0, x_14);
-lean::cnstr_set(x_29, 1, x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_30, 0, x_29);
-lean::closure_set(x_30, 1, x_4);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_30);
-lean::cnstr_set(x_31, 1, x_11);
-x_32 = l_lean_parser_command__parser__m_monad___closed__1;
-x_33 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_34 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_35 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_36 = l_lean_parser_command_infer__modifier;
-x_37 = l_lean_parser_command_infer__modifier_has__view;
-x_38 = l_lean_parser_combinators_node_view___rarg(x_32, x_33, x_34, x_35, x_36, x_31, x_37);
-lean::dec(x_31);
-return x_38;
+lean::cnstr_set(x_29, 0, x_28);
+lean::cnstr_set(x_29, 1, x_13);
+x_30 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_30, 0, x_22);
+lean::cnstr_set(x_30, 1, x_29);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser_lean_parser_has__view___lambda__2), 5, 1);
+lean::closure_set(x_31, 0, x_30);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_31);
+lean::cnstr_set(x_32, 1, x_13);
+x_33 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_33, 0, x_16);
+lean::cnstr_set(x_33, 1, x_32);
+x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_34, 0, x_33);
+lean::closure_set(x_34, 1, x_5);
+x_35 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_35, 0, x_34);
+lean::cnstr_set(x_35, 1, x_13);
+x_36 = l_lean_parser_command__parser__m_monad___closed__1;
+x_37 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_38 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_39 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_40 = l_lean_parser_command_infer__modifier;
+x_41 = l_lean_parser_command_infer__modifier_has__view;
+x_42 = l_lean_parser_combinators_node_view___rarg(x_36, x_37, x_38, x_39, x_40, x_35, x_41);
+lean::dec(x_35);
+return x_42;
 }
 }
 obj* _init_l_lean_parser_command_infer__modifier_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; 
 x_0 = lean::mk_string("{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("}");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser_lean_parser_has__view___lambda__1), 5, 1);
-lean::closure_set(x_14, 0, x_13);
-x_15 = lean::mk_string("(");
-x_16 = l_string_trim(x_15);
-lean::inc(x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_18, 0, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_19, 0, x_16);
-lean::closure_set(x_19, 1, x_4);
-lean::closure_set(x_19, 2, x_18);
-x_20 = lean::mk_string(")");
-x_21 = l_string_trim(x_20);
-lean::inc(x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_23, 0, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_24, 0, x_21);
-lean::closure_set(x_24, 1, x_4);
-lean::closure_set(x_24, 2, x_23);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_11);
-x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_19);
-lean::cnstr_set(x_26, 1, x_25);
-x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser_lean_parser_has__view___lambda__2), 5, 1);
-lean::closure_set(x_27, 0, x_26);
-x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_27);
-lean::cnstr_set(x_28, 1, x_11);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("}");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_16, 0, x_15);
+x_17 = lean::mk_string("(");
+x_18 = l_string_trim(x_17);
+lean::dec(x_17);
+lean::inc(x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_21, 0, x_18);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_22, 0, x_18);
+lean::closure_set(x_22, 1, x_5);
+lean::closure_set(x_22, 2, x_21);
+x_23 = lean::mk_string(")");
+x_24 = l_string_trim(x_23);
+lean::dec(x_23);
+lean::inc(x_24);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_27, 0, x_24);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_28, 0, x_24);
+lean::closure_set(x_28, 1, x_5);
+lean::closure_set(x_28, 2, x_27);
 x_29 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_29, 0, x_14);
-lean::cnstr_set(x_29, 1, x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_30, 0, x_29);
-lean::closure_set(x_30, 1, x_4);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_30);
-lean::cnstr_set(x_31, 1, x_11);
-return x_31;
+lean::cnstr_set(x_29, 0, x_28);
+lean::cnstr_set(x_29, 1, x_13);
+x_30 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_30, 0, x_22);
+lean::cnstr_set(x_30, 1, x_29);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser_lean_parser_has__view___lambda__2), 5, 1);
+lean::closure_set(x_31, 0, x_30);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_31);
+lean::cnstr_set(x_32, 1, x_13);
+x_33 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_33, 0, x_16);
+lean::cnstr_set(x_33, 1, x_32);
+x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_34, 0, x_33);
+lean::closure_set(x_34, 1, x_5);
+x_35 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_35, 0, x_34);
+lean::cnstr_set(x_35, 1, x_13);
+return x_35;
 }
 }
 obj* l_lean_parser_command_infer__modifier_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -17730,26 +17781,27 @@ return x_77;
 obj* _init_l_lean_parser_command_intro__rule_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_13; obj* x_16; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_14; obj* x_17; 
 x_0 = lean::mk_string("|");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_command_infer__modifier_parser_lean_parser_has__tokens;
-x_5 = l_lean_parser_tokens___rarg(x_4);
-x_6 = l_lean_parser_command_opt__decl__sig_parser_lean_parser_has__tokens;
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_3);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_5, x_7);
-lean::dec(x_7);
-lean::dec(x_5);
-x_11 = l_lean_parser_list_cons_tokens___rarg(x_3, x_8);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_command_infer__modifier_parser_lean_parser_has__tokens;
+x_6 = l_lean_parser_tokens___rarg(x_5);
+x_7 = l_lean_parser_command_opt__decl__sig_parser_lean_parser_has__tokens;
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_4);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_6, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_2, x_11);
-lean::dec(x_11);
+lean::dec(x_6);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_4, x_9);
+lean::dec(x_9);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_2, x_12);
+lean::dec(x_12);
 lean::dec(x_2);
-x_16 = l_lean_parser_tokens___rarg(x_13);
-lean::dec(x_13);
-return x_16;
+x_17 = l_lean_parser_tokens___rarg(x_14);
+lean::dec(x_14);
+return x_17;
 }
 }
 obj* l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -17764,79 +17816,81 @@ return x_4;
 obj* _init_l_lean_parser_command_intro__rule_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; 
 x_0 = lean::mk_string("|");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser), 4, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
-x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_9);
-lean::cnstr_set(x_10, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser), 4, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
 x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_7);
-lean::cnstr_set(x_11, 1, x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_12);
-lean::cnstr_set(x_13, 1, x_11);
+lean::cnstr_set(x_11, 0, x_10);
+lean::cnstr_set(x_11, 1, x_9);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_8);
+lean::cnstr_set(x_12, 1, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
 x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_5);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = l_lean_parser_command__parser__m_monad___closed__1;
-x_16 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_17 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_18 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_19 = l_lean_parser_command_intro__rule;
-x_20 = l_lean_parser_command_intro__rule_has__view;
-x_21 = l_lean_parser_combinators_node_view___rarg(x_15, x_16, x_17, x_18, x_19, x_14, x_20);
-lean::dec(x_14);
-return x_21;
+lean::cnstr_set(x_14, 0, x_13);
+lean::cnstr_set(x_14, 1, x_12);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = l_lean_parser_command__parser__m_monad___closed__1;
+x_17 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_18 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_19 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_20 = l_lean_parser_command_intro__rule;
+x_21 = l_lean_parser_command_intro__rule_has__view;
+x_22 = l_lean_parser_combinators_node_view___rarg(x_16, x_17, x_18, x_19, x_20, x_15, x_21);
+lean::dec(x_15);
+return x_22;
 }
 }
 obj* _init_l_lean_parser_command_intro__rule_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; 
 x_0 = lean::mk_string("|");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser), 4, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
-x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_9);
-lean::cnstr_set(x_10, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser), 4, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
 x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_7);
-lean::cnstr_set(x_11, 1, x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_12);
-lean::cnstr_set(x_13, 1, x_11);
+lean::cnstr_set(x_11, 0, x_10);
+lean::cnstr_set(x_11, 1, x_9);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_8);
+lean::cnstr_set(x_12, 1, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
 x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_5);
-lean::cnstr_set(x_14, 1, x_13);
-return x_14;
+lean::cnstr_set(x_14, 0, x_13);
+lean::cnstr_set(x_14, 1, x_12);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+return x_15;
 }
 }
 obj* l_lean_parser_command_intro__rule_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -22367,449 +22421,473 @@ return x_0;
 obj* _init_l_lean_parser_command_structure__field__block_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_13; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_21; obj* x_24; obj* x_27; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_35; obj* x_37; obj* x_40; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_48; obj* x_50; obj* x_53; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_61; obj* x_63; obj* x_66; obj* x_68; obj* x_70; obj* x_73; obj* x_76; obj* x_79; obj* x_81; obj* x_83; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_14; obj* x_16; obj* x_18; obj* x_19; obj* x_21; obj* x_23; obj* x_26; obj* x_29; obj* x_31; obj* x_32; obj* x_34; obj* x_35; obj* x_37; obj* x_39; obj* x_41; obj* x_44; obj* x_46; obj* x_47; obj* x_49; obj* x_50; obj* x_52; obj* x_54; obj* x_56; obj* x_59; obj* x_61; obj* x_62; obj* x_64; obj* x_65; obj* x_67; obj* x_69; obj* x_71; obj* x_74; obj* x_76; obj* x_78; obj* x_81; obj* x_84; obj* x_87; obj* x_89; obj* x_91; 
 x_0 = lean::mk_string("(");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_command_notation__like_parser_lean_parser_has__tokens;
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_command_struct__binder__content_parser_lean_parser_has__tokens;
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_5);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_4, x_7);
-lean::dec(x_7);
-lean::dec(x_4);
-x_11 = l_lean_parser_tokens___rarg(x_8);
+lean::dec(x_0);
+x_4 = l_lean_parser_command_notation__like_parser_lean_parser_has__tokens;
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = lean::box(0);
+x_7 = l_lean_parser_command_struct__binder__content_parser_lean_parser_has__tokens;
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_6);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_5, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_11, x_5);
-lean::dec(x_11);
-x_15 = l_lean_parser_tokens___rarg(x_13);
-lean::dec(x_13);
-x_17 = lean::mk_string(")");
-x_18 = l_lean_parser_symbol_tokens___rarg(x_17, x_1);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_18, x_5);
+lean::dec(x_5);
+x_12 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_12, x_6);
+lean::dec(x_12);
+x_16 = l_lean_parser_tokens___rarg(x_14);
+lean::dec(x_14);
+x_18 = lean::mk_string(")");
+x_19 = l_lean_parser_symbol_tokens___rarg(x_18, x_1);
 lean::dec(x_18);
-x_21 = l_lean_parser_list_cons_tokens___rarg(x_15, x_19);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_19, x_6);
 lean::dec(x_19);
-lean::dec(x_15);
-x_24 = l_lean_parser_list_cons_tokens___rarg(x_2, x_21);
+x_23 = l_lean_parser_list_cons_tokens___rarg(x_16, x_21);
 lean::dec(x_21);
+lean::dec(x_16);
+x_26 = l_lean_parser_list_cons_tokens___rarg(x_2, x_23);
+lean::dec(x_23);
 lean::dec(x_2);
-x_27 = l_lean_parser_tokens___rarg(x_24);
-lean::dec(x_24);
-x_29 = lean::mk_string("{");
-x_30 = l_lean_parser_symbol_tokens___rarg(x_29, x_1);
-x_31 = lean::mk_string("}");
+x_29 = l_lean_parser_tokens___rarg(x_26);
+lean::dec(x_26);
+x_31 = lean::mk_string("{");
 x_32 = l_lean_parser_symbol_tokens___rarg(x_31, x_1);
-x_33 = l_lean_parser_list_cons_tokens___rarg(x_32, x_5);
-lean::dec(x_32);
-x_35 = l_lean_parser_list_cons_tokens___rarg(x_6, x_33);
-lean::dec(x_33);
-x_37 = l_lean_parser_list_cons_tokens___rarg(x_30, x_35);
+lean::dec(x_31);
+x_34 = lean::mk_string("}");
+x_35 = l_lean_parser_symbol_tokens___rarg(x_34, x_1);
+lean::dec(x_34);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_35, x_6);
 lean::dec(x_35);
-lean::dec(x_30);
-x_40 = l_lean_parser_tokens___rarg(x_37);
+x_39 = l_lean_parser_list_cons_tokens___rarg(x_7, x_37);
 lean::dec(x_37);
-x_42 = lean::mk_string("\xe2\xa6\x83");
-x_43 = l_lean_parser_symbol_tokens___rarg(x_42, x_1);
-x_44 = lean::mk_string("\xe2\xa6\x84");
-x_45 = l_lean_parser_symbol_tokens___rarg(x_44, x_1);
-x_46 = l_lean_parser_list_cons_tokens___rarg(x_45, x_5);
-lean::dec(x_45);
-x_48 = l_lean_parser_list_cons_tokens___rarg(x_6, x_46);
+x_41 = l_lean_parser_list_cons_tokens___rarg(x_32, x_39);
+lean::dec(x_39);
+lean::dec(x_32);
+x_44 = l_lean_parser_tokens___rarg(x_41);
+lean::dec(x_41);
+x_46 = lean::mk_string("\xe2\xa6\x83");
+x_47 = l_lean_parser_symbol_tokens___rarg(x_46, x_1);
 lean::dec(x_46);
-x_50 = l_lean_parser_list_cons_tokens___rarg(x_43, x_48);
-lean::dec(x_48);
-lean::dec(x_43);
-x_53 = l_lean_parser_tokens___rarg(x_50);
+x_49 = lean::mk_string("\xe2\xa6\x84");
+x_50 = l_lean_parser_symbol_tokens___rarg(x_49, x_1);
+lean::dec(x_49);
+x_52 = l_lean_parser_list_cons_tokens___rarg(x_50, x_6);
 lean::dec(x_50);
-x_55 = lean::mk_string("[");
-x_56 = l_lean_parser_symbol_tokens___rarg(x_55, x_1);
-x_57 = lean::mk_string("]");
-x_58 = l_lean_parser_symbol_tokens___rarg(x_57, x_1);
-x_59 = l_lean_parser_list_cons_tokens___rarg(x_58, x_5);
-lean::dec(x_58);
-x_61 = l_lean_parser_list_cons_tokens___rarg(x_6, x_59);
-lean::dec(x_59);
-x_63 = l_lean_parser_list_cons_tokens___rarg(x_56, x_61);
-lean::dec(x_61);
+x_54 = l_lean_parser_list_cons_tokens___rarg(x_7, x_52);
+lean::dec(x_52);
+x_56 = l_lean_parser_list_cons_tokens___rarg(x_47, x_54);
+lean::dec(x_54);
+lean::dec(x_47);
+x_59 = l_lean_parser_tokens___rarg(x_56);
 lean::dec(x_56);
-x_66 = l_lean_parser_tokens___rarg(x_63);
-lean::dec(x_63);
-x_68 = l_lean_parser_list_cons_tokens___rarg(x_66, x_5);
-lean::dec(x_66);
-x_70 = l_lean_parser_list_cons_tokens___rarg(x_53, x_68);
-lean::dec(x_68);
-lean::dec(x_53);
-x_73 = l_lean_parser_list_cons_tokens___rarg(x_40, x_70);
-lean::dec(x_70);
-lean::dec(x_40);
-x_76 = l_lean_parser_list_cons_tokens___rarg(x_27, x_73);
-lean::dec(x_73);
-lean::dec(x_27);
-x_79 = l_lean_parser_tokens___rarg(x_76);
+x_61 = lean::mk_string("[");
+x_62 = l_lean_parser_symbol_tokens___rarg(x_61, x_1);
+lean::dec(x_61);
+x_64 = lean::mk_string("]");
+x_65 = l_lean_parser_symbol_tokens___rarg(x_64, x_1);
+lean::dec(x_64);
+x_67 = l_lean_parser_list_cons_tokens___rarg(x_65, x_6);
+lean::dec(x_65);
+x_69 = l_lean_parser_list_cons_tokens___rarg(x_7, x_67);
+lean::dec(x_67);
+x_71 = l_lean_parser_list_cons_tokens___rarg(x_62, x_69);
+lean::dec(x_69);
+lean::dec(x_62);
+x_74 = l_lean_parser_tokens___rarg(x_71);
+lean::dec(x_71);
+x_76 = l_lean_parser_list_cons_tokens___rarg(x_74, x_6);
+lean::dec(x_74);
+x_78 = l_lean_parser_list_cons_tokens___rarg(x_59, x_76);
 lean::dec(x_76);
-x_81 = l_lean_parser_list_cons_tokens___rarg(x_79, x_5);
-lean::dec(x_79);
-x_83 = l_lean_parser_tokens___rarg(x_81);
+lean::dec(x_59);
+x_81 = l_lean_parser_list_cons_tokens___rarg(x_44, x_78);
+lean::dec(x_78);
+lean::dec(x_44);
+x_84 = l_lean_parser_list_cons_tokens___rarg(x_29, x_81);
 lean::dec(x_81);
-return x_83;
+lean::dec(x_29);
+x_87 = l_lean_parser_tokens___rarg(x_84);
+lean::dec(x_84);
+x_89 = l_lean_parser_list_cons_tokens___rarg(x_87, x_6);
+lean::dec(x_87);
+x_91 = l_lean_parser_tokens___rarg(x_89);
+lean::dec(x_89);
+return x_91;
 }
 }
 obj* _init_l_lean_parser_command_structure__field__block_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_35; obj* x_36; obj* x_37; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_51; obj* x_52; obj* x_53; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_57; obj* x_58; obj* x_59; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_94; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_struct__binder__content_parser), 4, 0);
-lean::inc(x_9);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_9);
-lean::cnstr_set(x_11, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_struct__binder__content_parser), 4, 0);
+lean::inc(x_10);
 x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_7);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_13, 0, x_12);
-lean::closure_set(x_13, 1, x_4);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_13);
-lean::cnstr_set(x_14, 1, x_8);
-x_15 = l_lean_parser_command_struct__explicit__binder__content;
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_16, 0, x_15);
-lean::closure_set(x_16, 1, x_14);
-x_17 = lean::mk_string(")");
-x_18 = l_string_trim(x_17);
-lean::inc(x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_20, 0, x_18);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_21, 0, x_18);
-lean::closure_set(x_21, 1, x_4);
-lean::closure_set(x_21, 2, x_20);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_8);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_16);
-lean::cnstr_set(x_23, 1, x_22);
+lean::cnstr_set(x_12, 0, x_10);
+lean::cnstr_set(x_12, 1, x_9);
+x_13 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_13, 0, x_8);
+lean::cnstr_set(x_13, 1, x_12);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_14, 0, x_13);
+lean::closure_set(x_14, 1, x_5);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_14);
+lean::cnstr_set(x_15, 1, x_9);
+x_16 = l_lean_parser_command_struct__explicit__binder__content;
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_17, 0, x_16);
+lean::closure_set(x_17, 1, x_15);
+x_18 = lean::mk_string(")");
+x_19 = l_string_trim(x_18);
+lean::dec(x_18);
+lean::inc(x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_22, 0, x_19);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_23, 0, x_19);
+lean::closure_set(x_23, 1, x_5);
+lean::closure_set(x_23, 2, x_22);
 x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_5);
-lean::cnstr_set(x_24, 1, x_23);
-x_25 = l_lean_parser_command_struct__explicit__binder;
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_26, 0, x_25);
-lean::closure_set(x_26, 1, x_24);
-x_27 = lean::mk_string("{");
-x_28 = l_string_trim(x_27);
-lean::inc(x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_30, 0, x_28);
-x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_31, 0, x_28);
-lean::closure_set(x_31, 1, x_4);
-lean::closure_set(x_31, 2, x_30);
-x_32 = lean::mk_string("}");
-x_33 = l_string_trim(x_32);
-lean::inc(x_33);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_35, 0, x_33);
-x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_36, 0, x_33);
-lean::closure_set(x_36, 1, x_4);
-lean::closure_set(x_36, 2, x_35);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_36);
-lean::cnstr_set(x_37, 1, x_8);
-lean::inc(x_9);
-x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_9);
-lean::cnstr_set(x_39, 1, x_37);
-x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_31);
-lean::cnstr_set(x_40, 1, x_39);
-x_41 = l_lean_parser_command_struct__implicit__binder;
-x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_42, 0, x_41);
-lean::closure_set(x_42, 1, x_40);
-x_43 = lean::mk_string("\xe2\xa6\x83");
-x_44 = l_string_trim(x_43);
-lean::inc(x_44);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_46, 0, x_44);
-x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_47, 0, x_44);
-lean::closure_set(x_47, 1, x_4);
-lean::closure_set(x_47, 2, x_46);
-x_48 = lean::mk_string("\xe2\xa6\x84");
-x_49 = l_string_trim(x_48);
-lean::inc(x_49);
+lean::cnstr_set(x_24, 0, x_23);
+lean::cnstr_set(x_24, 1, x_9);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_17);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_6);
+lean::cnstr_set(x_26, 1, x_25);
+x_27 = l_lean_parser_command_struct__explicit__binder;
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_28, 0, x_27);
+lean::closure_set(x_28, 1, x_26);
+x_29 = lean::mk_string("{");
+x_30 = l_string_trim(x_29);
+lean::dec(x_29);
+lean::inc(x_30);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_33, 0, x_30);
+x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_34, 0, x_30);
+lean::closure_set(x_34, 1, x_5);
+lean::closure_set(x_34, 2, x_33);
+x_35 = lean::mk_string("}");
+x_36 = l_string_trim(x_35);
+lean::dec(x_35);
+lean::inc(x_36);
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_39, 0, x_36);
+x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_40, 0, x_36);
+lean::closure_set(x_40, 1, x_5);
+lean::closure_set(x_40, 2, x_39);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_40);
+lean::cnstr_set(x_41, 1, x_9);
+lean::inc(x_10);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_10);
+lean::cnstr_set(x_43, 1, x_41);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_34);
+lean::cnstr_set(x_44, 1, x_43);
+x_45 = l_lean_parser_command_struct__implicit__binder;
+x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_46, 0, x_45);
+lean::closure_set(x_46, 1, x_44);
+x_47 = lean::mk_string("\xe2\xa6\x83");
+x_48 = l_string_trim(x_47);
+lean::dec(x_47);
+lean::inc(x_48);
 x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_51, 0, x_49);
+lean::closure_set(x_51, 0, x_48);
 x_52 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_52, 0, x_49);
-lean::closure_set(x_52, 1, x_4);
+lean::closure_set(x_52, 0, x_48);
+lean::closure_set(x_52, 1, x_5);
 lean::closure_set(x_52, 2, x_51);
-x_53 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_53, 0, x_52);
-lean::cnstr_set(x_53, 1, x_8);
-lean::inc(x_9);
-x_55 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_55, 0, x_9);
-lean::cnstr_set(x_55, 1, x_53);
-x_56 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_56, 0, x_47);
-lean::cnstr_set(x_56, 1, x_55);
-x_57 = l_lean_parser_command_strict__implicit__binder;
-x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_58, 0, x_57);
-lean::closure_set(x_58, 1, x_56);
-x_59 = lean::mk_string("[");
-x_60 = l_string_trim(x_59);
-lean::inc(x_60);
-x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_62, 0, x_60);
-x_63 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_63, 0, x_60);
-lean::closure_set(x_63, 1, x_4);
-lean::closure_set(x_63, 2, x_62);
-x_64 = lean::mk_string("]");
-x_65 = l_string_trim(x_64);
-lean::inc(x_65);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_67, 0, x_65);
-x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_68, 0, x_65);
-lean::closure_set(x_68, 1, x_4);
-lean::closure_set(x_68, 2, x_67);
-x_69 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_69, 0, x_68);
-lean::cnstr_set(x_69, 1, x_8);
-x_70 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_70, 0, x_9);
-lean::cnstr_set(x_70, 1, x_69);
-x_71 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_71, 0, x_63);
-lean::cnstr_set(x_71, 1, x_70);
-x_72 = l_lean_parser_command_inst__implicit__binder;
-x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_73, 0, x_72);
-lean::closure_set(x_73, 1, x_71);
-x_74 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_74, 0, x_73);
-lean::cnstr_set(x_74, 1, x_8);
-x_75 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_75, 0, x_58);
-lean::cnstr_set(x_75, 1, x_74);
-x_76 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_76, 0, x_42);
-lean::cnstr_set(x_76, 1, x_75);
+x_53 = lean::mk_string("\xe2\xa6\x84");
+x_54 = l_string_trim(x_53);
+lean::dec(x_53);
+lean::inc(x_54);
+x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_57, 0, x_54);
+x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_58, 0, x_54);
+lean::closure_set(x_58, 1, x_5);
+lean::closure_set(x_58, 2, x_57);
+x_59 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_59, 0, x_58);
+lean::cnstr_set(x_59, 1, x_9);
+lean::inc(x_10);
+x_61 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_61, 0, x_10);
+lean::cnstr_set(x_61, 1, x_59);
+x_62 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_62, 0, x_52);
+lean::cnstr_set(x_62, 1, x_61);
+x_63 = l_lean_parser_command_strict__implicit__binder;
+x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_64, 0, x_63);
+lean::closure_set(x_64, 1, x_62);
+x_65 = lean::mk_string("[");
+x_66 = l_string_trim(x_65);
+lean::dec(x_65);
+lean::inc(x_66);
+x_69 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_69, 0, x_66);
+x_70 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_70, 0, x_66);
+lean::closure_set(x_70, 1, x_5);
+lean::closure_set(x_70, 2, x_69);
+x_71 = lean::mk_string("]");
+x_72 = l_string_trim(x_71);
+lean::dec(x_71);
+lean::inc(x_72);
+x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_75, 0, x_72);
+x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_76, 0, x_72);
+lean::closure_set(x_76, 1, x_5);
+lean::closure_set(x_76, 2, x_75);
 x_77 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_77, 0, x_26);
-lean::cnstr_set(x_77, 1, x_76);
-x_78 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_78, 0, x_77);
-lean::closure_set(x_78, 1, x_4);
+lean::cnstr_set(x_77, 0, x_76);
+lean::cnstr_set(x_77, 1, x_9);
+x_78 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_78, 0, x_10);
+lean::cnstr_set(x_78, 1, x_77);
 x_79 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_79, 0, x_78);
-lean::cnstr_set(x_79, 1, x_8);
-x_80 = l_lean_parser_command__parser__m_monad___closed__1;
-x_81 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_82 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_83 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_84 = l_lean_parser_command_structure__field__block;
-x_85 = l_lean_parser_command_structure__field__block_has__view;
-x_86 = l_lean_parser_combinators_node_view___rarg(x_80, x_81, x_82, x_83, x_84, x_79, x_85);
-lean::dec(x_79);
-return x_86;
+lean::cnstr_set(x_79, 0, x_70);
+lean::cnstr_set(x_79, 1, x_78);
+x_80 = l_lean_parser_command_inst__implicit__binder;
+x_81 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_81, 0, x_80);
+lean::closure_set(x_81, 1, x_79);
+x_82 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_82, 0, x_81);
+lean::cnstr_set(x_82, 1, x_9);
+x_83 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_83, 0, x_64);
+lean::cnstr_set(x_83, 1, x_82);
+x_84 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_84, 0, x_46);
+lean::cnstr_set(x_84, 1, x_83);
+x_85 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_85, 0, x_28);
+lean::cnstr_set(x_85, 1, x_84);
+x_86 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_86, 0, x_85);
+lean::closure_set(x_86, 1, x_5);
+x_87 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_87, 0, x_86);
+lean::cnstr_set(x_87, 1, x_9);
+x_88 = l_lean_parser_command__parser__m_monad___closed__1;
+x_89 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_90 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_91 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_92 = l_lean_parser_command_structure__field__block;
+x_93 = l_lean_parser_command_structure__field__block_has__view;
+x_94 = l_lean_parser_combinators_node_view___rarg(x_88, x_89, x_90, x_91, x_92, x_87, x_93);
+lean::dec(x_87);
+return x_94;
 }
 }
 obj* _init_l_lean_parser_command_structure__field__block_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_35; obj* x_36; obj* x_37; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_51; obj* x_52; obj* x_53; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_57; obj* x_58; obj* x_59; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_87; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_struct__binder__content_parser), 4, 0);
-lean::inc(x_9);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_9);
-lean::cnstr_set(x_11, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_struct__binder__content_parser), 4, 0);
+lean::inc(x_10);
 x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_7);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_13, 0, x_12);
-lean::closure_set(x_13, 1, x_4);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_13);
-lean::cnstr_set(x_14, 1, x_8);
-x_15 = l_lean_parser_command_struct__explicit__binder__content;
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_16, 0, x_15);
-lean::closure_set(x_16, 1, x_14);
-x_17 = lean::mk_string(")");
-x_18 = l_string_trim(x_17);
-lean::inc(x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_20, 0, x_18);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_21, 0, x_18);
-lean::closure_set(x_21, 1, x_4);
-lean::closure_set(x_21, 2, x_20);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_8);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_16);
-lean::cnstr_set(x_23, 1, x_22);
+lean::cnstr_set(x_12, 0, x_10);
+lean::cnstr_set(x_12, 1, x_9);
+x_13 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_13, 0, x_8);
+lean::cnstr_set(x_13, 1, x_12);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_14, 0, x_13);
+lean::closure_set(x_14, 1, x_5);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_14);
+lean::cnstr_set(x_15, 1, x_9);
+x_16 = l_lean_parser_command_struct__explicit__binder__content;
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_17, 0, x_16);
+lean::closure_set(x_17, 1, x_15);
+x_18 = lean::mk_string(")");
+x_19 = l_string_trim(x_18);
+lean::dec(x_18);
+lean::inc(x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_22, 0, x_19);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_23, 0, x_19);
+lean::closure_set(x_23, 1, x_5);
+lean::closure_set(x_23, 2, x_22);
 x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_5);
-lean::cnstr_set(x_24, 1, x_23);
-x_25 = l_lean_parser_command_struct__explicit__binder;
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_26, 0, x_25);
-lean::closure_set(x_26, 1, x_24);
-x_27 = lean::mk_string("{");
-x_28 = l_string_trim(x_27);
-lean::inc(x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_30, 0, x_28);
-x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_31, 0, x_28);
-lean::closure_set(x_31, 1, x_4);
-lean::closure_set(x_31, 2, x_30);
-x_32 = lean::mk_string("}");
-x_33 = l_string_trim(x_32);
-lean::inc(x_33);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_35, 0, x_33);
-x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_36, 0, x_33);
-lean::closure_set(x_36, 1, x_4);
-lean::closure_set(x_36, 2, x_35);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_36);
-lean::cnstr_set(x_37, 1, x_8);
-lean::inc(x_9);
-x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_9);
-lean::cnstr_set(x_39, 1, x_37);
-x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_31);
-lean::cnstr_set(x_40, 1, x_39);
-x_41 = l_lean_parser_command_struct__implicit__binder;
-x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_42, 0, x_41);
-lean::closure_set(x_42, 1, x_40);
-x_43 = lean::mk_string("\xe2\xa6\x83");
-x_44 = l_string_trim(x_43);
-lean::inc(x_44);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_46, 0, x_44);
-x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_47, 0, x_44);
-lean::closure_set(x_47, 1, x_4);
-lean::closure_set(x_47, 2, x_46);
-x_48 = lean::mk_string("\xe2\xa6\x84");
-x_49 = l_string_trim(x_48);
-lean::inc(x_49);
+lean::cnstr_set(x_24, 0, x_23);
+lean::cnstr_set(x_24, 1, x_9);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_17);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_6);
+lean::cnstr_set(x_26, 1, x_25);
+x_27 = l_lean_parser_command_struct__explicit__binder;
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_28, 0, x_27);
+lean::closure_set(x_28, 1, x_26);
+x_29 = lean::mk_string("{");
+x_30 = l_string_trim(x_29);
+lean::dec(x_29);
+lean::inc(x_30);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_33, 0, x_30);
+x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_34, 0, x_30);
+lean::closure_set(x_34, 1, x_5);
+lean::closure_set(x_34, 2, x_33);
+x_35 = lean::mk_string("}");
+x_36 = l_string_trim(x_35);
+lean::dec(x_35);
+lean::inc(x_36);
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_39, 0, x_36);
+x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_40, 0, x_36);
+lean::closure_set(x_40, 1, x_5);
+lean::closure_set(x_40, 2, x_39);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_40);
+lean::cnstr_set(x_41, 1, x_9);
+lean::inc(x_10);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_10);
+lean::cnstr_set(x_43, 1, x_41);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_34);
+lean::cnstr_set(x_44, 1, x_43);
+x_45 = l_lean_parser_command_struct__implicit__binder;
+x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_46, 0, x_45);
+lean::closure_set(x_46, 1, x_44);
+x_47 = lean::mk_string("\xe2\xa6\x83");
+x_48 = l_string_trim(x_47);
+lean::dec(x_47);
+lean::inc(x_48);
 x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_51, 0, x_49);
+lean::closure_set(x_51, 0, x_48);
 x_52 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_52, 0, x_49);
-lean::closure_set(x_52, 1, x_4);
+lean::closure_set(x_52, 0, x_48);
+lean::closure_set(x_52, 1, x_5);
 lean::closure_set(x_52, 2, x_51);
-x_53 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_53, 0, x_52);
-lean::cnstr_set(x_53, 1, x_8);
-lean::inc(x_9);
-x_55 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_55, 0, x_9);
-lean::cnstr_set(x_55, 1, x_53);
-x_56 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_56, 0, x_47);
-lean::cnstr_set(x_56, 1, x_55);
-x_57 = l_lean_parser_command_strict__implicit__binder;
-x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_58, 0, x_57);
-lean::closure_set(x_58, 1, x_56);
-x_59 = lean::mk_string("[");
-x_60 = l_string_trim(x_59);
-lean::inc(x_60);
-x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_62, 0, x_60);
-x_63 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_63, 0, x_60);
-lean::closure_set(x_63, 1, x_4);
-lean::closure_set(x_63, 2, x_62);
-x_64 = lean::mk_string("]");
-x_65 = l_string_trim(x_64);
-lean::inc(x_65);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_67, 0, x_65);
-x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_68, 0, x_65);
-lean::closure_set(x_68, 1, x_4);
-lean::closure_set(x_68, 2, x_67);
-x_69 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_69, 0, x_68);
-lean::cnstr_set(x_69, 1, x_8);
-x_70 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_70, 0, x_9);
-lean::cnstr_set(x_70, 1, x_69);
-x_71 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_71, 0, x_63);
-lean::cnstr_set(x_71, 1, x_70);
-x_72 = l_lean_parser_command_inst__implicit__binder;
-x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_73, 0, x_72);
-lean::closure_set(x_73, 1, x_71);
-x_74 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_74, 0, x_73);
-lean::cnstr_set(x_74, 1, x_8);
-x_75 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_75, 0, x_58);
-lean::cnstr_set(x_75, 1, x_74);
-x_76 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_76, 0, x_42);
-lean::cnstr_set(x_76, 1, x_75);
+x_53 = lean::mk_string("\xe2\xa6\x84");
+x_54 = l_string_trim(x_53);
+lean::dec(x_53);
+lean::inc(x_54);
+x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_57, 0, x_54);
+x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_58, 0, x_54);
+lean::closure_set(x_58, 1, x_5);
+lean::closure_set(x_58, 2, x_57);
+x_59 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_59, 0, x_58);
+lean::cnstr_set(x_59, 1, x_9);
+lean::inc(x_10);
+x_61 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_61, 0, x_10);
+lean::cnstr_set(x_61, 1, x_59);
+x_62 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_62, 0, x_52);
+lean::cnstr_set(x_62, 1, x_61);
+x_63 = l_lean_parser_command_strict__implicit__binder;
+x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_64, 0, x_63);
+lean::closure_set(x_64, 1, x_62);
+x_65 = lean::mk_string("[");
+x_66 = l_string_trim(x_65);
+lean::dec(x_65);
+lean::inc(x_66);
+x_69 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_69, 0, x_66);
+x_70 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_70, 0, x_66);
+lean::closure_set(x_70, 1, x_5);
+lean::closure_set(x_70, 2, x_69);
+x_71 = lean::mk_string("]");
+x_72 = l_string_trim(x_71);
+lean::dec(x_71);
+lean::inc(x_72);
+x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_75, 0, x_72);
+x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_76, 0, x_72);
+lean::closure_set(x_76, 1, x_5);
+lean::closure_set(x_76, 2, x_75);
 x_77 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_77, 0, x_26);
-lean::cnstr_set(x_77, 1, x_76);
-x_78 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_78, 0, x_77);
-lean::closure_set(x_78, 1, x_4);
+lean::cnstr_set(x_77, 0, x_76);
+lean::cnstr_set(x_77, 1, x_9);
+x_78 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_78, 0, x_10);
+lean::cnstr_set(x_78, 1, x_77);
 x_79 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_79, 0, x_78);
-lean::cnstr_set(x_79, 1, x_8);
-return x_79;
+lean::cnstr_set(x_79, 0, x_70);
+lean::cnstr_set(x_79, 1, x_78);
+x_80 = l_lean_parser_command_inst__implicit__binder;
+x_81 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_81, 0, x_80);
+lean::closure_set(x_81, 1, x_79);
+x_82 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_82, 0, x_81);
+lean::cnstr_set(x_82, 1, x_9);
+x_83 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_83, 0, x_64);
+lean::cnstr_set(x_83, 1, x_82);
+x_84 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_84, 0, x_46);
+lean::cnstr_set(x_84, 1, x_83);
+x_85 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_85, 0, x_28);
+lean::cnstr_set(x_85, 1, x_84);
+x_86 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_86, 0, x_85);
+lean::closure_set(x_86, 1, x_5);
+x_87 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_87, 0, x_86);
+lean::cnstr_set(x_87, 1, x_9);
+return x_87;
 }
 }
 obj* l_lean_parser_command_structure__field__block_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -23565,111 +23643,117 @@ return x_0;
 obj* _init_l_lean_parser_command_old__univ__params_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_12; obj* x_15; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_14; obj* x_17; 
 x_0 = lean::mk_string("{");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = lean::mk_string("}");
-x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_1);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_3);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = lean::mk_string("}");
+x_7 = l_lean_parser_symbol_tokens___rarg(x_6, x_1);
 lean::dec(x_6);
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_4, x_7);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_7, x_4);
 lean::dec(x_7);
-lean::dec(x_4);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_2, x_9);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_5, x_9);
 lean::dec(x_9);
+lean::dec(x_5);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_2, x_11);
+lean::dec(x_11);
 lean::dec(x_2);
-x_15 = l_lean_parser_tokens___rarg(x_12);
-lean::dec(x_12);
-return x_15;
+x_17 = l_lean_parser_tokens___rarg(x_14);
+lean::dec(x_14);
+return x_17;
 }
 }
 obj* _init_l_lean_parser_command_old__univ__params_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; 
 x_0 = lean::mk_string("{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string("}");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_4);
-lean::closure_set(x_12, 2, x_11);
-x_13 = lean::box(0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_12);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_7);
-lean::cnstr_set(x_15, 1, x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string("}");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_5);
+lean::closure_set(x_14, 2, x_13);
+x_15 = lean::box(0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_5);
+lean::cnstr_set(x_16, 0, x_14);
 lean::cnstr_set(x_16, 1, x_15);
-x_17 = l_lean_parser_command__parser__m_monad___closed__1;
-x_18 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_19 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_20 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_21 = l_lean_parser_command_old__univ__params;
-x_22 = l_lean_parser_command_old__univ__params_has__view;
-x_23 = l_lean_parser_combinators_node_view___rarg(x_17, x_18, x_19, x_20, x_21, x_16, x_22);
-lean::dec(x_16);
-return x_23;
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_8);
+lean::cnstr_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_6);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = l_lean_parser_command__parser__m_monad___closed__1;
+x_20 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_21 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_22 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_23 = l_lean_parser_command_old__univ__params;
+x_24 = l_lean_parser_command_old__univ__params_has__view;
+x_25 = l_lean_parser_combinators_node_view___rarg(x_19, x_20, x_21, x_22, x_23, x_18, x_24);
+lean::dec(x_18);
+return x_25;
 }
 }
 obj* _init_l_lean_parser_command_old__univ__params_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; 
 x_0 = lean::mk_string("{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string("}");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_4);
-lean::closure_set(x_12, 2, x_11);
-x_13 = lean::box(0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_12);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_7);
-lean::cnstr_set(x_15, 1, x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string("}");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_5);
+lean::closure_set(x_14, 2, x_13);
+x_15 = lean::box(0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_5);
+lean::cnstr_set(x_16, 0, x_14);
 lean::cnstr_set(x_16, 1, x_15);
-return x_16;
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_8);
+lean::cnstr_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_6);
+lean::cnstr_set(x_18, 1, x_17);
+return x_18;
 }
 }
 obj* l_lean_parser_command_old__univ__params_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -25268,145 +25352,151 @@ return x_0;
 obj* _init_l_lean_parser_command_ident__univ__params_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_12; obj* x_15; obj* x_17; obj* x_19; obj* x_21; obj* x_23; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_14; obj* x_17; obj* x_19; obj* x_21; obj* x_23; obj* x_25; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(".{");
 x_2 = lean::mk_nat_obj(0u);
 x_3 = l_lean_parser_symbol_tokens___rarg(x_1, x_2);
-x_4 = l_lean_parser_tokens___rarg(x_0);
-x_5 = lean::mk_string("}");
-x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_2);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_0);
+lean::dec(x_1);
+x_5 = l_lean_parser_tokens___rarg(x_0);
+x_6 = lean::mk_string("}");
+x_7 = l_lean_parser_symbol_tokens___rarg(x_6, x_2);
 lean::dec(x_6);
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_4, x_7);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_7, x_0);
 lean::dec(x_7);
-lean::dec(x_4);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_3, x_9);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_5, x_9);
 lean::dec(x_9);
+lean::dec(x_5);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_3, x_11);
+lean::dec(x_11);
 lean::dec(x_3);
-x_15 = l_lean_parser_tokens___rarg(x_12);
-lean::dec(x_12);
-x_17 = l_lean_parser_tokens___rarg(x_15);
-lean::dec(x_15);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_17, x_0);
+x_17 = l_lean_parser_tokens___rarg(x_14);
+lean::dec(x_14);
+x_19 = l_lean_parser_tokens___rarg(x_17);
 lean::dec(x_17);
-x_21 = l_lean_parser_list_cons_tokens___rarg(x_0, x_19);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_19, x_0);
 lean::dec(x_19);
-x_23 = l_lean_parser_tokens___rarg(x_21);
+x_23 = l_lean_parser_list_cons_tokens___rarg(x_0, x_21);
 lean::dec(x_21);
-return x_23;
+x_25 = l_lean_parser_tokens___rarg(x_23);
+lean::dec(x_23);
+return x_25;
 }
 }
 obj* _init_l_lean_parser_command_ident__univ__params_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; 
 x_0 = lean::mk_string(".{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-lean::inc(x_6);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_8, 0, x_6);
-x_9 = lean::mk_string("}");
-x_10 = l_string_trim(x_9);
-lean::inc(x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_12, 0, x_10);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_13, 0, x_10);
-lean::closure_set(x_13, 1, x_4);
-lean::closure_set(x_13, 2, x_12);
-x_14 = lean::box(0);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_13);
-lean::cnstr_set(x_15, 1, x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_8);
-lean::cnstr_set(x_16, 1, x_15);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+lean::inc(x_7);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_9, 0, x_7);
+x_10 = lean::mk_string("}");
+x_11 = l_string_trim(x_10);
+lean::dec(x_10);
+lean::inc(x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_14, 0, x_11);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_15, 0, x_11);
+lean::closure_set(x_15, 1, x_5);
+lean::closure_set(x_15, 2, x_14);
+x_16 = lean::box(0);
 x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_5);
+lean::cnstr_set(x_17, 0, x_15);
 lean::cnstr_set(x_17, 1, x_16);
-x_18 = l_lean_parser_command_univ__params;
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_19, 0, x_18);
-lean::closure_set(x_19, 1, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_20, 0, x_19);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_14);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_6);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = l_lean_parser_command__parser__m_monad___closed__1;
-x_24 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_25 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_26 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_27 = l_lean_parser_command_ident__univ__params;
-x_28 = l_lean_parser_command_ident__univ__params_has__view;
-x_29 = l_lean_parser_combinators_node_view___rarg(x_23, x_24, x_25, x_26, x_27, x_22, x_28);
-lean::dec(x_22);
-return x_29;
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_9);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_6);
+lean::cnstr_set(x_19, 1, x_18);
+x_20 = l_lean_parser_command_univ__params;
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_21, 0, x_20);
+lean::closure_set(x_21, 1, x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_22, 0, x_21);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_16);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_7);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = l_lean_parser_command__parser__m_monad___closed__1;
+x_26 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_27 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_28 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_29 = l_lean_parser_command_ident__univ__params;
+x_30 = l_lean_parser_command_ident__univ__params_has__view;
+x_31 = l_lean_parser_combinators_node_view___rarg(x_25, x_26, x_27, x_28, x_29, x_24, x_30);
+lean::dec(x_24);
+return x_31;
 }
 }
 obj* _init_l_lean_parser_command_ident__univ__params_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
 x_0 = lean::mk_string(".{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-lean::inc(x_6);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
-lean::closure_set(x_8, 0, x_6);
-x_9 = lean::mk_string("}");
-x_10 = l_string_trim(x_9);
-lean::inc(x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_12, 0, x_10);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_13, 0, x_10);
-lean::closure_set(x_13, 1, x_4);
-lean::closure_set(x_13, 2, x_12);
-x_14 = lean::box(0);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_13);
-lean::cnstr_set(x_15, 1, x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_8);
-lean::cnstr_set(x_16, 1, x_15);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
+lean::inc(x_7);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__3), 5, 1);
+lean::closure_set(x_9, 0, x_7);
+x_10 = lean::mk_string("}");
+x_11 = l_string_trim(x_10);
+lean::dec(x_10);
+lean::inc(x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_14, 0, x_11);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_15, 0, x_11);
+lean::closure_set(x_15, 1, x_5);
+lean::closure_set(x_15, 2, x_14);
+x_16 = lean::box(0);
 x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_5);
+lean::cnstr_set(x_17, 0, x_15);
 lean::cnstr_set(x_17, 1, x_16);
-x_18 = l_lean_parser_command_univ__params;
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_19, 0, x_18);
-lean::closure_set(x_19, 1, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_20, 0, x_19);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_14);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_6);
-lean::cnstr_set(x_22, 1, x_21);
-return x_22;
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_9);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_6);
+lean::cnstr_set(x_19, 1, x_18);
+x_20 = l_lean_parser_command_univ__params;
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_21, 0, x_20);
+lean::closure_set(x_21, 1, x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_22, 0, x_21);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_16);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_7);
+lean::cnstr_set(x_24, 1, x_23);
+return x_24;
 }
 }
 obj* l_lean_parser_command_ident__univ__params_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -28887,401 +28977,419 @@ return x_0;
 obj* _init_l_lean_parser_command_structure_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; obj* x_13; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_28; obj* x_30; obj* x_33; obj* x_35; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_45; obj* x_48; obj* x_50; obj* x_52; obj* x_54; obj* x_55; obj* x_56; obj* x_58; obj* x_61; obj* x_64; obj* x_67; obj* x_68; obj* x_70; obj* x_71; obj* x_73; obj* x_76; obj* x_79; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_29; obj* x_32; obj* x_34; obj* x_37; obj* x_39; obj* x_41; obj* x_42; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_49; obj* x_51; obj* x_54; obj* x_56; obj* x_58; obj* x_60; obj* x_61; obj* x_62; obj* x_64; obj* x_67; obj* x_70; obj* x_73; obj* x_74; obj* x_76; obj* x_77; obj* x_79; obj* x_82; obj* x_85; 
 x_0 = lean::mk_string("structure");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string("class");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
+lean::dec(x_0);
+x_4 = lean::mk_string("class");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
-lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
+x_7 = lean::box(0);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_5, x_7);
+lean::dec(x_5);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_2, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_11, x_5);
-lean::dec(x_11);
-x_15 = l_lean_parser_tokens___rarg(x_13);
+lean::dec(x_2);
+x_13 = l_lean_parser_tokens___rarg(x_10);
+lean::dec(x_10);
+x_15 = l_lean_parser_list_cons_tokens___rarg(x_13, x_7);
 lean::dec(x_13);
-x_17 = l_lean_parser_command_old__univ__params_parser_lean_parser_has__tokens;
-x_18 = l_lean_parser_tokens___rarg(x_17);
-x_19 = lean::mk_string("extends");
-x_20 = l_lean_parser_symbol_tokens___rarg(x_19, x_1);
-x_21 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_22 = l_lean_parser_tokens___rarg(x_21);
-x_23 = lean::mk_string(",");
-x_24 = l_lean_parser_symbol_tokens___rarg(x_23, x_1);
-x_25 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_22, x_24);
-lean::dec(x_24);
-lean::dec(x_22);
-x_28 = l_lean_parser_list_cons_tokens___rarg(x_25, x_5);
-lean::dec(x_25);
-x_30 = l_lean_parser_list_cons_tokens___rarg(x_20, x_28);
-lean::dec(x_28);
-lean::dec(x_20);
-x_33 = l_lean_parser_tokens___rarg(x_30);
-lean::dec(x_30);
-x_35 = l_lean_parser_tokens___rarg(x_33);
-lean::dec(x_33);
-x_37 = lean::mk_string(":=");
-x_38 = l_lean_parser_symbol_tokens___rarg(x_37, x_1);
-x_39 = l_lean_parser_command_infer__modifier_parser_lean_parser_has__tokens;
-x_40 = l_lean_parser_tokens___rarg(x_39);
-x_41 = lean::mk_string("::");
-x_42 = l_lean_parser_symbol_tokens___rarg(x_41, x_1);
-x_43 = l_lean_parser_list_cons_tokens___rarg(x_42, x_5);
-lean::dec(x_42);
-x_45 = l_lean_parser_list_cons_tokens___rarg(x_40, x_43);
-lean::dec(x_43);
-lean::dec(x_40);
-x_48 = l_lean_parser_list_cons_tokens___rarg(x_5, x_45);
-lean::dec(x_45);
-x_50 = l_lean_parser_tokens___rarg(x_48);
-lean::dec(x_48);
-x_52 = l_lean_parser_tokens___rarg(x_50);
-lean::dec(x_50);
-x_54 = l_lean_parser_command_structure__field__block_parser_lean_parser_has__tokens;
-x_55 = l_lean_parser_tokens___rarg(x_54);
-x_56 = l_lean_parser_list_cons_tokens___rarg(x_55, x_5);
-lean::dec(x_55);
-x_58 = l_lean_parser_list_cons_tokens___rarg(x_52, x_56);
-lean::dec(x_56);
-lean::dec(x_52);
-x_61 = l_lean_parser_list_cons_tokens___rarg(x_38, x_58);
-lean::dec(x_58);
-lean::dec(x_38);
-x_64 = l_lean_parser_list_cons_tokens___rarg(x_35, x_61);
-lean::dec(x_61);
-lean::dec(x_35);
-x_67 = l_lean_parser_command_opt__decl__sig_parser_lean_parser_has__tokens;
-x_68 = l_lean_parser_list_cons_tokens___rarg(x_67, x_64);
-lean::dec(x_64);
-x_70 = l_lean_parser_command_ident__univ__params_parser_lean_parser_has__tokens;
-x_71 = l_lean_parser_list_cons_tokens___rarg(x_70, x_68);
-lean::dec(x_68);
-x_73 = l_lean_parser_list_cons_tokens___rarg(x_18, x_71);
-lean::dec(x_71);
-lean::dec(x_18);
-x_76 = l_lean_parser_list_cons_tokens___rarg(x_15, x_73);
-lean::dec(x_73);
+x_17 = l_lean_parser_tokens___rarg(x_15);
 lean::dec(x_15);
-x_79 = l_lean_parser_tokens___rarg(x_76);
-lean::dec(x_76);
-return x_79;
+x_19 = l_lean_parser_command_old__univ__params_parser_lean_parser_has__tokens;
+x_20 = l_lean_parser_tokens___rarg(x_19);
+x_21 = lean::mk_string("extends");
+x_22 = l_lean_parser_symbol_tokens___rarg(x_21, x_1);
+lean::dec(x_21);
+x_24 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_25 = l_lean_parser_tokens___rarg(x_24);
+x_26 = lean::mk_string(",");
+x_27 = l_lean_parser_symbol_tokens___rarg(x_26, x_1);
+lean::dec(x_26);
+x_29 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_25, x_27);
+lean::dec(x_27);
+lean::dec(x_25);
+x_32 = l_lean_parser_list_cons_tokens___rarg(x_29, x_7);
+lean::dec(x_29);
+x_34 = l_lean_parser_list_cons_tokens___rarg(x_22, x_32);
+lean::dec(x_32);
+lean::dec(x_22);
+x_37 = l_lean_parser_tokens___rarg(x_34);
+lean::dec(x_34);
+x_39 = l_lean_parser_tokens___rarg(x_37);
+lean::dec(x_37);
+x_41 = lean::mk_string(":=");
+x_42 = l_lean_parser_symbol_tokens___rarg(x_41, x_1);
+lean::dec(x_41);
+x_44 = l_lean_parser_command_infer__modifier_parser_lean_parser_has__tokens;
+x_45 = l_lean_parser_tokens___rarg(x_44);
+x_46 = lean::mk_string("::");
+x_47 = l_lean_parser_symbol_tokens___rarg(x_46, x_1);
+lean::dec(x_46);
+x_49 = l_lean_parser_list_cons_tokens___rarg(x_47, x_7);
+lean::dec(x_47);
+x_51 = l_lean_parser_list_cons_tokens___rarg(x_45, x_49);
+lean::dec(x_49);
+lean::dec(x_45);
+x_54 = l_lean_parser_list_cons_tokens___rarg(x_7, x_51);
+lean::dec(x_51);
+x_56 = l_lean_parser_tokens___rarg(x_54);
+lean::dec(x_54);
+x_58 = l_lean_parser_tokens___rarg(x_56);
+lean::dec(x_56);
+x_60 = l_lean_parser_command_structure__field__block_parser_lean_parser_has__tokens;
+x_61 = l_lean_parser_tokens___rarg(x_60);
+x_62 = l_lean_parser_list_cons_tokens___rarg(x_61, x_7);
+lean::dec(x_61);
+x_64 = l_lean_parser_list_cons_tokens___rarg(x_58, x_62);
+lean::dec(x_62);
+lean::dec(x_58);
+x_67 = l_lean_parser_list_cons_tokens___rarg(x_42, x_64);
+lean::dec(x_64);
+lean::dec(x_42);
+x_70 = l_lean_parser_list_cons_tokens___rarg(x_39, x_67);
+lean::dec(x_67);
+lean::dec(x_39);
+x_73 = l_lean_parser_command_opt__decl__sig_parser_lean_parser_has__tokens;
+x_74 = l_lean_parser_list_cons_tokens___rarg(x_73, x_70);
+lean::dec(x_70);
+x_76 = l_lean_parser_command_ident__univ__params_parser_lean_parser_has__tokens;
+x_77 = l_lean_parser_list_cons_tokens___rarg(x_76, x_74);
+lean::dec(x_74);
+x_79 = l_lean_parser_list_cons_tokens___rarg(x_20, x_77);
+lean::dec(x_77);
+lean::dec(x_20);
+x_82 = l_lean_parser_list_cons_tokens___rarg(x_17, x_79);
+lean::dec(x_79);
+lean::dec(x_17);
+x_85 = l_lean_parser_tokens___rarg(x_82);
+lean::dec(x_82);
+return x_85;
 }
 }
 obj* _init_l_lean_parser_command_structure_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; uint8 x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_34; obj* x_35; uint8 x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; 
 x_0 = lean::mk_string("structure");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("class");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_14, 0, x_13);
-lean::closure_set(x_14, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("class");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
 x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_14);
-lean::cnstr_set(x_15, 1, x_11);
-x_16 = l_lean_parser_command_structure__kw;
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_17, 0, x_16);
-lean::closure_set(x_17, 1, x_15);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_old__univ__params_parser), 4, 0);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_16, 0, x_15);
+lean::closure_set(x_16, 1, x_5);
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_16);
+lean::cnstr_set(x_17, 1, x_13);
+x_18 = l_lean_parser_command_structure__kw;
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
 lean::closure_set(x_19, 0, x_18);
-x_20 = lean::mk_string("extends");
-x_21 = l_string_trim(x_20);
-lean::inc(x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_23, 0, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_24, 0, x_21);
-lean::closure_set(x_24, 1, x_4);
-lean::closure_set(x_24, 2, x_23);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_25, 0, x_4);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_26, 0, x_25);
-x_27 = lean::mk_string(",");
-x_28 = l_string_trim(x_27);
-lean::inc(x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_30, 0, x_28);
-x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_31, 0, x_28);
-lean::closure_set(x_31, 1, x_4);
-lean::closure_set(x_31, 2, x_30);
-x_32 = 1;
-x_33 = lean::box(x_32);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_34, 0, x_26);
-lean::closure_set(x_34, 1, x_31);
-lean::closure_set(x_34, 2, x_33);
-x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_34);
-lean::cnstr_set(x_35, 1, x_11);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_24);
-lean::cnstr_set(x_36, 1, x_35);
-x_37 = l_lean_parser_command_extends;
-x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_38, 0, x_37);
-lean::closure_set(x_38, 1, x_36);
-x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_39, 0, x_38);
-x_40 = lean::mk_string(":=");
-x_41 = l_string_trim(x_40);
-lean::inc(x_41);
-x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_43, 0, x_41);
-x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_44, 0, x_41);
-lean::closure_set(x_44, 1, x_4);
-lean::closure_set(x_44, 2, x_43);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser), 4, 0);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_46, 0, x_45);
-x_47 = lean::mk_string("::");
-x_48 = l_string_trim(x_47);
-lean::inc(x_48);
-x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_50, 0, x_48);
-x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_51, 0, x_48);
-lean::closure_set(x_51, 1, x_4);
-lean::closure_set(x_51, 2, x_50);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_51);
-lean::cnstr_set(x_52, 1, x_11);
-x_53 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_53, 0, x_46);
-lean::cnstr_set(x_53, 1, x_52);
-x_54 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_55 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_55, 0, x_54);
-lean::cnstr_set(x_55, 1, x_53);
-x_56 = l_lean_parser_command_structure__ctor;
-x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_57, 0, x_56);
-lean::closure_set(x_57, 1, x_55);
-x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_58, 0, x_57);
-x_59 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_structure__field__block_parser), 4, 0);
-x_60 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
-lean::closure_set(x_60, 0, x_59);
+lean::closure_set(x_19, 1, x_17);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_old__univ__params_parser), 4, 0);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_21, 0, x_20);
+x_22 = lean::mk_string("extends");
+x_23 = l_string_trim(x_22);
+lean::dec(x_22);
+lean::inc(x_23);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_26, 0, x_23);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_27, 0, x_23);
+lean::closure_set(x_27, 1, x_5);
+lean::closure_set(x_27, 2, x_26);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_28, 0, x_5);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_29, 0, x_28);
+x_30 = lean::mk_string(",");
+x_31 = l_string_trim(x_30);
+lean::dec(x_30);
+lean::inc(x_31);
+x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_34, 0, x_31);
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_35, 0, x_31);
+lean::closure_set(x_35, 1, x_5);
+lean::closure_set(x_35, 2, x_34);
+x_36 = 1;
+x_37 = lean::box(x_36);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_38, 0, x_29);
+lean::closure_set(x_38, 1, x_35);
+lean::closure_set(x_38, 2, x_37);
+x_39 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_39, 0, x_38);
+lean::cnstr_set(x_39, 1, x_13);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_27);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = l_lean_parser_command_extends;
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_42, 0, x_41);
+lean::closure_set(x_42, 1, x_40);
+x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_43, 0, x_42);
+x_44 = lean::mk_string(":=");
+x_45 = l_string_trim(x_44);
+lean::dec(x_44);
+lean::inc(x_45);
+x_48 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_48, 0, x_45);
+x_49 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_49, 0, x_45);
+lean::closure_set(x_49, 1, x_5);
+lean::closure_set(x_49, 2, x_48);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser), 4, 0);
+x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_51, 0, x_50);
+x_52 = lean::mk_string("::");
+x_53 = l_string_trim(x_52);
+lean::dec(x_52);
+lean::inc(x_53);
+x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_56, 0, x_53);
+x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_57, 0, x_53);
+lean::closure_set(x_57, 1, x_5);
+lean::closure_set(x_57, 2, x_56);
+x_58 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_58, 0, x_57);
+lean::cnstr_set(x_58, 1, x_13);
+x_59 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_59, 0, x_51);
+lean::cnstr_set(x_59, 1, x_58);
+x_60 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
 x_61 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_61, 0, x_60);
-lean::cnstr_set(x_61, 1, x_11);
-x_62 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_62, 0, x_58);
-lean::cnstr_set(x_62, 1, x_61);
-x_63 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_63, 0, x_44);
-lean::cnstr_set(x_63, 1, x_62);
-x_64 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_64, 0, x_39);
-lean::cnstr_set(x_64, 1, x_63);
-x_65 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
-x_66 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_66, 0, x_65);
-lean::cnstr_set(x_66, 1, x_64);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_ident__univ__params_parser), 4, 0);
+lean::cnstr_set(x_61, 1, x_59);
+x_62 = l_lean_parser_command_structure__ctor;
+x_63 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_63, 0, x_62);
+lean::closure_set(x_63, 1, x_61);
+x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_64, 0, x_63);
+x_65 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_structure__field__block_parser), 4, 0);
+x_66 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
+lean::closure_set(x_66, 0, x_65);
+x_67 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_67, 0, x_66);
+lean::cnstr_set(x_67, 1, x_13);
 x_68 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_68, 0, x_67);
-lean::cnstr_set(x_68, 1, x_66);
+lean::cnstr_set(x_68, 0, x_64);
+lean::cnstr_set(x_68, 1, x_67);
 x_69 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_69, 0, x_19);
+lean::cnstr_set(x_69, 0, x_49);
 lean::cnstr_set(x_69, 1, x_68);
 x_70 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_70, 0, x_17);
+lean::cnstr_set(x_70, 0, x_43);
 lean::cnstr_set(x_70, 1, x_69);
-x_71 = l_lean_parser_command__parser__m_monad___closed__1;
-x_72 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_73 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_74 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_75 = l_lean_parser_command_structure;
-x_76 = l_lean_parser_command_structure_has__view;
-x_77 = l_lean_parser_combinators_node_view___rarg(x_71, x_72, x_73, x_74, x_75, x_70, x_76);
-lean::dec(x_70);
-return x_77;
+x_71 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
+x_72 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_72, 0, x_71);
+lean::cnstr_set(x_72, 1, x_70);
+x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_ident__univ__params_parser), 4, 0);
+x_74 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_74, 0, x_73);
+lean::cnstr_set(x_74, 1, x_72);
+x_75 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_75, 0, x_21);
+lean::cnstr_set(x_75, 1, x_74);
+x_76 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_76, 0, x_19);
+lean::cnstr_set(x_76, 1, x_75);
+x_77 = l_lean_parser_command__parser__m_monad___closed__1;
+x_78 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_79 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_80 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_81 = l_lean_parser_command_structure;
+x_82 = l_lean_parser_command_structure_has__view;
+x_83 = l_lean_parser_combinators_node_view___rarg(x_77, x_78, x_79, x_80, x_81, x_76, x_82);
+lean::dec(x_76);
+return x_83;
 }
 }
 obj* _init_l_lean_parser_command_structure_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; uint8 x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_70; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_34; obj* x_35; uint8 x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; 
 x_0 = lean::mk_string("structure");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("class");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_14, 0, x_13);
-lean::closure_set(x_14, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("class");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
 x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_14);
-lean::cnstr_set(x_15, 1, x_11);
-x_16 = l_lean_parser_command_structure__kw;
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_17, 0, x_16);
-lean::closure_set(x_17, 1, x_15);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_old__univ__params_parser), 4, 0);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_16, 0, x_15);
+lean::closure_set(x_16, 1, x_5);
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_16);
+lean::cnstr_set(x_17, 1, x_13);
+x_18 = l_lean_parser_command_structure__kw;
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
 lean::closure_set(x_19, 0, x_18);
-x_20 = lean::mk_string("extends");
-x_21 = l_string_trim(x_20);
-lean::inc(x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_23, 0, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_24, 0, x_21);
-lean::closure_set(x_24, 1, x_4);
-lean::closure_set(x_24, 2, x_23);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_25, 0, x_4);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_26, 0, x_25);
-x_27 = lean::mk_string(",");
-x_28 = l_string_trim(x_27);
-lean::inc(x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_30, 0, x_28);
-x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_31, 0, x_28);
-lean::closure_set(x_31, 1, x_4);
-lean::closure_set(x_31, 2, x_30);
-x_32 = 1;
-x_33 = lean::box(x_32);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_34, 0, x_26);
-lean::closure_set(x_34, 1, x_31);
-lean::closure_set(x_34, 2, x_33);
-x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_34);
-lean::cnstr_set(x_35, 1, x_11);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_24);
-lean::cnstr_set(x_36, 1, x_35);
-x_37 = l_lean_parser_command_extends;
-x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_38, 0, x_37);
-lean::closure_set(x_38, 1, x_36);
-x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_39, 0, x_38);
-x_40 = lean::mk_string(":=");
-x_41 = l_string_trim(x_40);
-lean::inc(x_41);
-x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_43, 0, x_41);
-x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_44, 0, x_41);
-lean::closure_set(x_44, 1, x_4);
-lean::closure_set(x_44, 2, x_43);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser), 4, 0);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_46, 0, x_45);
-x_47 = lean::mk_string("::");
-x_48 = l_string_trim(x_47);
-lean::inc(x_48);
-x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_50, 0, x_48);
-x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_51, 0, x_48);
-lean::closure_set(x_51, 1, x_4);
-lean::closure_set(x_51, 2, x_50);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_51);
-lean::cnstr_set(x_52, 1, x_11);
-x_53 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_53, 0, x_46);
-lean::cnstr_set(x_53, 1, x_52);
-x_54 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
-x_55 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_55, 0, x_54);
-lean::cnstr_set(x_55, 1, x_53);
-x_56 = l_lean_parser_command_structure__ctor;
-x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_57, 0, x_56);
-lean::closure_set(x_57, 1, x_55);
-x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_58, 0, x_57);
-x_59 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_structure__field__block_parser), 4, 0);
-x_60 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
-lean::closure_set(x_60, 0, x_59);
+lean::closure_set(x_19, 1, x_17);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_old__univ__params_parser), 4, 0);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_21, 0, x_20);
+x_22 = lean::mk_string("extends");
+x_23 = l_string_trim(x_22);
+lean::dec(x_22);
+lean::inc(x_23);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_26, 0, x_23);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_27, 0, x_23);
+lean::closure_set(x_27, 1, x_5);
+lean::closure_set(x_27, 2, x_26);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_28, 0, x_5);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_29, 0, x_28);
+x_30 = lean::mk_string(",");
+x_31 = l_string_trim(x_30);
+lean::dec(x_30);
+lean::inc(x_31);
+x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_34, 0, x_31);
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_35, 0, x_31);
+lean::closure_set(x_35, 1, x_5);
+lean::closure_set(x_35, 2, x_34);
+x_36 = 1;
+x_37 = lean::box(x_36);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_command_decl__attributes_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_38, 0, x_29);
+lean::closure_set(x_38, 1, x_35);
+lean::closure_set(x_38, 2, x_37);
+x_39 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_39, 0, x_38);
+lean::cnstr_set(x_39, 1, x_13);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_27);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = l_lean_parser_command_extends;
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_42, 0, x_41);
+lean::closure_set(x_42, 1, x_40);
+x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_43, 0, x_42);
+x_44 = lean::mk_string(":=");
+x_45 = l_string_trim(x_44);
+lean::dec(x_44);
+lean::inc(x_45);
+x_48 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_48, 0, x_45);
+x_49 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_49, 0, x_45);
+lean::closure_set(x_49, 1, x_5);
+lean::closure_set(x_49, 2, x_48);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_infer__modifier_parser), 4, 0);
+x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_51, 0, x_50);
+x_52 = lean::mk_string("::");
+x_53 = l_string_trim(x_52);
+lean::dec(x_52);
+lean::inc(x_53);
+x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_56, 0, x_53);
+x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_57, 0, x_53);
+lean::closure_set(x_57, 1, x_5);
+lean::closure_set(x_57, 2, x_56);
+x_58 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_58, 0, x_57);
+lean::cnstr_set(x_58, 1, x_13);
+x_59 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_59, 0, x_51);
+lean::cnstr_set(x_59, 1, x_58);
+x_60 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_intro__rule_parser_lean_parser_has__tokens___spec__1___boxed), 4, 0);
 x_61 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_61, 0, x_60);
-lean::cnstr_set(x_61, 1, x_11);
-x_62 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_62, 0, x_58);
-lean::cnstr_set(x_62, 1, x_61);
-x_63 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_63, 0, x_44);
-lean::cnstr_set(x_63, 1, x_62);
-x_64 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_64, 0, x_39);
-lean::cnstr_set(x_64, 1, x_63);
-x_65 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
-x_66 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_66, 0, x_65);
-lean::cnstr_set(x_66, 1, x_64);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_ident__univ__params_parser), 4, 0);
+lean::cnstr_set(x_61, 1, x_59);
+x_62 = l_lean_parser_command_structure__ctor;
+x_63 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_63, 0, x_62);
+lean::closure_set(x_63, 1, x_61);
+x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_64, 0, x_63);
+x_65 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_structure__field__block_parser), 4, 0);
+x_66 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
+lean::closure_set(x_66, 0, x_65);
+x_67 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_67, 0, x_66);
+lean::cnstr_set(x_67, 1, x_13);
 x_68 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_68, 0, x_67);
-lean::cnstr_set(x_68, 1, x_66);
+lean::cnstr_set(x_68, 0, x_64);
+lean::cnstr_set(x_68, 1, x_67);
 x_69 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_69, 0, x_19);
+lean::cnstr_set(x_69, 0, x_49);
 lean::cnstr_set(x_69, 1, x_68);
 x_70 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_70, 0, x_17);
+lean::cnstr_set(x_70, 0, x_43);
 lean::cnstr_set(x_70, 1, x_69);
-return x_70;
+x_71 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
+x_72 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_72, 0, x_71);
+lean::cnstr_set(x_72, 1, x_70);
+x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_ident__univ__params_parser), 4, 0);
+x_74 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_74, 0, x_73);
+lean::cnstr_set(x_74, 1, x_72);
+x_75 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_75, 0, x_21);
+lean::cnstr_set(x_75, 1, x_74);
+x_76 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_76, 0, x_19);
+lean::cnstr_set(x_76, 1, x_75);
+return x_76;
 }
 }
 obj* l_lean_parser_command_structure_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -35010,157 +35118,166 @@ return x_0;
 obj* _init_l_lean_parser_command_declaration_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_16; obj* x_18; obj* x_20; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_31; obj* x_33; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_44; obj* x_46; obj* x_49; obj* x_51; obj* x_52; obj* x_53; obj* x_56; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_64; obj* x_67; obj* x_69; obj* x_71; obj* x_73; obj* x_74; obj* x_76; obj* x_79; obj* x_81; obj* x_82; obj* x_83; obj* x_85; obj* x_86; obj* x_87; obj* x_89; obj* x_92; obj* x_94; obj* x_96; obj* x_97; obj* x_98; obj* x_100; obj* x_101; obj* x_102; obj* x_104; obj* x_107; obj* x_109; obj* x_111; obj* x_114; obj* x_117; obj* x_119; obj* x_120; obj* x_121; obj* x_124; obj* x_127; obj* x_130; obj* x_133; obj* x_136; obj* x_138; obj* x_140; obj* x_142; obj* x_144; obj* x_145; obj* x_147; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_13; obj* x_16; obj* x_19; obj* x_21; obj* x_23; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_34; obj* x_36; obj* x_39; obj* x_41; obj* x_42; obj* x_44; obj* x_45; obj* x_46; obj* x_48; obj* x_50; obj* x_53; obj* x_55; obj* x_56; obj* x_58; obj* x_61; obj* x_63; obj* x_64; obj* x_66; obj* x_67; obj* x_69; obj* x_71; obj* x_74; obj* x_76; obj* x_78; obj* x_80; obj* x_81; obj* x_83; obj* x_86; obj* x_88; obj* x_89; obj* x_91; obj* x_93; obj* x_94; obj* x_96; obj* x_98; obj* x_101; obj* x_103; obj* x_105; obj* x_106; obj* x_107; obj* x_109; obj* x_110; obj* x_111; obj* x_113; obj* x_116; obj* x_118; obj* x_120; obj* x_123; obj* x_126; obj* x_128; obj* x_129; obj* x_130; obj* x_133; obj* x_136; obj* x_139; obj* x_142; obj* x_145; obj* x_147; obj* x_149; obj* x_151; obj* x_153; obj* x_154; obj* x_156; 
 x_0 = lean::mk_string("def");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string("abbreviation");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::mk_string("theorem");
-x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_1);
-x_7 = lean::box(0);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_6, x_7);
-lean::dec(x_6);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_4, x_8);
-lean::dec(x_8);
+lean::dec(x_0);
+x_4 = lean::mk_string("abbreviation");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_2, x_10);
-lean::dec(x_10);
-lean::dec(x_2);
-x_16 = l_lean_parser_tokens___rarg(x_13);
+x_7 = lean::mk_string("theorem");
+x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_1);
+lean::dec(x_7);
+x_10 = lean::box(0);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_8, x_10);
+lean::dec(x_8);
+x_13 = l_lean_parser_list_cons_tokens___rarg(x_5, x_11);
+lean::dec(x_11);
+lean::dec(x_5);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_2, x_13);
 lean::dec(x_13);
-x_18 = l_lean_parser_list_cons_tokens___rarg(x_16, x_7);
+lean::dec(x_2);
+x_19 = l_lean_parser_tokens___rarg(x_16);
 lean::dec(x_16);
-x_20 = l_lean_parser_tokens___rarg(x_18);
-lean::dec(x_18);
-x_22 = l_lean_parser_command_old__univ__params_parser_lean_parser_has__tokens;
-x_23 = l_lean_parser_tokens___rarg(x_22);
-x_24 = l_lean_parser_command_decl__val_parser_lean_parser_has__tokens;
-x_25 = l_lean_parser_list_cons_tokens___rarg(x_24, x_7);
-x_26 = l_lean_parser_command_opt__decl__sig_parser_lean_parser_has__tokens;
-x_27 = l_lean_parser_list_cons_tokens___rarg(x_26, x_25);
-x_28 = l_lean_parser_command_ident__univ__params_parser_lean_parser_has__tokens;
-x_29 = l_lean_parser_list_cons_tokens___rarg(x_28, x_27);
-lean::dec(x_27);
-x_31 = l_lean_parser_list_cons_tokens___rarg(x_23, x_29);
-lean::dec(x_29);
-x_33 = l_lean_parser_list_cons_tokens___rarg(x_20, x_31);
-lean::dec(x_31);
-lean::dec(x_20);
-x_36 = l_lean_parser_tokens___rarg(x_33);
-lean::dec(x_33);
-x_38 = lean::mk_string("instance");
-x_39 = l_lean_parser_symbol_tokens___rarg(x_38, x_1);
-x_40 = l_lean_parser_tokens___rarg(x_28);
-x_41 = l_lean_parser_command_decl__sig_parser_lean_parser_has__tokens;
-x_42 = l_lean_parser_list_cons_tokens___rarg(x_41, x_25);
-lean::dec(x_25);
-x_44 = l_lean_parser_list_cons_tokens___rarg(x_40, x_42);
-lean::dec(x_40);
-x_46 = l_lean_parser_list_cons_tokens___rarg(x_39, x_44);
-lean::dec(x_44);
-lean::dec(x_39);
-x_49 = l_lean_parser_tokens___rarg(x_46);
-lean::dec(x_46);
-x_51 = lean::mk_string("example");
-x_52 = l_lean_parser_symbol_tokens___rarg(x_51, x_1);
-x_53 = l_lean_parser_list_cons_tokens___rarg(x_52, x_42);
-lean::dec(x_42);
-lean::dec(x_52);
-x_56 = l_lean_parser_tokens___rarg(x_53);
-lean::dec(x_53);
-x_58 = lean::mk_string("constant");
-x_59 = l_lean_parser_symbol_tokens___rarg(x_58, x_1);
-x_60 = lean::mk_string("axiom");
-x_61 = l_lean_parser_symbol_tokens___rarg(x_60, x_1);
-x_62 = l_lean_parser_list_cons_tokens___rarg(x_61, x_7);
-lean::dec(x_61);
-x_64 = l_lean_parser_list_cons_tokens___rarg(x_59, x_62);
-lean::dec(x_62);
-lean::dec(x_59);
-x_67 = l_lean_parser_tokens___rarg(x_64);
-lean::dec(x_64);
-x_69 = l_lean_parser_list_cons_tokens___rarg(x_67, x_7);
-lean::dec(x_67);
-x_71 = l_lean_parser_tokens___rarg(x_69);
-lean::dec(x_69);
-x_73 = l_lean_parser_list_cons_tokens___rarg(x_41, x_7);
-x_74 = l_lean_parser_list_cons_tokens___rarg(x_28, x_73);
-lean::dec(x_73);
-x_76 = l_lean_parser_list_cons_tokens___rarg(x_71, x_74);
-lean::dec(x_74);
-lean::dec(x_71);
-x_79 = l_lean_parser_tokens___rarg(x_76);
-lean::dec(x_76);
-x_81 = lean::mk_string("class");
-x_82 = l_lean_parser_symbol_tokens___rarg(x_81, x_1);
-x_83 = l_lean_parser_tokens___rarg(x_82);
-lean::dec(x_82);
-x_85 = lean::mk_string("inductive");
-x_86 = l_lean_parser_symbol_tokens___rarg(x_85, x_1);
-x_87 = l_lean_parser_list_cons_tokens___rarg(x_86, x_7);
-lean::dec(x_86);
-x_89 = l_lean_parser_list_cons_tokens___rarg(x_83, x_87);
-lean::dec(x_87);
-lean::dec(x_83);
-x_92 = l_lean_parser_tokens___rarg(x_89);
-lean::dec(x_89);
-x_94 = l_lean_parser_tokens___rarg(x_92);
-lean::dec(x_92);
-x_96 = l_lean_parser_command_notation__like_parser_lean_parser_has__tokens;
-x_97 = l_lean_parser_tokens___rarg(x_96);
-x_98 = l_lean_parser_tokens___rarg(x_97);
-lean::dec(x_97);
-x_100 = l_lean_parser_command_intro__rule_parser_lean_parser_has__tokens;
-x_101 = l_lean_parser_tokens___rarg(x_100);
-x_102 = l_lean_parser_list_cons_tokens___rarg(x_101, x_7);
-lean::dec(x_101);
-x_104 = l_lean_parser_list_cons_tokens___rarg(x_98, x_102);
-lean::dec(x_102);
-lean::dec(x_98);
-x_107 = l_lean_parser_list_cons_tokens___rarg(x_26, x_104);
-lean::dec(x_104);
-x_109 = l_lean_parser_list_cons_tokens___rarg(x_28, x_107);
-lean::dec(x_107);
-x_111 = l_lean_parser_list_cons_tokens___rarg(x_23, x_109);
-lean::dec(x_109);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_19, x_10);
+lean::dec(x_19);
+x_23 = l_lean_parser_tokens___rarg(x_21);
+lean::dec(x_21);
+x_25 = l_lean_parser_command_old__univ__params_parser_lean_parser_has__tokens;
+x_26 = l_lean_parser_tokens___rarg(x_25);
+x_27 = l_lean_parser_command_decl__val_parser_lean_parser_has__tokens;
+x_28 = l_lean_parser_list_cons_tokens___rarg(x_27, x_10);
+x_29 = l_lean_parser_command_opt__decl__sig_parser_lean_parser_has__tokens;
+x_30 = l_lean_parser_list_cons_tokens___rarg(x_29, x_28);
+x_31 = l_lean_parser_command_ident__univ__params_parser_lean_parser_has__tokens;
+x_32 = l_lean_parser_list_cons_tokens___rarg(x_31, x_30);
+lean::dec(x_30);
+x_34 = l_lean_parser_list_cons_tokens___rarg(x_26, x_32);
+lean::dec(x_32);
+x_36 = l_lean_parser_list_cons_tokens___rarg(x_23, x_34);
+lean::dec(x_34);
 lean::dec(x_23);
-x_114 = l_lean_parser_list_cons_tokens___rarg(x_94, x_111);
-lean::dec(x_111);
-lean::dec(x_94);
-x_117 = l_lean_parser_tokens___rarg(x_114);
-lean::dec(x_114);
-x_119 = l_lean_parser_command_structure_parser_lean_parser_has__tokens;
-x_120 = l_lean_parser_list_cons_tokens___rarg(x_119, x_7);
-x_121 = l_lean_parser_list_cons_tokens___rarg(x_117, x_120);
-lean::dec(x_120);
-lean::dec(x_117);
-x_124 = l_lean_parser_list_cons_tokens___rarg(x_79, x_121);
-lean::dec(x_121);
-lean::dec(x_79);
-x_127 = l_lean_parser_list_cons_tokens___rarg(x_56, x_124);
-lean::dec(x_124);
-lean::dec(x_56);
-x_130 = l_lean_parser_list_cons_tokens___rarg(x_49, x_127);
-lean::dec(x_127);
-lean::dec(x_49);
-x_133 = l_lean_parser_list_cons_tokens___rarg(x_36, x_130);
-lean::dec(x_130);
+x_39 = l_lean_parser_tokens___rarg(x_36);
 lean::dec(x_36);
-x_136 = l_lean_parser_tokens___rarg(x_133);
+x_41 = lean::mk_string("instance");
+x_42 = l_lean_parser_symbol_tokens___rarg(x_41, x_1);
+lean::dec(x_41);
+x_44 = l_lean_parser_tokens___rarg(x_31);
+x_45 = l_lean_parser_command_decl__sig_parser_lean_parser_has__tokens;
+x_46 = l_lean_parser_list_cons_tokens___rarg(x_45, x_28);
+lean::dec(x_28);
+x_48 = l_lean_parser_list_cons_tokens___rarg(x_44, x_46);
+lean::dec(x_44);
+x_50 = l_lean_parser_list_cons_tokens___rarg(x_42, x_48);
+lean::dec(x_48);
+lean::dec(x_42);
+x_53 = l_lean_parser_tokens___rarg(x_50);
+lean::dec(x_50);
+x_55 = lean::mk_string("example");
+x_56 = l_lean_parser_symbol_tokens___rarg(x_55, x_1);
+lean::dec(x_55);
+x_58 = l_lean_parser_list_cons_tokens___rarg(x_56, x_46);
+lean::dec(x_46);
+lean::dec(x_56);
+x_61 = l_lean_parser_tokens___rarg(x_58);
+lean::dec(x_58);
+x_63 = lean::mk_string("constant");
+x_64 = l_lean_parser_symbol_tokens___rarg(x_63, x_1);
+lean::dec(x_63);
+x_66 = lean::mk_string("axiom");
+x_67 = l_lean_parser_symbol_tokens___rarg(x_66, x_1);
+lean::dec(x_66);
+x_69 = l_lean_parser_list_cons_tokens___rarg(x_67, x_10);
+lean::dec(x_67);
+x_71 = l_lean_parser_list_cons_tokens___rarg(x_64, x_69);
+lean::dec(x_69);
+lean::dec(x_64);
+x_74 = l_lean_parser_tokens___rarg(x_71);
+lean::dec(x_71);
+x_76 = l_lean_parser_list_cons_tokens___rarg(x_74, x_10);
+lean::dec(x_74);
+x_78 = l_lean_parser_tokens___rarg(x_76);
+lean::dec(x_76);
+x_80 = l_lean_parser_list_cons_tokens___rarg(x_45, x_10);
+x_81 = l_lean_parser_list_cons_tokens___rarg(x_31, x_80);
+lean::dec(x_80);
+x_83 = l_lean_parser_list_cons_tokens___rarg(x_78, x_81);
+lean::dec(x_81);
+lean::dec(x_78);
+x_86 = l_lean_parser_tokens___rarg(x_83);
+lean::dec(x_83);
+x_88 = lean::mk_string("class");
+x_89 = l_lean_parser_symbol_tokens___rarg(x_88, x_1);
+lean::dec(x_88);
+x_91 = l_lean_parser_tokens___rarg(x_89);
+lean::dec(x_89);
+x_93 = lean::mk_string("inductive");
+x_94 = l_lean_parser_symbol_tokens___rarg(x_93, x_1);
+lean::dec(x_93);
+x_96 = l_lean_parser_list_cons_tokens___rarg(x_94, x_10);
+lean::dec(x_94);
+x_98 = l_lean_parser_list_cons_tokens___rarg(x_91, x_96);
+lean::dec(x_96);
+lean::dec(x_91);
+x_101 = l_lean_parser_tokens___rarg(x_98);
+lean::dec(x_98);
+x_103 = l_lean_parser_tokens___rarg(x_101);
+lean::dec(x_101);
+x_105 = l_lean_parser_command_notation__like_parser_lean_parser_has__tokens;
+x_106 = l_lean_parser_tokens___rarg(x_105);
+x_107 = l_lean_parser_tokens___rarg(x_106);
+lean::dec(x_106);
+x_109 = l_lean_parser_command_intro__rule_parser_lean_parser_has__tokens;
+x_110 = l_lean_parser_tokens___rarg(x_109);
+x_111 = l_lean_parser_list_cons_tokens___rarg(x_110, x_10);
+lean::dec(x_110);
+x_113 = l_lean_parser_list_cons_tokens___rarg(x_107, x_111);
+lean::dec(x_111);
+lean::dec(x_107);
+x_116 = l_lean_parser_list_cons_tokens___rarg(x_29, x_113);
+lean::dec(x_113);
+x_118 = l_lean_parser_list_cons_tokens___rarg(x_31, x_116);
+lean::dec(x_116);
+x_120 = l_lean_parser_list_cons_tokens___rarg(x_26, x_118);
+lean::dec(x_118);
+lean::dec(x_26);
+x_123 = l_lean_parser_list_cons_tokens___rarg(x_103, x_120);
+lean::dec(x_120);
+lean::dec(x_103);
+x_126 = l_lean_parser_tokens___rarg(x_123);
+lean::dec(x_123);
+x_128 = l_lean_parser_command_structure_parser_lean_parser_has__tokens;
+x_129 = l_lean_parser_list_cons_tokens___rarg(x_128, x_10);
+x_130 = l_lean_parser_list_cons_tokens___rarg(x_126, x_129);
+lean::dec(x_129);
+lean::dec(x_126);
+x_133 = l_lean_parser_list_cons_tokens___rarg(x_86, x_130);
+lean::dec(x_130);
+lean::dec(x_86);
+x_136 = l_lean_parser_list_cons_tokens___rarg(x_61, x_133);
 lean::dec(x_133);
-x_138 = l_lean_parser_list_cons_tokens___rarg(x_136, x_7);
+lean::dec(x_61);
+x_139 = l_lean_parser_list_cons_tokens___rarg(x_53, x_136);
 lean::dec(x_136);
-x_140 = l_lean_parser_tokens___rarg(x_138);
-lean::dec(x_138);
-x_142 = l_lean_parser_list_cons_tokens___rarg(x_140, x_7);
-lean::dec(x_140);
-x_144 = l_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens;
-x_145 = l_lean_parser_list_cons_tokens___rarg(x_144, x_142);
+lean::dec(x_53);
+x_142 = l_lean_parser_list_cons_tokens___rarg(x_39, x_139);
+lean::dec(x_139);
+lean::dec(x_39);
+x_145 = l_lean_parser_tokens___rarg(x_142);
 lean::dec(x_142);
-x_147 = l_lean_parser_tokens___rarg(x_145);
+x_147 = l_lean_parser_list_cons_tokens___rarg(x_145, x_10);
 lean::dec(x_145);
-return x_147;
+x_149 = l_lean_parser_tokens___rarg(x_147);
+lean::dec(x_147);
+x_151 = l_lean_parser_list_cons_tokens___rarg(x_149, x_10);
+lean::dec(x_149);
+x_153 = l_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens;
+x_154 = l_lean_parser_list_cons_tokens___rarg(x_153, x_151);
+lean::dec(x_151);
+x_156 = l_lean_parser_tokens___rarg(x_154);
+lean::dec(x_154);
+return x_156;
 }
 }
 obj* l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -35193,549 +35310,567 @@ return x_13;
 obj* _init_l_lean_parser_command_declaration_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_31; obj* x_32; obj* x_34; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_46; obj* x_47; obj* x_49; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_94; obj* x_95; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; obj* x_101; obj* x_102; obj* x_103; obj* x_104; obj* x_105; obj* x_106; obj* x_107; obj* x_108; obj* x_109; obj* x_110; obj* x_111; obj* x_112; obj* x_113; obj* x_114; obj* x_115; obj* x_116; obj* x_117; obj* x_118; obj* x_119; obj* x_120; obj* x_121; obj* x_122; obj* x_123; obj* x_124; obj* x_125; obj* x_126; obj* x_127; obj* x_128; obj* x_129; obj* x_130; obj* x_131; obj* x_132; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_34; obj* x_35; obj* x_37; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_47; obj* x_48; obj* x_50; obj* x_51; obj* x_53; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; obj* x_103; obj* x_104; obj* x_105; obj* x_106; obj* x_107; obj* x_108; obj* x_109; obj* x_110; obj* x_111; obj* x_112; obj* x_113; obj* x_114; obj* x_115; obj* x_116; obj* x_117; obj* x_118; obj* x_119; obj* x_120; obj* x_121; obj* x_122; obj* x_123; obj* x_124; obj* x_125; obj* x_126; obj* x_127; obj* x_128; obj* x_129; obj* x_130; obj* x_131; obj* x_132; obj* x_133; obj* x_134; obj* x_135; obj* x_136; obj* x_137; obj* x_138; obj* x_139; obj* x_140; obj* x_141; 
 x_0 = lean::mk_string("def");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("abbreviation");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::mk_string("theorem");
-x_12 = l_string_trim(x_11);
-lean::inc(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_14, 0, x_12);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_15, 0, x_12);
-lean::closure_set(x_15, 1, x_4);
-lean::closure_set(x_15, 2, x_14);
-x_16 = lean::box(0);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_15);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_10);
-lean::cnstr_set(x_18, 1, x_17);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_5);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_20, 0, x_19);
-lean::closure_set(x_20, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("abbreviation");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::mk_string("theorem");
+x_14 = l_string_trim(x_13);
+lean::dec(x_13);
+lean::inc(x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_17, 0, x_14);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_18, 0, x_14);
+lean::closure_set(x_18, 1, x_5);
+lean::closure_set(x_18, 2, x_17);
+x_19 = lean::box(0);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_18);
+lean::cnstr_set(x_20, 1, x_19);
 x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_16);
-x_22 = l_lean_parser_command_def__like_kind;
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::cnstr_set(x_21, 0, x_12);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_6);
+lean::cnstr_set(x_22, 1, x_21);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
 lean::closure_set(x_23, 0, x_22);
-lean::closure_set(x_23, 1, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_old__univ__params_parser), 4, 0);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_25, 0, x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__val_parser), 4, 0);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_26);
-lean::cnstr_set(x_27, 1, x_16);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
-lean::inc(x_27);
-lean::inc(x_28);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_28);
-lean::cnstr_set(x_31, 1, x_27);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_ident__univ__params_parser), 4, 0);
-lean::inc(x_32);
+lean::closure_set(x_23, 1, x_5);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_23);
+lean::cnstr_set(x_24, 1, x_19);
+x_25 = l_lean_parser_command_def__like_kind;
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_26, 0, x_25);
+lean::closure_set(x_26, 1, x_24);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_old__univ__params_parser), 4, 0);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_28, 0, x_27);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__val_parser), 4, 0);
+x_30 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_30, 0, x_29);
+lean::cnstr_set(x_30, 1, x_19);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
+lean::inc(x_30);
+lean::inc(x_31);
 x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_32);
-lean::cnstr_set(x_34, 1, x_31);
-lean::inc(x_25);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_25);
-lean::cnstr_set(x_36, 1, x_34);
+lean::cnstr_set(x_34, 0, x_31);
+lean::cnstr_set(x_34, 1, x_30);
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_ident__univ__params_parser), 4, 0);
+lean::inc(x_35);
 x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_23);
-lean::cnstr_set(x_37, 1, x_36);
-x_38 = l_lean_parser_command_def__like;
-x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_39, 0, x_38);
-lean::closure_set(x_39, 1, x_37);
-x_40 = lean::mk_string("instance");
-x_41 = l_string_trim(x_40);
-lean::inc(x_41);
-x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_43, 0, x_41);
-x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_44, 0, x_41);
-lean::closure_set(x_44, 1, x_4);
-lean::closure_set(x_44, 2, x_43);
-lean::inc(x_32);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_46, 0, x_32);
-x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__sig_parser), 4, 0);
-lean::inc(x_47);
-x_49 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_49, 0, x_47);
-lean::cnstr_set(x_49, 1, x_27);
-lean::inc(x_49);
-x_51 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_51, 0, x_46);
-lean::cnstr_set(x_51, 1, x_49);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_44);
-lean::cnstr_set(x_52, 1, x_51);
-x_53 = l_lean_parser_command_instance;
-x_54 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_54, 0, x_53);
-lean::closure_set(x_54, 1, x_52);
-x_55 = lean::mk_string("example");
-x_56 = l_string_trim(x_55);
-lean::inc(x_56);
-x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_58, 0, x_56);
-x_59 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_59, 0, x_56);
-lean::closure_set(x_59, 1, x_4);
-lean::closure_set(x_59, 2, x_58);
-x_60 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_60, 0, x_59);
-lean::cnstr_set(x_60, 1, x_49);
-x_61 = l_lean_parser_command_example;
-x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_62, 0, x_61);
-lean::closure_set(x_62, 1, x_60);
-x_63 = lean::mk_string("constant");
-x_64 = l_string_trim(x_63);
-lean::inc(x_64);
-x_66 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_66, 0, x_64);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_67, 0, x_64);
-lean::closure_set(x_67, 1, x_4);
-lean::closure_set(x_67, 2, x_66);
-x_68 = lean::mk_string("axiom");
+lean::cnstr_set(x_37, 0, x_35);
+lean::cnstr_set(x_37, 1, x_34);
+lean::inc(x_28);
+x_39 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_39, 0, x_28);
+lean::cnstr_set(x_39, 1, x_37);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_26);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = l_lean_parser_command_def__like;
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_42, 0, x_41);
+lean::closure_set(x_42, 1, x_40);
+x_43 = lean::mk_string("instance");
+x_44 = l_string_trim(x_43);
+lean::dec(x_43);
+lean::inc(x_44);
+x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_47, 0, x_44);
+x_48 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_48, 0, x_44);
+lean::closure_set(x_48, 1, x_5);
+lean::closure_set(x_48, 2, x_47);
+lean::inc(x_35);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_50, 0, x_35);
+x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__sig_parser), 4, 0);
+lean::inc(x_51);
+x_53 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_53, 0, x_51);
+lean::cnstr_set(x_53, 1, x_30);
+lean::inc(x_53);
+x_55 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_55, 0, x_50);
+lean::cnstr_set(x_55, 1, x_53);
+x_56 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_56, 0, x_48);
+lean::cnstr_set(x_56, 1, x_55);
+x_57 = l_lean_parser_command_instance;
+x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_58, 0, x_57);
+lean::closure_set(x_58, 1, x_56);
+x_59 = lean::mk_string("example");
+x_60 = l_string_trim(x_59);
+lean::dec(x_59);
+lean::inc(x_60);
+x_63 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_63, 0, x_60);
+x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_64, 0, x_60);
+lean::closure_set(x_64, 1, x_5);
+lean::closure_set(x_64, 2, x_63);
+x_65 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_65, 0, x_64);
+lean::cnstr_set(x_65, 1, x_53);
+x_66 = l_lean_parser_command_example;
+x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_67, 0, x_66);
+lean::closure_set(x_67, 1, x_65);
+x_68 = lean::mk_string("constant");
 x_69 = l_string_trim(x_68);
+lean::dec(x_68);
 lean::inc(x_69);
-x_71 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_71, 0, x_69);
-x_72 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+x_72 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
 lean::closure_set(x_72, 0, x_69);
-lean::closure_set(x_72, 1, x_4);
-lean::closure_set(x_72, 2, x_71);
-x_73 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_73, 0, x_72);
-lean::cnstr_set(x_73, 1, x_16);
-x_74 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_74, 0, x_67);
-lean::cnstr_set(x_74, 1, x_73);
-x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_75, 0, x_74);
-lean::closure_set(x_75, 1, x_4);
-x_76 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_76, 0, x_75);
-lean::cnstr_set(x_76, 1, x_16);
-x_77 = l_lean_parser_command_constant__keyword;
-x_78 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_78, 0, x_77);
-lean::closure_set(x_78, 1, x_76);
-x_79 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_79, 0, x_47);
-lean::cnstr_set(x_79, 1, x_16);
-lean::inc(x_32);
+x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_73, 0, x_69);
+lean::closure_set(x_73, 1, x_5);
+lean::closure_set(x_73, 2, x_72);
+x_74 = lean::mk_string("axiom");
+x_75 = l_string_trim(x_74);
+lean::dec(x_74);
+lean::inc(x_75);
+x_78 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_78, 0, x_75);
+x_79 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_79, 0, x_75);
+lean::closure_set(x_79, 1, x_5);
+lean::closure_set(x_79, 2, x_78);
+x_80 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_80, 0, x_79);
+lean::cnstr_set(x_80, 1, x_19);
 x_81 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_81, 0, x_32);
-lean::cnstr_set(x_81, 1, x_79);
-x_82 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_82, 0, x_78);
-lean::cnstr_set(x_82, 1, x_81);
-x_83 = l_lean_parser_command_constant;
-x_84 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_84, 0, x_83);
-lean::closure_set(x_84, 1, x_82);
-x_85 = lean::mk_string("class");
-x_86 = l_string_trim(x_85);
-lean::inc(x_86);
-x_88 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_88, 0, x_86);
-x_89 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_89, 0, x_86);
-lean::closure_set(x_89, 1, x_4);
-lean::closure_set(x_89, 2, x_88);
-x_90 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_90, 0, x_89);
-x_91 = lean::mk_string("inductive");
-x_92 = l_string_trim(x_91);
-lean::inc(x_92);
-x_94 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_94, 0, x_92);
-x_95 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_95, 0, x_92);
-lean::closure_set(x_95, 1, x_4);
-lean::closure_set(x_95, 2, x_94);
-x_96 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_96, 0, x_95);
-lean::cnstr_set(x_96, 1, x_16);
-x_97 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_97, 0, x_90);
-lean::cnstr_set(x_97, 1, x_96);
-x_98 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::cnstr_set(x_81, 0, x_73);
+lean::cnstr_set(x_81, 1, x_80);
+x_82 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_82, 0, x_81);
+lean::closure_set(x_82, 1, x_5);
+x_83 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_83, 0, x_82);
+lean::cnstr_set(x_83, 1, x_19);
+x_84 = l_lean_parser_command_constant__keyword;
+x_85 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_85, 0, x_84);
+lean::closure_set(x_85, 1, x_83);
+x_86 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_86, 0, x_51);
+lean::cnstr_set(x_86, 1, x_19);
+lean::inc(x_35);
+x_88 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_88, 0, x_35);
+lean::cnstr_set(x_88, 1, x_86);
+x_89 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_89, 0, x_85);
+lean::cnstr_set(x_89, 1, x_88);
+x_90 = l_lean_parser_command_constant;
+x_91 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_91, 0, x_90);
+lean::closure_set(x_91, 1, x_89);
+x_92 = lean::mk_string("class");
+x_93 = l_string_trim(x_92);
+lean::dec(x_92);
+lean::inc(x_93);
+x_96 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_96, 0, x_93);
+x_97 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_97, 0, x_93);
+lean::closure_set(x_97, 1, x_5);
+lean::closure_set(x_97, 2, x_96);
+x_98 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
 lean::closure_set(x_98, 0, x_97);
-x_99 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
-x_100 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_100, 0, x_99);
-x_101 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_101, 0, x_100);
-x_102 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_intro__rule_parser), 4, 0);
-x_103 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
-lean::closure_set(x_103, 0, x_102);
-x_104 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_104, 0, x_103);
-lean::cnstr_set(x_104, 1, x_16);
+x_99 = lean::mk_string("inductive");
+x_100 = l_string_trim(x_99);
+lean::dec(x_99);
+lean::inc(x_100);
+x_103 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_103, 0, x_100);
+x_104 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_104, 0, x_100);
+lean::closure_set(x_104, 1, x_5);
+lean::closure_set(x_104, 2, x_103);
 x_105 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_105, 0, x_101);
-lean::cnstr_set(x_105, 1, x_104);
+lean::cnstr_set(x_105, 0, x_104);
+lean::cnstr_set(x_105, 1, x_19);
 x_106 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_106, 0, x_28);
+lean::cnstr_set(x_106, 0, x_98);
 lean::cnstr_set(x_106, 1, x_105);
-x_107 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_107, 0, x_32);
-lean::cnstr_set(x_107, 1, x_106);
-x_108 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_108, 0, x_25);
-lean::cnstr_set(x_108, 1, x_107);
-x_109 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_109, 0, x_98);
-lean::cnstr_set(x_109, 1, x_108);
-x_110 = l_lean_parser_command_inductive;
-x_111 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_111, 0, x_110);
-lean::closure_set(x_111, 1, x_109);
-x_112 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_structure_parser), 4, 0);
+x_107 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_107, 0, x_106);
+x_108 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
+x_109 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_109, 0, x_108);
+x_110 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_110, 0, x_109);
+x_111 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_intro__rule_parser), 4, 0);
+x_112 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
+lean::closure_set(x_112, 0, x_111);
 x_113 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_113, 0, x_112);
-lean::cnstr_set(x_113, 1, x_16);
+lean::cnstr_set(x_113, 1, x_19);
 x_114 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_114, 0, x_111);
+lean::cnstr_set(x_114, 0, x_110);
 lean::cnstr_set(x_114, 1, x_113);
 x_115 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_115, 0, x_84);
+lean::cnstr_set(x_115, 0, x_31);
 lean::cnstr_set(x_115, 1, x_114);
 x_116 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_116, 0, x_62);
+lean::cnstr_set(x_116, 0, x_35);
 lean::cnstr_set(x_116, 1, x_115);
 x_117 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_117, 0, x_54);
+lean::cnstr_set(x_117, 0, x_28);
 lean::cnstr_set(x_117, 1, x_116);
 x_118 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_118, 0, x_39);
+lean::cnstr_set(x_118, 0, x_107);
 lean::cnstr_set(x_118, 1, x_117);
-x_119 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_119, 0, x_118);
-lean::closure_set(x_119, 1, x_4);
-x_120 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_120, 0, x_119);
-lean::cnstr_set(x_120, 1, x_16);
-x_121 = l_lean_parser_command_declaration_inner;
-x_122 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_122, 0, x_121);
-lean::closure_set(x_122, 1, x_120);
+x_119 = l_lean_parser_command_inductive;
+x_120 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_120, 0, x_119);
+lean::closure_set(x_120, 1, x_118);
+x_121 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_structure_parser), 4, 0);
+x_122 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_122, 0, x_121);
+lean::cnstr_set(x_122, 1, x_19);
 x_123 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_123, 0, x_122);
-lean::cnstr_set(x_123, 1, x_16);
-x_124 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__modifiers_parser), 4, 0);
+lean::cnstr_set(x_123, 0, x_120);
+lean::cnstr_set(x_123, 1, x_122);
+x_124 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_124, 0, x_91);
+lean::cnstr_set(x_124, 1, x_123);
 x_125 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_125, 0, x_124);
-lean::cnstr_set(x_125, 1, x_123);
-x_126 = l_lean_parser_command__parser__m_monad___closed__1;
-x_127 = l_lean_parser_command__parser__m_monad__except___closed__1;
-x_128 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
-x_129 = l_lean_parser_command__parser__m_alternative___closed__1;
-x_130 = l_lean_parser_command_declaration;
-x_131 = l_lean_parser_command_declaration_has__view;
-x_132 = l_lean_parser_combinators_node_view___rarg(x_126, x_127, x_128, x_129, x_130, x_125, x_131);
-lean::dec(x_125);
-return x_132;
+lean::cnstr_set(x_125, 0, x_67);
+lean::cnstr_set(x_125, 1, x_124);
+x_126 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_126, 0, x_58);
+lean::cnstr_set(x_126, 1, x_125);
+x_127 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_127, 0, x_42);
+lean::cnstr_set(x_127, 1, x_126);
+x_128 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_128, 0, x_127);
+lean::closure_set(x_128, 1, x_5);
+x_129 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_129, 0, x_128);
+lean::cnstr_set(x_129, 1, x_19);
+x_130 = l_lean_parser_command_declaration_inner;
+x_131 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_131, 0, x_130);
+lean::closure_set(x_131, 1, x_129);
+x_132 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_132, 0, x_131);
+lean::cnstr_set(x_132, 1, x_19);
+x_133 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__modifiers_parser), 4, 0);
+x_134 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_134, 0, x_133);
+lean::cnstr_set(x_134, 1, x_132);
+x_135 = l_lean_parser_command__parser__m_monad___closed__1;
+x_136 = l_lean_parser_command__parser__m_monad__except___closed__1;
+x_137 = l_lean_parser_command__parser__m_lean_parser_monad__parsec___closed__1;
+x_138 = l_lean_parser_command__parser__m_alternative___closed__1;
+x_139 = l_lean_parser_command_declaration;
+x_140 = l_lean_parser_command_declaration_has__view;
+x_141 = l_lean_parser_combinators_node_view___rarg(x_135, x_136, x_137, x_138, x_139, x_134, x_140);
+lean::dec(x_134);
+return x_141;
 }
 }
 obj* _init_l_lean_parser_command_declaration_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_31; obj* x_32; obj* x_34; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_46; obj* x_47; obj* x_49; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_94; obj* x_95; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; obj* x_101; obj* x_102; obj* x_103; obj* x_104; obj* x_105; obj* x_106; obj* x_107; obj* x_108; obj* x_109; obj* x_110; obj* x_111; obj* x_112; obj* x_113; obj* x_114; obj* x_115; obj* x_116; obj* x_117; obj* x_118; obj* x_119; obj* x_120; obj* x_121; obj* x_122; obj* x_123; obj* x_124; obj* x_125; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_34; obj* x_35; obj* x_37; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_47; obj* x_48; obj* x_50; obj* x_51; obj* x_53; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; obj* x_103; obj* x_104; obj* x_105; obj* x_106; obj* x_107; obj* x_108; obj* x_109; obj* x_110; obj* x_111; obj* x_112; obj* x_113; obj* x_114; obj* x_115; obj* x_116; obj* x_117; obj* x_118; obj* x_119; obj* x_120; obj* x_121; obj* x_122; obj* x_123; obj* x_124; obj* x_125; obj* x_126; obj* x_127; obj* x_128; obj* x_129; obj* x_130; obj* x_131; obj* x_132; obj* x_133; obj* x_134; 
 x_0 = lean::mk_string("def");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("abbreviation");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::mk_string("theorem");
-x_12 = l_string_trim(x_11);
-lean::inc(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_14, 0, x_12);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_15, 0, x_12);
-lean::closure_set(x_15, 1, x_4);
-lean::closure_set(x_15, 2, x_14);
-x_16 = lean::box(0);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_15);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_10);
-lean::cnstr_set(x_18, 1, x_17);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_5);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_20, 0, x_19);
-lean::closure_set(x_20, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("abbreviation");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::mk_string("theorem");
+x_14 = l_string_trim(x_13);
+lean::dec(x_13);
+lean::inc(x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_17, 0, x_14);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_18, 0, x_14);
+lean::closure_set(x_18, 1, x_5);
+lean::closure_set(x_18, 2, x_17);
+x_19 = lean::box(0);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_18);
+lean::cnstr_set(x_20, 1, x_19);
 x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_16);
-x_22 = l_lean_parser_command_def__like_kind;
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::cnstr_set(x_21, 0, x_12);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_6);
+lean::cnstr_set(x_22, 1, x_21);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
 lean::closure_set(x_23, 0, x_22);
-lean::closure_set(x_23, 1, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_old__univ__params_parser), 4, 0);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_25, 0, x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__val_parser), 4, 0);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_26);
-lean::cnstr_set(x_27, 1, x_16);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
-lean::inc(x_27);
-lean::inc(x_28);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_28);
-lean::cnstr_set(x_31, 1, x_27);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_ident__univ__params_parser), 4, 0);
-lean::inc(x_32);
+lean::closure_set(x_23, 1, x_5);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_23);
+lean::cnstr_set(x_24, 1, x_19);
+x_25 = l_lean_parser_command_def__like_kind;
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_26, 0, x_25);
+lean::closure_set(x_26, 1, x_24);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_old__univ__params_parser), 4, 0);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_28, 0, x_27);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__val_parser), 4, 0);
+x_30 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_30, 0, x_29);
+lean::cnstr_set(x_30, 1, x_19);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_opt__decl__sig_parser), 4, 0);
+lean::inc(x_30);
+lean::inc(x_31);
 x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_32);
-lean::cnstr_set(x_34, 1, x_31);
-lean::inc(x_25);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_25);
-lean::cnstr_set(x_36, 1, x_34);
+lean::cnstr_set(x_34, 0, x_31);
+lean::cnstr_set(x_34, 1, x_30);
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_ident__univ__params_parser), 4, 0);
+lean::inc(x_35);
 x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_23);
-lean::cnstr_set(x_37, 1, x_36);
-x_38 = l_lean_parser_command_def__like;
-x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_39, 0, x_38);
-lean::closure_set(x_39, 1, x_37);
-x_40 = lean::mk_string("instance");
-x_41 = l_string_trim(x_40);
-lean::inc(x_41);
-x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_43, 0, x_41);
-x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_44, 0, x_41);
-lean::closure_set(x_44, 1, x_4);
-lean::closure_set(x_44, 2, x_43);
-lean::inc(x_32);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_46, 0, x_32);
-x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__sig_parser), 4, 0);
-lean::inc(x_47);
-x_49 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_49, 0, x_47);
-lean::cnstr_set(x_49, 1, x_27);
-lean::inc(x_49);
-x_51 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_51, 0, x_46);
-lean::cnstr_set(x_51, 1, x_49);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_44);
-lean::cnstr_set(x_52, 1, x_51);
-x_53 = l_lean_parser_command_instance;
-x_54 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_54, 0, x_53);
-lean::closure_set(x_54, 1, x_52);
-x_55 = lean::mk_string("example");
-x_56 = l_string_trim(x_55);
-lean::inc(x_56);
-x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_58, 0, x_56);
-x_59 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_59, 0, x_56);
-lean::closure_set(x_59, 1, x_4);
-lean::closure_set(x_59, 2, x_58);
-x_60 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_60, 0, x_59);
-lean::cnstr_set(x_60, 1, x_49);
-x_61 = l_lean_parser_command_example;
-x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_62, 0, x_61);
-lean::closure_set(x_62, 1, x_60);
-x_63 = lean::mk_string("constant");
-x_64 = l_string_trim(x_63);
-lean::inc(x_64);
-x_66 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_66, 0, x_64);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_67, 0, x_64);
-lean::closure_set(x_67, 1, x_4);
-lean::closure_set(x_67, 2, x_66);
-x_68 = lean::mk_string("axiom");
+lean::cnstr_set(x_37, 0, x_35);
+lean::cnstr_set(x_37, 1, x_34);
+lean::inc(x_28);
+x_39 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_39, 0, x_28);
+lean::cnstr_set(x_39, 1, x_37);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_26);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = l_lean_parser_command_def__like;
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_42, 0, x_41);
+lean::closure_set(x_42, 1, x_40);
+x_43 = lean::mk_string("instance");
+x_44 = l_string_trim(x_43);
+lean::dec(x_43);
+lean::inc(x_44);
+x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_47, 0, x_44);
+x_48 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_48, 0, x_44);
+lean::closure_set(x_48, 1, x_5);
+lean::closure_set(x_48, 2, x_47);
+lean::inc(x_35);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_50, 0, x_35);
+x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__sig_parser), 4, 0);
+lean::inc(x_51);
+x_53 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_53, 0, x_51);
+lean::cnstr_set(x_53, 1, x_30);
+lean::inc(x_53);
+x_55 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_55, 0, x_50);
+lean::cnstr_set(x_55, 1, x_53);
+x_56 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_56, 0, x_48);
+lean::cnstr_set(x_56, 1, x_55);
+x_57 = l_lean_parser_command_instance;
+x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_58, 0, x_57);
+lean::closure_set(x_58, 1, x_56);
+x_59 = lean::mk_string("example");
+x_60 = l_string_trim(x_59);
+lean::dec(x_59);
+lean::inc(x_60);
+x_63 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_63, 0, x_60);
+x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_64, 0, x_60);
+lean::closure_set(x_64, 1, x_5);
+lean::closure_set(x_64, 2, x_63);
+x_65 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_65, 0, x_64);
+lean::cnstr_set(x_65, 1, x_53);
+x_66 = l_lean_parser_command_example;
+x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_67, 0, x_66);
+lean::closure_set(x_67, 1, x_65);
+x_68 = lean::mk_string("constant");
 x_69 = l_string_trim(x_68);
+lean::dec(x_68);
 lean::inc(x_69);
-x_71 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_71, 0, x_69);
-x_72 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+x_72 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
 lean::closure_set(x_72, 0, x_69);
-lean::closure_set(x_72, 1, x_4);
-lean::closure_set(x_72, 2, x_71);
-x_73 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_73, 0, x_72);
-lean::cnstr_set(x_73, 1, x_16);
-x_74 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_74, 0, x_67);
-lean::cnstr_set(x_74, 1, x_73);
-x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_75, 0, x_74);
-lean::closure_set(x_75, 1, x_4);
-x_76 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_76, 0, x_75);
-lean::cnstr_set(x_76, 1, x_16);
-x_77 = l_lean_parser_command_constant__keyword;
-x_78 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_78, 0, x_77);
-lean::closure_set(x_78, 1, x_76);
-x_79 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_79, 0, x_47);
-lean::cnstr_set(x_79, 1, x_16);
-lean::inc(x_32);
+x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_73, 0, x_69);
+lean::closure_set(x_73, 1, x_5);
+lean::closure_set(x_73, 2, x_72);
+x_74 = lean::mk_string("axiom");
+x_75 = l_string_trim(x_74);
+lean::dec(x_74);
+lean::inc(x_75);
+x_78 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_78, 0, x_75);
+x_79 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_79, 0, x_75);
+lean::closure_set(x_79, 1, x_5);
+lean::closure_set(x_79, 2, x_78);
+x_80 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_80, 0, x_79);
+lean::cnstr_set(x_80, 1, x_19);
 x_81 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_81, 0, x_32);
-lean::cnstr_set(x_81, 1, x_79);
-x_82 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_82, 0, x_78);
-lean::cnstr_set(x_82, 1, x_81);
-x_83 = l_lean_parser_command_constant;
-x_84 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_84, 0, x_83);
-lean::closure_set(x_84, 1, x_82);
-x_85 = lean::mk_string("class");
-x_86 = l_string_trim(x_85);
-lean::inc(x_86);
-x_88 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_88, 0, x_86);
-x_89 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_89, 0, x_86);
-lean::closure_set(x_89, 1, x_4);
-lean::closure_set(x_89, 2, x_88);
-x_90 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_90, 0, x_89);
-x_91 = lean::mk_string("inductive");
-x_92 = l_string_trim(x_91);
-lean::inc(x_92);
-x_94 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_94, 0, x_92);
-x_95 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_95, 0, x_92);
-lean::closure_set(x_95, 1, x_4);
-lean::closure_set(x_95, 2, x_94);
-x_96 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_96, 0, x_95);
-lean::cnstr_set(x_96, 1, x_16);
-x_97 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_97, 0, x_90);
-lean::cnstr_set(x_97, 1, x_96);
-x_98 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::cnstr_set(x_81, 0, x_73);
+lean::cnstr_set(x_81, 1, x_80);
+x_82 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_82, 0, x_81);
+lean::closure_set(x_82, 1, x_5);
+x_83 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_83, 0, x_82);
+lean::cnstr_set(x_83, 1, x_19);
+x_84 = l_lean_parser_command_constant__keyword;
+x_85 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_85, 0, x_84);
+lean::closure_set(x_85, 1, x_83);
+x_86 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_86, 0, x_51);
+lean::cnstr_set(x_86, 1, x_19);
+lean::inc(x_35);
+x_88 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_88, 0, x_35);
+lean::cnstr_set(x_88, 1, x_86);
+x_89 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_89, 0, x_85);
+lean::cnstr_set(x_89, 1, x_88);
+x_90 = l_lean_parser_command_constant;
+x_91 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_91, 0, x_90);
+lean::closure_set(x_91, 1, x_89);
+x_92 = lean::mk_string("class");
+x_93 = l_string_trim(x_92);
+lean::dec(x_92);
+lean::inc(x_93);
+x_96 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_96, 0, x_93);
+x_97 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_97, 0, x_93);
+lean::closure_set(x_97, 1, x_5);
+lean::closure_set(x_97, 2, x_96);
+x_98 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
 lean::closure_set(x_98, 0, x_97);
-x_99 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
-x_100 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
-lean::closure_set(x_100, 0, x_99);
-x_101 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
-lean::closure_set(x_101, 0, x_100);
-x_102 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_intro__rule_parser), 4, 0);
-x_103 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
-lean::closure_set(x_103, 0, x_102);
-x_104 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_104, 0, x_103);
-lean::cnstr_set(x_104, 1, x_16);
+x_99 = lean::mk_string("inductive");
+x_100 = l_string_trim(x_99);
+lean::dec(x_99);
+lean::inc(x_100);
+x_103 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_103, 0, x_100);
+x_104 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_doc__comment_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_104, 0, x_100);
+lean::closure_set(x_104, 1, x_5);
+lean::closure_set(x_104, 2, x_103);
 x_105 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_105, 0, x_101);
-lean::cnstr_set(x_105, 1, x_104);
+lean::cnstr_set(x_105, 0, x_104);
+lean::cnstr_set(x_105, 1, x_19);
 x_106 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_106, 0, x_28);
+lean::cnstr_set(x_106, 0, x_98);
 lean::cnstr_set(x_106, 1, x_105);
-x_107 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_107, 0, x_32);
-lean::cnstr_set(x_107, 1, x_106);
-x_108 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_108, 0, x_25);
-lean::cnstr_set(x_108, 1, x_107);
-x_109 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_109, 0, x_98);
-lean::cnstr_set(x_109, 1, x_108);
-x_110 = l_lean_parser_command_inductive;
-x_111 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_111, 0, x_110);
-lean::closure_set(x_111, 1, x_109);
-x_112 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_structure_parser), 4, 0);
+x_107 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_declaration_parser_lean_parser_has__view___lambda__1), 5, 1);
+lean::closure_set(x_107, 0, x_106);
+x_108 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
+x_109 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term__parser_run), 5, 1);
+lean::closure_set(x_109, 0, x_108);
+x_110 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__1), 5, 1);
+lean::closure_set(x_110, 0, x_109);
+x_111 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_intro__rule_parser), 4, 0);
+x_112 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_attr__instance_parser_lean_parser_has__tokens___spec__2), 5, 1);
+lean::closure_set(x_112, 0, x_111);
 x_113 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_113, 0, x_112);
-lean::cnstr_set(x_113, 1, x_16);
+lean::cnstr_set(x_113, 1, x_19);
 x_114 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_114, 0, x_111);
+lean::cnstr_set(x_114, 0, x_110);
 lean::cnstr_set(x_114, 1, x_113);
 x_115 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_115, 0, x_84);
+lean::cnstr_set(x_115, 0, x_31);
 lean::cnstr_set(x_115, 1, x_114);
 x_116 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_116, 0, x_62);
+lean::cnstr_set(x_116, 0, x_35);
 lean::cnstr_set(x_116, 1, x_115);
 x_117 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_117, 0, x_54);
+lean::cnstr_set(x_117, 0, x_28);
 lean::cnstr_set(x_117, 1, x_116);
 x_118 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_118, 0, x_39);
+lean::cnstr_set(x_118, 0, x_107);
 lean::cnstr_set(x_118, 1, x_117);
-x_119 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
-lean::closure_set(x_119, 0, x_118);
-lean::closure_set(x_119, 1, x_4);
-x_120 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_120, 0, x_119);
-lean::cnstr_set(x_120, 1, x_16);
-x_121 = l_lean_parser_command_declaration_inner;
-x_122 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
-lean::closure_set(x_122, 0, x_121);
-lean::closure_set(x_122, 1, x_120);
+x_119 = l_lean_parser_command_inductive;
+x_120 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_120, 0, x_119);
+lean::closure_set(x_120, 1, x_118);
+x_121 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_structure_parser), 4, 0);
+x_122 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_122, 0, x_121);
+lean::cnstr_set(x_122, 1, x_19);
 x_123 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_123, 0, x_122);
-lean::cnstr_set(x_123, 1, x_16);
-x_124 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__modifiers_parser), 4, 0);
+lean::cnstr_set(x_123, 0, x_120);
+lean::cnstr_set(x_123, 1, x_122);
+x_124 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_124, 0, x_91);
+lean::cnstr_set(x_124, 1, x_123);
 x_125 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_125, 0, x_124);
-lean::cnstr_set(x_125, 1, x_123);
-return x_125;
+lean::cnstr_set(x_125, 0, x_67);
+lean::cnstr_set(x_125, 1, x_124);
+x_126 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_126, 0, x_58);
+lean::cnstr_set(x_126, 1, x_125);
+x_127 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_127, 0, x_42);
+lean::cnstr_set(x_127, 1, x_126);
+x_128 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_decl__modifiers_parser_lean_parser_has__tokens___spec__2), 6, 2);
+lean::closure_set(x_128, 0, x_127);
+lean::closure_set(x_128, 1, x_5);
+x_129 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_129, 0, x_128);
+lean::cnstr_set(x_129, 1, x_19);
+x_130 = l_lean_parser_command_declaration_inner;
+x_131 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_doc__comment_parser___spec__4), 6, 2);
+lean::closure_set(x_131, 0, x_130);
+lean::closure_set(x_131, 1, x_129);
+x_132 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_132, 0, x_131);
+lean::cnstr_set(x_132, 1, x_19);
+x_133 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_decl__modifiers_parser), 4, 0);
+x_134 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_134, 0, x_133);
+lean::cnstr_set(x_134, 1, x_132);
+return x_134;
 }
 }
 obj* l_lean_parser_command_declaration_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
diff --git a/src/boot/init/lean/parser/level.cpp b/src/boot/init/lean/parser/level.cpp
index b432e56668..8ef4c36f75 100644
--- a/src/boot/init/lean/parser/level.cpp
+++ b/src/boot/init/lean/parser/level.cpp
@@ -1506,25 +1506,27 @@ return x_129;
 obj* _init_l_lean_parser_level_paren_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_12; obj* x_15; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_14; obj* x_17; 
 x_0 = lean::mk_string("(");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(")");
-x_4 = lean::mk_nat_obj(0u);
-x_5 = l_lean_parser_symbol_tokens___rarg(x_3, x_4);
-x_6 = lean::box(0);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_5, x_6);
-lean::dec(x_5);
-x_9 = l_lean_parser_level_parser_lean_parser_has__tokens___closed__1;
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_9, x_7);
-lean::dec(x_7);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_2, x_10);
-lean::dec(x_10);
-lean::dec(x_2);
-x_15 = l_lean_parser_tokens___rarg(x_12);
+lean::dec(x_0);
+x_4 = lean::mk_string(")");
+x_5 = lean::mk_nat_obj(0u);
+x_6 = l_lean_parser_symbol_tokens___rarg(x_4, x_5);
+lean::dec(x_4);
+x_8 = lean::box(0);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_6, x_8);
+lean::dec(x_6);
+x_11 = l_lean_parser_level_parser_lean_parser_has__tokens___closed__1;
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_11, x_9);
+lean::dec(x_9);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_2, x_12);
 lean::dec(x_12);
-return x_15;
+lean::dec(x_2);
+x_17 = l_lean_parser_tokens___rarg(x_14);
+lean::dec(x_14);
+return x_17;
 }
 }
 obj* l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6) {
@@ -1540,48 +1542,50 @@ return x_7;
 obj* _init_l_lean_parser_level_paren_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_nat_obj(0u);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_parser), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string(")");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_6);
-lean::closure_set(x_12, 2, x_11);
-x_13 = lean::box(0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_12);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_7);
-lean::cnstr_set(x_15, 1, x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_nat_obj(0u);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_parser), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string(")");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_7);
+lean::closure_set(x_14, 2, x_13);
+x_15 = lean::box(0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_5);
+lean::cnstr_set(x_16, 0, x_14);
 lean::cnstr_set(x_16, 1, x_15);
-x_17 = l_lean_parser_level__parser__m_monad;
-x_18 = l_lean_parser_level__parser__m_monad__except;
-x_19 = l_lean_parser_level__parser__m_lean_parser_monad__parsec;
-x_20 = l_lean_parser_level__parser__m_alternative;
-x_21 = l_lean_parser_level_paren;
-x_22 = l_lean_parser_level_paren_has__view;
-x_23 = l_lean_parser_combinators_node_view___rarg(x_17, x_18, x_19, x_20, x_21, x_16, x_22);
-lean::dec(x_16);
-return x_23;
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_8);
+lean::cnstr_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_6);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = l_lean_parser_level__parser__m_monad;
+x_20 = l_lean_parser_level__parser__m_monad__except;
+x_21 = l_lean_parser_level__parser__m_lean_parser_monad__parsec;
+x_22 = l_lean_parser_level__parser__m_alternative;
+x_23 = l_lean_parser_level_paren;
+x_24 = l_lean_parser_level_paren_has__view;
+x_25 = l_lean_parser_combinators_node_view___rarg(x_19, x_20, x_21, x_22, x_23, x_18, x_24);
+lean::dec(x_18);
+return x_25;
 }
 }
 obj* l_list_mfoldl___main___at_lean_parser_level_paren_parser___spec__2(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6) {
@@ -1994,40 +1998,42 @@ return x_37;
 obj* _init_l_lean_parser_level_paren_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_nat_obj(0u);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_parser), 5, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string(")");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_6);
-lean::closure_set(x_12, 2, x_11);
-x_13 = lean::box(0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_12);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_7);
-lean::cnstr_set(x_15, 1, x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_nat_obj(0u);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_parser), 5, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string(")");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_7);
+lean::closure_set(x_14, 2, x_13);
+x_15 = lean::box(0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_5);
+lean::cnstr_set(x_16, 0, x_14);
 lean::cnstr_set(x_16, 1, x_15);
-return x_16;
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_8);
+lean::cnstr_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_6);
+lean::cnstr_set(x_18, 1, x_17);
+return x_18;
 }
 }
 obj* l_lean_parser_level_paren_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -3675,31 +3681,32 @@ return x_95;
 obj* _init_l_lean_parser_level_leading_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_17; obj* x_19; obj* x_21; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_11; obj* x_14; obj* x_16; obj* x_18; obj* x_20; obj* x_22; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string("_");
 x_2 = l_lean_parser_max__prec;
 x_3 = l_lean_parser_symbol_tokens___rarg(x_1, x_2);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_0, x_0);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_0, x_4);
-lean::dec(x_4);
-x_7 = l_lean_parser_level_paren_parser_lean_parser_has__tokens;
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_5);
+lean::dec(x_1);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_0, x_0);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_0, x_5);
 lean::dec(x_5);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_3, x_8);
-lean::dec(x_8);
+x_8 = l_lean_parser_level_paren_parser_lean_parser_has__tokens;
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_8, x_6);
+lean::dec(x_6);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_3, x_9);
+lean::dec(x_9);
 lean::dec(x_3);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_0, x_10);
-lean::dec(x_10);
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_0, x_13);
-lean::dec(x_13);
-x_17 = l_lean_parser_tokens___rarg(x_15);
-lean::dec(x_15);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_17, x_0);
-lean::dec(x_17);
-x_21 = l_lean_parser_tokens___rarg(x_19);
-lean::dec(x_19);
-return x_21;
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_0, x_11);
+lean::dec(x_11);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_0, x_14);
+lean::dec(x_14);
+x_18 = l_lean_parser_tokens___rarg(x_16);
+lean::dec(x_16);
+x_20 = l_lean_parser_list_cons_tokens___rarg(x_18, x_0);
+lean::dec(x_18);
+x_22 = l_lean_parser_tokens___rarg(x_20);
+lean::dec(x_20);
+return x_22;
 }
 }
 obj* l_lean_parser_symbol__or__ident___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__1___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -3753,7 +3760,7 @@ return x_1;
 obj* _init_l_lean_parser_level_leading_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; 
 x_0 = lean::mk_string("max");
 x_1 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__1___boxed), 5, 1);
 lean::closure_set(x_1, 0, x_0);
@@ -3762,58 +3769,59 @@ x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__iden
 lean::closure_set(x_3, 0, x_2);
 x_4 = lean::mk_string("_");
 x_5 = l_string_trim(x_4);
+lean::dec(x_4);
 lean::inc(x_5);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_7, 0, x_5);
-x_8 = l_lean_parser_max__prec;
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_9, 0, x_5);
-lean::closure_set(x_9, 1, x_8);
-lean::closure_set(x_9, 2, x_7);
-x_10 = lean::box(0);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__3___boxed), 1, 0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_11);
-lean::cnstr_set(x_12, 1, x_10);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__2___boxed), 1, 0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_13);
-lean::cnstr_set(x_14, 1, x_12);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_paren_parser), 4, 0);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_15);
-lean::cnstr_set(x_16, 1, x_14);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_8, 0, x_5);
+x_9 = l_lean_parser_max__prec;
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_10, 0, x_5);
+lean::closure_set(x_10, 1, x_9);
+lean::closure_set(x_10, 2, x_8);
+x_11 = lean::box(0);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__3___boxed), 1, 0);
+x_13 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_13, 0, x_12);
+lean::cnstr_set(x_13, 1, x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__2___boxed), 1, 0);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_14);
+lean::cnstr_set(x_15, 1, x_13);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_paren_parser), 4, 0);
 x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_9);
-lean::cnstr_set(x_17, 1, x_16);
+lean::cnstr_set(x_17, 0, x_16);
+lean::cnstr_set(x_17, 1, x_15);
 x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_3);
+lean::cnstr_set(x_18, 0, x_10);
 lean::cnstr_set(x_18, 1, x_17);
 x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_1);
+lean::cnstr_set(x_19, 0, x_3);
 lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::mk_nat_obj(0u);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__4), 6, 2);
-lean::closure_set(x_21, 0, x_19);
-lean::closure_set(x_21, 1, x_20);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_10);
-x_23 = l_lean_parser_level__parser__m_monad;
-x_24 = l_lean_parser_level__parser__m_monad__except;
-x_25 = l_lean_parser_level__parser__m_lean_parser_monad__parsec;
-x_26 = l_lean_parser_level__parser__m_alternative;
-x_27 = l_lean_parser_level_leading;
-x_28 = l_lean_parser_level_leading_has__view;
-x_29 = l_lean_parser_combinators_node_view___rarg(x_23, x_24, x_25, x_26, x_27, x_22, x_28);
-lean::dec(x_22);
-return x_29;
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_1);
+lean::cnstr_set(x_20, 1, x_19);
+x_21 = lean::mk_nat_obj(0u);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__4), 6, 2);
+lean::closure_set(x_22, 0, x_20);
+lean::closure_set(x_22, 1, x_21);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_11);
+x_24 = l_lean_parser_level__parser__m_monad;
+x_25 = l_lean_parser_level__parser__m_monad__except;
+x_26 = l_lean_parser_level__parser__m_lean_parser_monad__parsec;
+x_27 = l_lean_parser_level__parser__m_alternative;
+x_28 = l_lean_parser_level_leading;
+x_29 = l_lean_parser_level_leading_has__view;
+x_30 = l_lean_parser_combinators_node_view___rarg(x_24, x_25, x_26, x_27, x_28, x_23, x_29);
+lean::dec(x_23);
+return x_30;
 }
 }
 obj* _init_l_lean_parser_level_leading_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
 x_0 = lean::mk_string("max");
 x_1 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__1___boxed), 5, 1);
 lean::closure_set(x_1, 0, x_0);
@@ -3822,44 +3830,45 @@ x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__iden
 lean::closure_set(x_3, 0, x_2);
 x_4 = lean::mk_string("_");
 x_5 = l_string_trim(x_4);
+lean::dec(x_4);
 lean::inc(x_5);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_7, 0, x_5);
-x_8 = l_lean_parser_max__prec;
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
-lean::closure_set(x_9, 0, x_5);
-lean::closure_set(x_9, 1, x_8);
-lean::closure_set(x_9, 2, x_7);
-x_10 = lean::box(0);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__3___boxed), 1, 0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_11);
-lean::cnstr_set(x_12, 1, x_10);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__2___boxed), 1, 0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_13);
-lean::cnstr_set(x_14, 1, x_12);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_paren_parser), 4, 0);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_15);
-lean::cnstr_set(x_16, 1, x_14);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_8, 0, x_5);
+x_9 = l_lean_parser_max__prec;
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_paren_parser_lean_parser_has__tokens___spec__1___boxed), 7, 3);
+lean::closure_set(x_10, 0, x_5);
+lean::closure_set(x_10, 1, x_9);
+lean::closure_set(x_10, 2, x_8);
+x_11 = lean::box(0);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__3___boxed), 1, 0);
+x_13 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_13, 0, x_12);
+lean::cnstr_set(x_13, 1, x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__2___boxed), 1, 0);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_14);
+lean::cnstr_set(x_15, 1, x_13);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_paren_parser), 4, 0);
 x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_9);
-lean::cnstr_set(x_17, 1, x_16);
+lean::cnstr_set(x_17, 0, x_16);
+lean::cnstr_set(x_17, 1, x_15);
 x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_3);
+lean::cnstr_set(x_18, 0, x_10);
 lean::cnstr_set(x_18, 1, x_17);
 x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_1);
+lean::cnstr_set(x_19, 0, x_3);
 lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::mk_nat_obj(0u);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__4), 6, 2);
-lean::closure_set(x_21, 0, x_19);
-lean::closure_set(x_21, 1, x_20);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_10);
-return x_22;
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_1);
+lean::cnstr_set(x_20, 1, x_19);
+x_21 = lean::mk_nat_obj(0u);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_level_leading_parser_lean_parser_has__tokens___spec__4), 6, 2);
+lean::closure_set(x_22, 0, x_20);
+lean::closure_set(x_22, 1, x_21);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_11);
+return x_23;
 }
 }
 obj* l_lean_parser_level_leading_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
@@ -5396,21 +5405,22 @@ return x_2;
 obj* _init_l_lean_parser_level_add__lit_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; obj* x_9; obj* x_11; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_9; obj* x_10; obj* x_12; 
 x_0 = lean::mk_string("+");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_3, x_3);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_2, x_4);
-lean::dec(x_4);
-lean::dec(x_2);
-x_8 = l_lean_parser_level_lean_parser_has__tokens;
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_8, x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_4);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
 lean::dec(x_5);
-x_11 = l_lean_parser_tokens___rarg(x_9);
-lean::dec(x_9);
-return x_11;
+lean::dec(x_2);
+x_9 = l_lean_parser_level_lean_parser_has__tokens;
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_9, x_6);
+lean::dec(x_6);
+x_12 = l_lean_parser_tokens___rarg(x_10);
+lean::dec(x_10);
+return x_12;
 }
 }
 obj* l_lean_parser_symbol__core___at_lean_parser_level_add__lit_parser_lean_parser_has__tokens___spec__1___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6, obj* x_7) {
@@ -5437,67 +5447,69 @@ return x_2;
 obj* _init_l_lean_parser_level_add__lit_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; 
 x_0 = lean::mk_string("+");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_add__lit_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_level_add__lit_parser_lean_parser_has__tokens___spec__2___boxed), 2, 0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_7);
-lean::cnstr_set(x_8, 1, x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_add__lit_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_level_add__lit_parser_lean_parser_has__tokens___spec__2___boxed), 2, 0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
-lean::cnstr_set(x_9, 1, x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_get__leading___boxed), 5, 0);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_10);
-lean::cnstr_set(x_11, 1, x_9);
-x_12 = l_lean_parser_trailing__level__parser__m_monad;
-x_13 = l_lean_parser_trailing__level__parser__m_monad__except;
-x_14 = l_lean_parser_trailing__level__parser__m_lean_parser_monad__parsec;
-x_15 = l_lean_parser_trailing__level__parser__m_alternative;
-x_16 = l_lean_parser_level_add__lit;
-x_17 = l_lean_parser_level_add__lit_has__view;
-x_18 = l_lean_parser_combinators_node_view___rarg(x_12, x_13, x_14, x_15, x_16, x_11, x_17);
-lean::dec(x_11);
-return x_18;
+lean::cnstr_set(x_9, 0, x_8);
+lean::cnstr_set(x_9, 1, x_7);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_get__leading___boxed), 5, 0);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_11);
+lean::cnstr_set(x_12, 1, x_10);
+x_13 = l_lean_parser_trailing__level__parser__m_monad;
+x_14 = l_lean_parser_trailing__level__parser__m_monad__except;
+x_15 = l_lean_parser_trailing__level__parser__m_lean_parser_monad__parsec;
+x_16 = l_lean_parser_trailing__level__parser__m_alternative;
+x_17 = l_lean_parser_level_add__lit;
+x_18 = l_lean_parser_level_add__lit_has__view;
+x_19 = l_lean_parser_combinators_node_view___rarg(x_13, x_14, x_15, x_16, x_17, x_12, x_18);
+lean::dec(x_12);
+return x_19;
 }
 }
 obj* _init_l_lean_parser_level_add__lit_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; 
 x_0 = lean::mk_string("+");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_add__lit_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_level_add__lit_parser_lean_parser_has__tokens___spec__2___boxed), 2, 0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_7);
-lean::cnstr_set(x_8, 1, x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_level_add__lit_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_level_add__lit_parser_lean_parser_has__tokens___spec__2___boxed), 2, 0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
-lean::cnstr_set(x_9, 1, x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_get__leading___boxed), 5, 0);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_10);
-lean::cnstr_set(x_11, 1, x_9);
-return x_11;
+lean::cnstr_set(x_9, 0, x_8);
+lean::cnstr_set(x_9, 1, x_7);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_get__leading___boxed), 5, 0);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_11);
+lean::cnstr_set(x_12, 1, x_10);
+return x_12;
 }
 }
 obj* l_lean_parser_level_add__lit_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
diff --git a/src/boot/init/lean/parser/module.cpp b/src/boot/init/lean/parser/module.cpp
index 335110c8cf..44c0a7924d 100644
--- a/src/boot/init/lean/parser/module.cpp
+++ b/src/boot/init/lean/parser/module.cpp
@@ -703,66 +703,69 @@ return x_0;
 obj* _init_l_lean_parser_module_prelude_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; 
 x_0 = lean::mk_string("prelude");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-x_8 = l_lean_parser_basic__parser__m_monad;
-x_9 = l_lean_parser_basic__parser__m_monad__except;
-x_10 = l_lean_parser_basic__parser__m_lean_parser_monad__parsec;
-x_11 = l_lean_parser_basic__parser__m_alternative;
-x_12 = l_lean_parser_module_prelude;
-x_13 = l_lean_parser_module_prelude_has__view;
-x_14 = l_lean_parser_combinators_node_view___rarg(x_8, x_9, x_10, x_11, x_12, x_7, x_13);
-lean::dec(x_7);
-return x_14;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+x_9 = l_lean_parser_basic__parser__m_monad;
+x_10 = l_lean_parser_basic__parser__m_monad__except;
+x_11 = l_lean_parser_basic__parser__m_lean_parser_monad__parsec;
+x_12 = l_lean_parser_basic__parser__m_alternative;
+x_13 = l_lean_parser_module_prelude;
+x_14 = l_lean_parser_module_prelude_has__view;
+x_15 = l_lean_parser_combinators_node_view___rarg(x_9, x_10, x_11, x_12, x_13, x_8, x_14);
+lean::dec(x_8);
+return x_15;
 }
 }
 obj* _init_l_lean_parser_module_prelude_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_6; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; 
 x_0 = lean::mk_string("prelude");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_2, x_3);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_2, x_4);
 lean::dec(x_2);
-x_6 = l_lean_parser_tokens___rarg(x_4);
-lean::dec(x_4);
-return x_6;
+x_7 = l_lean_parser_tokens___rarg(x_5);
+lean::dec(x_5);
+return x_7;
 }
 }
 obj* _init_l_lean_parser_module_prelude_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; 
 x_0 = lean::mk_string("prelude");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-return x_7;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+return x_8;
 }
 }
 obj* l_lean_parser_module_prelude_parser(obj* x_0, obj* x_1, obj* x_2) {
@@ -2136,83 +2139,86 @@ return x_0;
 obj* _init_l_lean_parser_module_import_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; 
 x_0 = lean::mk_string("import");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_module_import__path_parser), 3, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens___spec__1), 4, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_module_import__path_parser), 3, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens___spec__1), 4, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-x_11 = l_lean_parser_basic__parser__m_monad;
-x_12 = l_lean_parser_basic__parser__m_monad__except;
-x_13 = l_lean_parser_basic__parser__m_lean_parser_monad__parsec;
-x_14 = l_lean_parser_basic__parser__m_alternative;
-x_15 = l_lean_parser_module_import;
-x_16 = l_lean_parser_module_import_has__view;
-x_17 = l_lean_parser_combinators_node_view___rarg(x_11, x_12, x_13, x_14, x_15, x_10, x_16);
-lean::dec(x_10);
-return x_17;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+x_12 = l_lean_parser_basic__parser__m_monad;
+x_13 = l_lean_parser_basic__parser__m_monad__except;
+x_14 = l_lean_parser_basic__parser__m_lean_parser_monad__parsec;
+x_15 = l_lean_parser_basic__parser__m_alternative;
+x_16 = l_lean_parser_module_import;
+x_17 = l_lean_parser_module_import_has__view;
+x_18 = l_lean_parser_combinators_node_view___rarg(x_12, x_13, x_14, x_15, x_16, x_11, x_17);
+lean::dec(x_11);
+return x_18;
 }
 }
 obj* _init_l_lean_parser_module_import_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_12; 
 x_0 = lean::mk_string("import");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_module_import__path_parser_lean_parser_has__tokens;
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
-lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
+lean::dec(x_0);
+x_4 = l_lean_parser_module_import__path_parser_lean_parser_has__tokens;
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = lean::box(0);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_5, x_6);
+lean::dec(x_5);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_2, x_7);
+lean::dec(x_7);
 lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
-lean::dec(x_8);
-return x_11;
+x_12 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+return x_12;
 }
 }
 obj* _init_l_lean_parser_module_import_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string("import");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_module_import__path_parser), 3, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens___spec__1), 4, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_module_import__path_parser), 3, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens___spec__1), 4, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-return x_10;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_module_import_parser(obj* x_0, obj* x_1, obj* x_2) {
diff --git a/src/boot/init/lean/parser/notation.cpp b/src/boot/init/lean/parser/notation.cpp
index 92504e238b..c75390fc85 100644
--- a/src/boot/init/lean/parser/notation.cpp
+++ b/src/boot/init/lean/parser/notation.cpp
@@ -4131,54 +4131,58 @@ return x_130;
 obj* _init_l_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_25; obj* x_28; obj* x_29; obj* x_31; obj* x_34; obj* x_36; obj* x_38; obj* x_40; obj* x_42; obj* x_44; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_13; obj* x_16; obj* x_18; obj* x_20; obj* x_22; obj* x_23; obj* x_25; obj* x_27; obj* x_29; obj* x_32; obj* x_33; obj* x_35; obj* x_38; obj* x_40; obj* x_42; obj* x_44; obj* x_46; obj* x_48; 
 x_0 = lean::mk_string("(");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(" + ");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::mk_string(" - ");
-x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_1);
-x_7 = lean::box(0);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_6, x_7);
-lean::dec(x_6);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_4, x_8);
-lean::dec(x_8);
+lean::dec(x_0);
+x_4 = lean::mk_string(" + ");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_13 = l_lean_parser_tokens___rarg(x_10);
-lean::dec(x_10);
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_13, x_7);
+x_7 = lean::mk_string(" - ");
+x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_1);
+lean::dec(x_7);
+x_10 = lean::box(0);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_8, x_10);
+lean::dec(x_8);
+x_13 = l_lean_parser_list_cons_tokens___rarg(x_5, x_11);
+lean::dec(x_11);
+lean::dec(x_5);
+x_16 = l_lean_parser_tokens___rarg(x_13);
 lean::dec(x_13);
-x_17 = l_lean_parser_tokens___rarg(x_15);
-lean::dec(x_15);
-x_19 = lean::mk_string(")");
-x_20 = l_lean_parser_symbol_tokens___rarg(x_19, x_1);
-x_21 = l_lean_parser_list_cons_tokens___rarg(x_20, x_7);
-lean::dec(x_20);
-x_23 = l_lean_parser_list_cons_tokens___rarg(x_7, x_21);
-lean::dec(x_21);
-x_25 = l_lean_parser_list_cons_tokens___rarg(x_17, x_23);
+x_18 = l_lean_parser_list_cons_tokens___rarg(x_16, x_10);
+lean::dec(x_16);
+x_20 = l_lean_parser_tokens___rarg(x_18);
+lean::dec(x_18);
+x_22 = lean::mk_string(")");
+x_23 = l_lean_parser_symbol_tokens___rarg(x_22, x_1);
+lean::dec(x_22);
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_23, x_10);
 lean::dec(x_23);
-lean::dec(x_17);
-x_28 = l_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens;
-x_29 = l_lean_parser_list_cons_tokens___rarg(x_28, x_25);
+x_27 = l_lean_parser_list_cons_tokens___rarg(x_10, x_25);
 lean::dec(x_25);
-x_31 = l_lean_parser_list_cons_tokens___rarg(x_2, x_29);
+x_29 = l_lean_parser_list_cons_tokens___rarg(x_20, x_27);
+lean::dec(x_27);
+lean::dec(x_20);
+x_32 = l_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens;
+x_33 = l_lean_parser_list_cons_tokens___rarg(x_32, x_29);
 lean::dec(x_29);
+x_35 = l_lean_parser_list_cons_tokens___rarg(x_2, x_33);
+lean::dec(x_33);
 lean::dec(x_2);
-x_34 = l_lean_parser_tokens___rarg(x_31);
-lean::dec(x_31);
-x_36 = l_lean_parser_list_cons_tokens___rarg(x_34, x_7);
-lean::dec(x_34);
-x_38 = l_lean_parser_list_cons_tokens___rarg(x_28, x_36);
-lean::dec(x_36);
-x_40 = l_lean_parser_tokens___rarg(x_38);
+x_38 = l_lean_parser_tokens___rarg(x_35);
+lean::dec(x_35);
+x_40 = l_lean_parser_list_cons_tokens___rarg(x_38, x_10);
 lean::dec(x_38);
-x_42 = l_lean_parser_list_cons_tokens___rarg(x_40, x_7);
+x_42 = l_lean_parser_list_cons_tokens___rarg(x_32, x_40);
 lean::dec(x_40);
 x_44 = l_lean_parser_tokens___rarg(x_42);
 lean::dec(x_42);
-return x_44;
+x_46 = l_lean_parser_list_cons_tokens___rarg(x_44, x_10);
+lean::dec(x_44);
+x_48 = l_lean_parser_tokens___rarg(x_46);
+lean::dec(x_46);
+return x_48;
 }
 }
 obj* l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6, obj* x_7) {
@@ -4195,199 +4199,207 @@ return x_8;
 obj* _init_l_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(" + ");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::mk_string(" - ");
-x_12 = l_string_trim(x_11);
-lean::inc(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_14, 0, x_12);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_15, 0, x_12);
-lean::closure_set(x_15, 1, x_4);
-lean::closure_set(x_15, 2, x_14);
-x_16 = lean::box(0);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_15);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_10);
-lean::cnstr_set(x_18, 1, x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_19, 0, x_18);
-lean::closure_set(x_19, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(" + ");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::mk_string(" - ");
+x_14 = l_string_trim(x_13);
+lean::dec(x_13);
+lean::inc(x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_17, 0, x_14);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_18, 0, x_14);
+lean::closure_set(x_18, 1, x_5);
+lean::closure_set(x_18, 2, x_17);
+x_19 = lean::box(0);
 x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_19);
-lean::cnstr_set(x_20, 1, x_16);
-x_21 = l_lean_parser_command_notation__spec_precedence__offset__op;
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::cnstr_set(x_20, 0, x_18);
+lean::cnstr_set(x_20, 1, x_19);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_12);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
 lean::closure_set(x_22, 0, x_21);
-lean::closure_set(x_22, 1, x_20);
-x_23 = lean::mk_string(")");
-x_24 = l_string_trim(x_23);
-lean::inc(x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_26, 0, x_24);
-x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_27, 0, x_24);
-lean::closure_set(x_27, 1, x_4);
-lean::closure_set(x_27, 2, x_26);
-x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_27);
-lean::cnstr_set(x_28, 1, x_16);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__1___boxed), 1, 0);
-x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_29);
-lean::cnstr_set(x_30, 1, x_28);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_22);
-lean::cnstr_set(x_31, 1, x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence__lit_parser), 5, 0);
-lean::inc(x_32);
+lean::closure_set(x_22, 1, x_5);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_19);
+x_24 = l_lean_parser_command_notation__spec_precedence__offset__op;
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_23);
+x_26 = lean::mk_string(")");
+x_27 = l_string_trim(x_26);
+lean::dec(x_26);
+lean::inc(x_27);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_30, 0, x_27);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_31, 0, x_27);
+lean::closure_set(x_31, 1, x_5);
+lean::closure_set(x_31, 2, x_30);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_31);
+lean::cnstr_set(x_32, 1, x_19);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__1___boxed), 1, 0);
 x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_32);
-lean::cnstr_set(x_34, 1, x_31);
+lean::cnstr_set(x_34, 0, x_33);
+lean::cnstr_set(x_34, 1, x_32);
 x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_5);
+lean::cnstr_set(x_35, 0, x_25);
 lean::cnstr_set(x_35, 1, x_34);
-x_36 = l_lean_parser_command_notation__spec_precedence__offset;
-x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_37, 0, x_36);
-lean::closure_set(x_37, 1, x_35);
+x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence__lit_parser), 5, 0);
+lean::inc(x_36);
 x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_37);
-lean::cnstr_set(x_38, 1, x_16);
+lean::cnstr_set(x_38, 0, x_36);
+lean::cnstr_set(x_38, 1, x_35);
 x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_32);
+lean::cnstr_set(x_39, 0, x_6);
 lean::cnstr_set(x_39, 1, x_38);
-x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_40, 0, x_39);
-lean::closure_set(x_40, 1, x_4);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_40);
-lean::cnstr_set(x_41, 1, x_16);
-x_42 = l_lean_parser_term__parser__m_monad;
-x_43 = l_lean_parser_term__parser__m_monad__except;
-x_44 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_45 = l_lean_parser_term__parser__m_alternative;
-x_46 = l_lean_parser_command_notation__spec_precedence__term;
-x_47 = l_lean_parser_command_notation__spec_precedence__term_has__view;
-x_48 = l_lean_parser_combinators_node_view___rarg(x_42, x_43, x_44, x_45, x_46, x_41, x_47);
-lean::dec(x_41);
-return x_48;
+x_40 = l_lean_parser_command_notation__spec_precedence__offset;
+x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_41, 0, x_40);
+lean::closure_set(x_41, 1, x_39);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_41);
+lean::cnstr_set(x_42, 1, x_19);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_36);
+lean::cnstr_set(x_43, 1, x_42);
+x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_44, 0, x_43);
+lean::closure_set(x_44, 1, x_5);
+x_45 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_45, 0, x_44);
+lean::cnstr_set(x_45, 1, x_19);
+x_46 = l_lean_parser_term__parser__m_monad;
+x_47 = l_lean_parser_term__parser__m_monad__except;
+x_48 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_49 = l_lean_parser_term__parser__m_alternative;
+x_50 = l_lean_parser_command_notation__spec_precedence__term;
+x_51 = l_lean_parser_command_notation__spec_precedence__term_has__view;
+x_52 = l_lean_parser_combinators_node_view___rarg(x_46, x_47, x_48, x_49, x_50, x_45, x_51);
+lean::dec(x_45);
+return x_52;
 }
 }
 obj* _init_l_lean_parser_command_notation__spec_precedence__term_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(" + ");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::mk_string(" - ");
-x_12 = l_string_trim(x_11);
-lean::inc(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_14, 0, x_12);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_15, 0, x_12);
-lean::closure_set(x_15, 1, x_4);
-lean::closure_set(x_15, 2, x_14);
-x_16 = lean::box(0);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_15);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_10);
-lean::cnstr_set(x_18, 1, x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_19, 0, x_18);
-lean::closure_set(x_19, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(" + ");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::mk_string(" - ");
+x_14 = l_string_trim(x_13);
+lean::dec(x_13);
+lean::inc(x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_17, 0, x_14);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_18, 0, x_14);
+lean::closure_set(x_18, 1, x_5);
+lean::closure_set(x_18, 2, x_17);
+x_19 = lean::box(0);
 x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_19);
-lean::cnstr_set(x_20, 1, x_16);
-x_21 = l_lean_parser_command_notation__spec_precedence__offset__op;
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::cnstr_set(x_20, 0, x_18);
+lean::cnstr_set(x_20, 1, x_19);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_12);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
 lean::closure_set(x_22, 0, x_21);
-lean::closure_set(x_22, 1, x_20);
-x_23 = lean::mk_string(")");
-x_24 = l_string_trim(x_23);
-lean::inc(x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_26, 0, x_24);
-x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_27, 0, x_24);
-lean::closure_set(x_27, 1, x_4);
-lean::closure_set(x_27, 2, x_26);
-x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_27);
-lean::cnstr_set(x_28, 1, x_16);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__1___boxed), 1, 0);
-x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_29);
-lean::cnstr_set(x_30, 1, x_28);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_22);
-lean::cnstr_set(x_31, 1, x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence__lit_parser), 5, 0);
-lean::inc(x_32);
+lean::closure_set(x_22, 1, x_5);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_19);
+x_24 = l_lean_parser_command_notation__spec_precedence__offset__op;
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_23);
+x_26 = lean::mk_string(")");
+x_27 = l_string_trim(x_26);
+lean::dec(x_26);
+lean::inc(x_27);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_30, 0, x_27);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_31, 0, x_27);
+lean::closure_set(x_31, 1, x_5);
+lean::closure_set(x_31, 2, x_30);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_31);
+lean::cnstr_set(x_32, 1, x_19);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_number_parser___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__1___boxed), 1, 0);
 x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_32);
-lean::cnstr_set(x_34, 1, x_31);
+lean::cnstr_set(x_34, 0, x_33);
+lean::cnstr_set(x_34, 1, x_32);
 x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_5);
+lean::cnstr_set(x_35, 0, x_25);
 lean::cnstr_set(x_35, 1, x_34);
-x_36 = l_lean_parser_command_notation__spec_precedence__offset;
-x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_37, 0, x_36);
-lean::closure_set(x_37, 1, x_35);
+x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence__lit_parser), 5, 0);
+lean::inc(x_36);
 x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_37);
-lean::cnstr_set(x_38, 1, x_16);
+lean::cnstr_set(x_38, 0, x_36);
+lean::cnstr_set(x_38, 1, x_35);
 x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_32);
+lean::cnstr_set(x_39, 0, x_6);
 lean::cnstr_set(x_39, 1, x_38);
-x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_40, 0, x_39);
-lean::closure_set(x_40, 1, x_4);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_40);
-lean::cnstr_set(x_41, 1, x_16);
-return x_41;
+x_40 = l_lean_parser_command_notation__spec_precedence__offset;
+x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_41, 0, x_40);
+lean::closure_set(x_41, 1, x_39);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_41);
+lean::cnstr_set(x_42, 1, x_19);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_36);
+lean::cnstr_set(x_43, 1, x_42);
+x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_44, 0, x_43);
+lean::closure_set(x_44, 1, x_5);
+x_45 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_45, 0, x_44);
+lean::cnstr_set(x_45, 1, x_19);
+return x_45;
 }
 }
 obj* l_lean_parser_command_notation__spec_precedence__term_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -4832,77 +4844,80 @@ return x_0;
 obj* _init_l_lean_parser_command_notation__spec_precedence_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_10; 
 x_0 = lean::mk_string(":");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens;
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
-lean::dec(x_5);
-lean::dec(x_2);
-x_9 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens;
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
 lean::dec(x_6);
-return x_9;
+lean::dec(x_2);
+x_10 = l_lean_parser_tokens___rarg(x_7);
+lean::dec(x_7);
+return x_10;
 }
 }
 obj* _init_l_lean_parser_command_notation__spec_precedence_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
 x_0 = lean::mk_string(":");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence__term_parser), 5, 0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_7);
-lean::cnstr_set(x_8, 1, x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence__term_parser), 5, 0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
-lean::cnstr_set(x_9, 1, x_8);
-x_10 = l_lean_parser_term__parser__m_monad;
-x_11 = l_lean_parser_term__parser__m_monad__except;
-x_12 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_13 = l_lean_parser_term__parser__m_alternative;
-x_14 = l_lean_parser_command_notation__spec_precedence;
-x_15 = l_lean_parser_command_notation__spec_precedence_has__view;
-x_16 = l_lean_parser_combinators_node_view___rarg(x_10, x_11, x_12, x_13, x_14, x_9, x_15);
-lean::dec(x_9);
-return x_16;
+lean::cnstr_set(x_9, 0, x_8);
+lean::cnstr_set(x_9, 1, x_7);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+x_11 = l_lean_parser_term__parser__m_monad;
+x_12 = l_lean_parser_term__parser__m_monad__except;
+x_13 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_14 = l_lean_parser_term__parser__m_alternative;
+x_15 = l_lean_parser_command_notation__spec_precedence;
+x_16 = l_lean_parser_command_notation__spec_precedence_has__view;
+x_17 = l_lean_parser_combinators_node_view___rarg(x_11, x_12, x_13, x_14, x_15, x_10, x_16);
+lean::dec(x_10);
+return x_17;
 }
 }
 obj* _init_l_lean_parser_command_notation__spec_precedence_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
 x_0 = lean::mk_string(":");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence__term_parser), 5, 0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_7);
-lean::cnstr_set(x_8, 1, x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence__term_parser), 5, 0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
-lean::cnstr_set(x_9, 1, x_8);
-return x_9;
+lean::cnstr_set(x_9, 0, x_8);
+lean::cnstr_set(x_9, 1, x_7);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+return x_10;
 }
 }
 obj* l_lean_parser_command_notation__spec_precedence_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -11005,54 +11020,57 @@ return x_1;
 obj* _init_l_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_20; obj* x_22; obj* x_24; obj* x_26; obj* x_28; obj* x_29; obj* x_31; obj* x_33; obj* x_36; obj* x_38; obj* x_41; obj* x_44; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_23; obj* x_25; obj* x_27; obj* x_29; obj* x_31; obj* x_32; obj* x_34; obj* x_36; obj* x_39; obj* x_41; obj* x_44; obj* x_47; 
 x_0 = lean::mk_string("(");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_3, x_3);
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_3, x_4);
-lean::dec(x_4);
-x_7 = l_lean_parser_tokens___rarg(x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_4);
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
 lean::dec(x_5);
-x_9 = lean::mk_string(",");
-x_10 = l_lean_parser_symbol_tokens___rarg(x_9, x_1);
-x_11 = lean::mk_string(")");
-x_12 = l_lean_parser_symbol_tokens___rarg(x_11, x_1);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_12, x_3);
-lean::dec(x_12);
-x_15 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_16 = l_lean_parser_list_cons_tokens___rarg(x_15, x_13);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_10, x_16);
-lean::dec(x_16);
+x_8 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_6);
+x_10 = lean::mk_string(",");
+x_11 = l_lean_parser_symbol_tokens___rarg(x_10, x_1);
 lean::dec(x_10);
-x_20 = l_lean_parser_list_cons_tokens___rarg(x_3, x_17);
-lean::dec(x_17);
-x_22 = l_lean_parser_list_cons_tokens___rarg(x_3, x_20);
-lean::dec(x_20);
-x_24 = l_lean_parser_list_cons_tokens___rarg(x_2, x_22);
-lean::dec(x_22);
-x_26 = l_lean_parser_tokens___rarg(x_24);
-lean::dec(x_24);
-x_28 = l_lean_parser_command_notation__spec_notation__symbol_parser_lean_parser_has__tokens;
-x_29 = l_lean_parser_list_cons_tokens___rarg(x_28, x_13);
+x_13 = lean::mk_string(")");
+x_14 = l_lean_parser_symbol_tokens___rarg(x_13, x_1);
 lean::dec(x_13);
-x_31 = l_lean_parser_list_cons_tokens___rarg(x_15, x_29);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_14, x_4);
+lean::dec(x_14);
+x_18 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_18, x_16);
+x_20 = l_lean_parser_list_cons_tokens___rarg(x_11, x_19);
+lean::dec(x_19);
+lean::dec(x_11);
+x_23 = l_lean_parser_list_cons_tokens___rarg(x_4, x_20);
+lean::dec(x_20);
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_4, x_23);
+lean::dec(x_23);
+x_27 = l_lean_parser_list_cons_tokens___rarg(x_2, x_25);
+lean::dec(x_25);
+x_29 = l_lean_parser_tokens___rarg(x_27);
+lean::dec(x_27);
+x_31 = l_lean_parser_command_notation__spec_notation__symbol_parser_lean_parser_has__tokens;
+x_32 = l_lean_parser_list_cons_tokens___rarg(x_31, x_16);
+lean::dec(x_16);
+x_34 = l_lean_parser_list_cons_tokens___rarg(x_18, x_32);
+lean::dec(x_32);
+x_36 = l_lean_parser_list_cons_tokens___rarg(x_29, x_34);
+lean::dec(x_34);
 lean::dec(x_29);
-x_33 = l_lean_parser_list_cons_tokens___rarg(x_26, x_31);
-lean::dec(x_31);
-lean::dec(x_26);
-x_36 = l_lean_parser_list_cons_tokens___rarg(x_28, x_33);
-lean::dec(x_33);
-x_38 = l_lean_parser_list_cons_tokens___rarg(x_7, x_36);
+x_39 = l_lean_parser_list_cons_tokens___rarg(x_31, x_36);
 lean::dec(x_36);
-lean::dec(x_7);
-x_41 = l_lean_parser_list_cons_tokens___rarg(x_2, x_38);
-lean::dec(x_38);
-lean::dec(x_2);
-x_44 = l_lean_parser_tokens___rarg(x_41);
+x_41 = l_lean_parser_list_cons_tokens___rarg(x_8, x_39);
+lean::dec(x_39);
+lean::dec(x_8);
+x_44 = l_lean_parser_list_cons_tokens___rarg(x_2, x_41);
 lean::dec(x_41);
-return x_44;
+lean::dec(x_2);
+x_47 = l_lean_parser_tokens___rarg(x_44);
+lean::dec(x_44);
+return x_47;
 }
 }
 obj* l_reader__t_orelse___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__2___boxed(obj* x_0) {
@@ -11085,207 +11103,213 @@ return x_1;
 obj* _init_l_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_28; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_26; obj* x_27; obj* x_28; obj* x_31; obj* x_32; obj* x_33; obj* x_35; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("foldl");
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string("foldr");
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
-lean::closure_set(x_9, 0, x_8);
-x_10 = lean::box(0);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_9);
-lean::cnstr_set(x_11, 1, x_10);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("foldl");
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string("foldr");
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
+lean::closure_set(x_10, 0, x_9);
+x_11 = lean::box(0);
 x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_7);
+lean::cnstr_set(x_12, 0, x_10);
 lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_any__of___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__1), 6, 1);
-lean::closure_set(x_13, 0, x_12);
-x_14 = lean::mk_string(",");
-x_15 = l_string_trim(x_14);
-lean::inc(x_15);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_17, 0, x_15);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_18, 0, x_15);
-lean::closure_set(x_18, 1, x_4);
-lean::closure_set(x_18, 2, x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_19, 0, x_4);
-x_20 = lean::mk_string(")");
-x_21 = l_string_trim(x_20);
-lean::inc(x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_23, 0, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_24, 0, x_21);
-lean::closure_set(x_24, 1, x_4);
-lean::closure_set(x_24, 2, x_23);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_10);
-lean::inc(x_25);
-lean::inc(x_19);
+x_13 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_13, 0, x_8);
+lean::cnstr_set(x_13, 1, x_12);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_any__of___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__1), 6, 1);
+lean::closure_set(x_14, 0, x_13);
+x_15 = lean::mk_string(",");
+x_16 = l_string_trim(x_15);
+lean::dec(x_15);
+lean::inc(x_16);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_19, 0, x_16);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_20, 0, x_16);
+lean::closure_set(x_20, 1, x_5);
+lean::closure_set(x_20, 2, x_19);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_21, 0, x_5);
+x_22 = lean::mk_string(")");
+x_23 = l_string_trim(x_22);
+lean::dec(x_22);
+lean::inc(x_23);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_26, 0, x_23);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_27, 0, x_23);
+lean::closure_set(x_27, 1, x_5);
+lean::closure_set(x_27, 2, x_26);
 x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_19);
-lean::cnstr_set(x_28, 1, x_25);
-x_29 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_29, 0, x_18);
-lean::cnstr_set(x_29, 1, x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-lean::inc(x_30);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_11);
+lean::inc(x_28);
+lean::inc(x_21);
+x_31 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_31, 0, x_21);
+lean::cnstr_set(x_31, 1, x_28);
 x_32 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_32, 0, x_30);
-lean::cnstr_set(x_32, 1, x_29);
-x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_30);
-lean::cnstr_set(x_33, 1, x_32);
-lean::inc(x_5);
+lean::cnstr_set(x_32, 0, x_20);
+lean::cnstr_set(x_32, 1, x_31);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+lean::inc(x_33);
 x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_5);
-lean::cnstr_set(x_35, 1, x_33);
-x_36 = l_lean_parser_command_notation__spec_fold__action__folder;
-x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_37, 0, x_36);
-lean::closure_set(x_37, 1, x_35);
-x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_notation__symbol_parser), 5, 0);
-lean::inc(x_38);
-x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_38);
-lean::cnstr_set(x_40, 1, x_25);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_19);
-lean::cnstr_set(x_41, 1, x_40);
-x_42 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_42, 0, x_37);
-lean::cnstr_set(x_42, 1, x_41);
+lean::cnstr_set(x_35, 0, x_33);
+lean::cnstr_set(x_35, 1, x_32);
+x_36 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_36, 0, x_33);
+lean::cnstr_set(x_36, 1, x_35);
+lean::inc(x_6);
+x_38 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_38, 0, x_6);
+lean::cnstr_set(x_38, 1, x_36);
+x_39 = l_lean_parser_command_notation__spec_fold__action__folder;
+x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_40, 0, x_39);
+lean::closure_set(x_40, 1, x_38);
+x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_notation__symbol_parser), 5, 0);
+lean::inc(x_41);
 x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_38);
-lean::cnstr_set(x_43, 1, x_42);
+lean::cnstr_set(x_43, 0, x_41);
+lean::cnstr_set(x_43, 1, x_28);
 x_44 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_44, 0, x_13);
+lean::cnstr_set(x_44, 0, x_21);
 lean::cnstr_set(x_44, 1, x_43);
 x_45 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_45, 0, x_5);
+lean::cnstr_set(x_45, 0, x_40);
 lean::cnstr_set(x_45, 1, x_44);
-x_46 = l_lean_parser_term__parser__m_monad;
-x_47 = l_lean_parser_term__parser__m_monad__except;
-x_48 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_49 = l_lean_parser_term__parser__m_alternative;
-x_50 = l_lean_parser_command_notation__spec_fold__action;
-x_51 = l_lean_parser_command_notation__spec_fold__action_has__view;
-x_52 = l_lean_parser_combinators_node_view___rarg(x_46, x_47, x_48, x_49, x_50, x_45, x_51);
-lean::dec(x_45);
-return x_52;
+x_46 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_46, 0, x_41);
+lean::cnstr_set(x_46, 1, x_45);
+x_47 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_47, 0, x_14);
+lean::cnstr_set(x_47, 1, x_46);
+x_48 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_48, 0, x_6);
+lean::cnstr_set(x_48, 1, x_47);
+x_49 = l_lean_parser_term__parser__m_monad;
+x_50 = l_lean_parser_term__parser__m_monad__except;
+x_51 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_52 = l_lean_parser_term__parser__m_alternative;
+x_53 = l_lean_parser_command_notation__spec_fold__action;
+x_54 = l_lean_parser_command_notation__spec_fold__action_has__view;
+x_55 = l_lean_parser_combinators_node_view___rarg(x_49, x_50, x_51, x_52, x_53, x_48, x_54);
+lean::dec(x_48);
+return x_55;
 }
 }
 obj* _init_l_lean_parser_command_notation__spec_fold__action_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_28; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_26; obj* x_27; obj* x_28; obj* x_31; obj* x_32; obj* x_33; obj* x_35; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("foldl");
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string("foldr");
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
-lean::closure_set(x_9, 0, x_8);
-x_10 = lean::box(0);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_9);
-lean::cnstr_set(x_11, 1, x_10);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("foldl");
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string("foldr");
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
+lean::closure_set(x_10, 0, x_9);
+x_11 = lean::box(0);
 x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_7);
+lean::cnstr_set(x_12, 0, x_10);
 lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_any__of___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__1), 6, 1);
-lean::closure_set(x_13, 0, x_12);
-x_14 = lean::mk_string(",");
-x_15 = l_string_trim(x_14);
-lean::inc(x_15);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_17, 0, x_15);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_18, 0, x_15);
-lean::closure_set(x_18, 1, x_4);
-lean::closure_set(x_18, 2, x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_19, 0, x_4);
-x_20 = lean::mk_string(")");
-x_21 = l_string_trim(x_20);
-lean::inc(x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_23, 0, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_24, 0, x_21);
-lean::closure_set(x_24, 1, x_4);
-lean::closure_set(x_24, 2, x_23);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_10);
-lean::inc(x_25);
-lean::inc(x_19);
+x_13 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_13, 0, x_8);
+lean::cnstr_set(x_13, 1, x_12);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_any__of___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__1), 6, 1);
+lean::closure_set(x_14, 0, x_13);
+x_15 = lean::mk_string(",");
+x_16 = l_string_trim(x_15);
+lean::dec(x_15);
+lean::inc(x_16);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_19, 0, x_16);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_20, 0, x_16);
+lean::closure_set(x_20, 1, x_5);
+lean::closure_set(x_20, 2, x_19);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_21, 0, x_5);
+x_22 = lean::mk_string(")");
+x_23 = l_string_trim(x_22);
+lean::dec(x_22);
+lean::inc(x_23);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_26, 0, x_23);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_27, 0, x_23);
+lean::closure_set(x_27, 1, x_5);
+lean::closure_set(x_27, 2, x_26);
 x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_19);
-lean::cnstr_set(x_28, 1, x_25);
-x_29 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_29, 0, x_18);
-lean::cnstr_set(x_29, 1, x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-lean::inc(x_30);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_11);
+lean::inc(x_28);
+lean::inc(x_21);
+x_31 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_31, 0, x_21);
+lean::cnstr_set(x_31, 1, x_28);
 x_32 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_32, 0, x_30);
-lean::cnstr_set(x_32, 1, x_29);
-x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_30);
-lean::cnstr_set(x_33, 1, x_32);
-lean::inc(x_5);
+lean::cnstr_set(x_32, 0, x_20);
+lean::cnstr_set(x_32, 1, x_31);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+lean::inc(x_33);
 x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_5);
-lean::cnstr_set(x_35, 1, x_33);
-x_36 = l_lean_parser_command_notation__spec_fold__action__folder;
-x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_37, 0, x_36);
-lean::closure_set(x_37, 1, x_35);
-x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_notation__symbol_parser), 5, 0);
-lean::inc(x_38);
-x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_38);
-lean::cnstr_set(x_40, 1, x_25);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_19);
-lean::cnstr_set(x_41, 1, x_40);
-x_42 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_42, 0, x_37);
-lean::cnstr_set(x_42, 1, x_41);
+lean::cnstr_set(x_35, 0, x_33);
+lean::cnstr_set(x_35, 1, x_32);
+x_36 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_36, 0, x_33);
+lean::cnstr_set(x_36, 1, x_35);
+lean::inc(x_6);
+x_38 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_38, 0, x_6);
+lean::cnstr_set(x_38, 1, x_36);
+x_39 = l_lean_parser_command_notation__spec_fold__action__folder;
+x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_40, 0, x_39);
+lean::closure_set(x_40, 1, x_38);
+x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_notation__symbol_parser), 5, 0);
+lean::inc(x_41);
 x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_38);
-lean::cnstr_set(x_43, 1, x_42);
+lean::cnstr_set(x_43, 0, x_41);
+lean::cnstr_set(x_43, 1, x_28);
 x_44 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_44, 0, x_13);
+lean::cnstr_set(x_44, 0, x_21);
 lean::cnstr_set(x_44, 1, x_43);
 x_45 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_45, 0, x_5);
+lean::cnstr_set(x_45, 0, x_40);
 lean::cnstr_set(x_45, 1, x_44);
-return x_45;
+x_46 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_46, 0, x_41);
+lean::cnstr_set(x_46, 1, x_45);
+x_47 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_47, 0, x_14);
+lean::cnstr_set(x_47, 1, x_46);
+x_48 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_48, 0, x_6);
+lean::cnstr_set(x_48, 1, x_47);
+return x_48;
 }
 }
 obj* l_lean_parser_command_notation__spec_fold__action_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -13462,71 +13486,75 @@ return x_0;
 obj* _init_l_lean_parser_command_notation__spec_action_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_25; obj* x_27; obj* x_30; obj* x_32; obj* x_35; obj* x_38; obj* x_40; obj* x_41; obj* x_42; obj* x_45; obj* x_47; obj* x_50; obj* x_52; obj* x_54; obj* x_56; obj* x_58; obj* x_61; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_14; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_26; obj* x_28; obj* x_29; obj* x_31; obj* x_34; obj* x_36; obj* x_39; obj* x_42; obj* x_44; obj* x_45; obj* x_46; obj* x_49; obj* x_51; obj* x_54; obj* x_56; obj* x_58; obj* x_60; obj* x_62; obj* x_65; 
 x_0 = lean::mk_string(":");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens;
-x_4 = l_lean_parser_tokens___rarg(x_3);
-x_5 = lean::box(0);
-x_6 = lean::mk_string("(");
-x_7 = l_lean_parser_symbol_tokens___rarg(x_6, x_1);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_5, x_5);
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_7, x_8);
-lean::dec(x_8);
+lean::dec(x_0);
+x_4 = l_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens;
+x_5 = l_lean_parser_tokens___rarg(x_4);
+x_6 = lean::box(0);
+x_7 = lean::mk_string("(");
+x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_1);
 lean::dec(x_7);
-x_12 = l_lean_parser_tokens___rarg(x_9);
-lean::dec(x_9);
-x_14 = l_lean_parser_tokens___rarg(x_12);
-lean::dec(x_12);
-x_16 = l_lean_parser_command_notation__spec_precedence_parser_lean_parser_has__tokens;
-x_17 = l_lean_parser_tokens___rarg(x_16);
-x_18 = lean::mk_string(", ");
-x_19 = l_lean_parser_symbol_tokens___rarg(x_18, x_1);
-x_20 = lean::mk_string(")");
-x_21 = l_lean_parser_symbol_tokens___rarg(x_20, x_1);
-x_22 = l_lean_parser_list_cons_tokens___rarg(x_21, x_5);
-lean::dec(x_21);
-x_24 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_25 = l_lean_parser_list_cons_tokens___rarg(x_24, x_22);
-lean::dec(x_22);
-x_27 = l_lean_parser_list_cons_tokens___rarg(x_19, x_25);
-lean::dec(x_25);
-lean::dec(x_19);
-x_30 = l_lean_parser_list_cons_tokens___rarg(x_5, x_27);
-lean::dec(x_27);
-x_32 = l_lean_parser_list_cons_tokens___rarg(x_17, x_30);
-lean::dec(x_30);
-lean::dec(x_17);
-x_35 = l_lean_parser_list_cons_tokens___rarg(x_14, x_32);
-lean::dec(x_32);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_6, x_6);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_8, x_10);
+lean::dec(x_10);
+lean::dec(x_8);
+x_14 = l_lean_parser_tokens___rarg(x_11);
+lean::dec(x_11);
+x_16 = l_lean_parser_tokens___rarg(x_14);
 lean::dec(x_14);
-x_38 = l_lean_parser_tokens___rarg(x_35);
-lean::dec(x_35);
-x_40 = l_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens;
-x_41 = l_lean_parser_list_cons_tokens___rarg(x_40, x_5);
-x_42 = l_lean_parser_list_cons_tokens___rarg(x_38, x_41);
-lean::dec(x_41);
-lean::dec(x_38);
-x_45 = l_lean_parser_list_cons_tokens___rarg(x_5, x_42);
-lean::dec(x_42);
-x_47 = l_lean_parser_list_cons_tokens___rarg(x_4, x_45);
+x_18 = l_lean_parser_command_notation__spec_precedence_parser_lean_parser_has__tokens;
+x_19 = l_lean_parser_tokens___rarg(x_18);
+x_20 = lean::mk_string(", ");
+x_21 = l_lean_parser_symbol_tokens___rarg(x_20, x_1);
+lean::dec(x_20);
+x_23 = lean::mk_string(")");
+x_24 = l_lean_parser_symbol_tokens___rarg(x_23, x_1);
+lean::dec(x_23);
+x_26 = l_lean_parser_list_cons_tokens___rarg(x_24, x_6);
+lean::dec(x_24);
+x_28 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_29 = l_lean_parser_list_cons_tokens___rarg(x_28, x_26);
+lean::dec(x_26);
+x_31 = l_lean_parser_list_cons_tokens___rarg(x_21, x_29);
+lean::dec(x_29);
+lean::dec(x_21);
+x_34 = l_lean_parser_list_cons_tokens___rarg(x_6, x_31);
+lean::dec(x_31);
+x_36 = l_lean_parser_list_cons_tokens___rarg(x_19, x_34);
+lean::dec(x_34);
+lean::dec(x_19);
+x_39 = l_lean_parser_list_cons_tokens___rarg(x_16, x_36);
+lean::dec(x_36);
+lean::dec(x_16);
+x_42 = l_lean_parser_tokens___rarg(x_39);
+lean::dec(x_39);
+x_44 = l_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens;
+x_45 = l_lean_parser_list_cons_tokens___rarg(x_44, x_6);
+x_46 = l_lean_parser_list_cons_tokens___rarg(x_42, x_45);
 lean::dec(x_45);
-lean::dec(x_4);
-x_50 = l_lean_parser_tokens___rarg(x_47);
-lean::dec(x_47);
-x_52 = l_lean_parser_list_cons_tokens___rarg(x_50, x_5);
-lean::dec(x_50);
-x_54 = l_lean_parser_tokens___rarg(x_52);
-lean::dec(x_52);
-x_56 = l_lean_parser_list_cons_tokens___rarg(x_54, x_5);
+lean::dec(x_42);
+x_49 = l_lean_parser_list_cons_tokens___rarg(x_6, x_46);
+lean::dec(x_46);
+x_51 = l_lean_parser_list_cons_tokens___rarg(x_5, x_49);
+lean::dec(x_49);
+lean::dec(x_5);
+x_54 = l_lean_parser_tokens___rarg(x_51);
+lean::dec(x_51);
+x_56 = l_lean_parser_list_cons_tokens___rarg(x_54, x_6);
 lean::dec(x_54);
-x_58 = l_lean_parser_list_cons_tokens___rarg(x_2, x_56);
+x_58 = l_lean_parser_tokens___rarg(x_56);
 lean::dec(x_56);
-lean::dec(x_2);
-x_61 = l_lean_parser_tokens___rarg(x_58);
+x_60 = l_lean_parser_list_cons_tokens___rarg(x_58, x_6);
 lean::dec(x_58);
-return x_61;
+x_62 = l_lean_parser_list_cons_tokens___rarg(x_2, x_60);
+lean::dec(x_60);
+lean::dec(x_2);
+x_65 = l_lean_parser_tokens___rarg(x_62);
+lean::dec(x_62);
+return x_65;
 }
 }
 obj* l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__1(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -13587,243 +13615,251 @@ return x_14;
 obj* _init_l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; 
 x_0 = lean::mk_string(":");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("prev");
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string("(");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_4);
-lean::closure_set(x_12, 2, x_11);
-x_13 = lean::mk_string("scoped");
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
-lean::closure_set(x_14, 0, x_13);
-x_15 = lean::box(0);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_14);
-lean::cnstr_set(x_16, 1, x_15);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_12);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_18, 0, x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence_parser), 5, 0);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("prev");
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string("(");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_5);
+lean::closure_set(x_14, 2, x_13);
+x_15 = lean::mk_string("scoped");
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
+lean::closure_set(x_16, 0, x_15);
+x_17 = lean::box(0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_16);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_14);
+lean::cnstr_set(x_19, 1, x_18);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
 lean::closure_set(x_20, 0, x_19);
-x_21 = lean::mk_string(", ");
-x_22 = l_string_trim(x_21);
-lean::inc(x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_24, 0, x_22);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_25, 0, x_22);
-lean::closure_set(x_25, 1, x_4);
-lean::closure_set(x_25, 2, x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_26, 0, x_4);
-x_27 = lean::mk_string(")");
-x_28 = l_string_trim(x_27);
-lean::inc(x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_30, 0, x_28);
-x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_31, 0, x_28);
-lean::closure_set(x_31, 1, x_4);
-lean::closure_set(x_31, 2, x_30);
-x_32 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_32, 0, x_31);
-lean::cnstr_set(x_32, 1, x_15);
-x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_26);
-lean::cnstr_set(x_33, 1, x_32);
-x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_25);
-lean::cnstr_set(x_34, 1, x_33);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence_parser), 5, 0);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_22, 0, x_21);
+x_23 = lean::mk_string(", ");
+x_24 = l_string_trim(x_23);
+lean::dec(x_23);
+lean::inc(x_24);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_27, 0, x_24);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_28, 0, x_24);
+lean::closure_set(x_28, 1, x_5);
+lean::closure_set(x_28, 2, x_27);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_29, 0, x_5);
+x_30 = lean::mk_string(")");
+x_31 = l_string_trim(x_30);
+lean::dec(x_30);
+lean::inc(x_31);
+x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_34, 0, x_31);
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_35, 0, x_31);
+lean::closure_set(x_35, 1, x_5);
+lean::closure_set(x_35, 2, x_34);
 x_36 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_36, 0, x_35);
-lean::cnstr_set(x_36, 1, x_34);
+lean::cnstr_set(x_36, 1, x_17);
 x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_20);
+lean::cnstr_set(x_37, 0, x_29);
 lean::cnstr_set(x_37, 1, x_36);
 x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_18);
+lean::cnstr_set(x_38, 0, x_28);
 lean::cnstr_set(x_38, 1, x_37);
-x_39 = l_lean_parser_command_notation__spec_scoped__action;
-x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_40, 0, x_39);
-lean::closure_set(x_40, 1, x_38);
-x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_fold__action_parser), 5, 0);
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_39);
+lean::cnstr_set(x_40, 1, x_38);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_22);
+lean::cnstr_set(x_41, 1, x_40);
 x_42 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_42, 0, x_41);
-lean::cnstr_set(x_42, 1, x_15);
-x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_40);
-lean::cnstr_set(x_43, 1, x_42);
-x_44 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_44, 0, x_7);
-lean::cnstr_set(x_44, 1, x_43);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__1), 5, 0);
+lean::cnstr_set(x_42, 0, x_20);
+lean::cnstr_set(x_42, 1, x_41);
+x_43 = l_lean_parser_command_notation__spec_scoped__action;
+x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_44, 0, x_43);
+lean::closure_set(x_44, 1, x_42);
+x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_fold__action_parser), 5, 0);
 x_46 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_46, 0, x_45);
-lean::cnstr_set(x_46, 1, x_44);
-x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_47, 0, x_46);
-lean::closure_set(x_47, 1, x_4);
+lean::cnstr_set(x_46, 1, x_17);
+x_47 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_47, 0, x_44);
+lean::cnstr_set(x_47, 1, x_46);
 x_48 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_48, 0, x_47);
-lean::cnstr_set(x_48, 1, x_15);
-x_49 = l_lean_parser_command_notation__spec_action__kind;
-x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_50, 0, x_49);
-lean::closure_set(x_50, 1, x_48);
-x_51 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_51, 0, x_50);
-lean::cnstr_set(x_51, 1, x_15);
+lean::cnstr_set(x_48, 0, x_8);
+lean::cnstr_set(x_48, 1, x_47);
+x_49 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__1), 5, 0);
+x_50 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_50, 0, x_49);
+lean::cnstr_set(x_50, 1, x_48);
+x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_51, 0, x_50);
+lean::closure_set(x_51, 1, x_5);
 x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_5);
-lean::cnstr_set(x_52, 1, x_51);
-x_53 = l_lean_parser_term__parser__m_monad;
-x_54 = l_lean_parser_term__parser__m_monad__except;
-x_55 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_56 = l_lean_parser_term__parser__m_alternative;
-x_57 = l_lean_parser_command_notation__spec_action;
-x_58 = l_lean_parser_command_notation__spec_action_has__view;
-x_59 = l_lean_parser_combinators_node_view___rarg(x_53, x_54, x_55, x_56, x_57, x_52, x_58);
-lean::dec(x_52);
-return x_59;
+lean::cnstr_set(x_52, 0, x_51);
+lean::cnstr_set(x_52, 1, x_17);
+x_53 = l_lean_parser_command_notation__spec_action__kind;
+x_54 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_54, 0, x_53);
+lean::closure_set(x_54, 1, x_52);
+x_55 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_55, 0, x_54);
+lean::cnstr_set(x_55, 1, x_17);
+x_56 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_56, 0, x_6);
+lean::cnstr_set(x_56, 1, x_55);
+x_57 = l_lean_parser_term__parser__m_monad;
+x_58 = l_lean_parser_term__parser__m_monad__except;
+x_59 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_60 = l_lean_parser_term__parser__m_alternative;
+x_61 = l_lean_parser_command_notation__spec_action;
+x_62 = l_lean_parser_command_notation__spec_action_has__view;
+x_63 = l_lean_parser_combinators_node_view___rarg(x_57, x_58, x_59, x_60, x_61, x_56, x_62);
+lean::dec(x_56);
+return x_63;
 }
 }
 obj* _init_l_lean_parser_command_notation__spec_action_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; 
 x_0 = lean::mk_string(":");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("prev");
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string("(");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_4);
-lean::closure_set(x_12, 2, x_11);
-x_13 = lean::mk_string("scoped");
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
-lean::closure_set(x_14, 0, x_13);
-x_15 = lean::box(0);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_14);
-lean::cnstr_set(x_16, 1, x_15);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_12);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_18, 0, x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence_parser), 5, 0);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("prev");
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string("(");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_5);
+lean::closure_set(x_14, 2, x_13);
+x_15 = lean::mk_string("scoped");
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__or__ident___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__2___boxed), 6, 1);
+lean::closure_set(x_16, 0, x_15);
+x_17 = lean::box(0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_16);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_14);
+lean::cnstr_set(x_19, 1, x_18);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
 lean::closure_set(x_20, 0, x_19);
-x_21 = lean::mk_string(", ");
-x_22 = l_string_trim(x_21);
-lean::inc(x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_24, 0, x_22);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_25, 0, x_22);
-lean::closure_set(x_25, 1, x_4);
-lean::closure_set(x_25, 2, x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_26, 0, x_4);
-x_27 = lean::mk_string(")");
-x_28 = l_string_trim(x_27);
-lean::inc(x_28);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_30, 0, x_28);
-x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_31, 0, x_28);
-lean::closure_set(x_31, 1, x_4);
-lean::closure_set(x_31, 2, x_30);
-x_32 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_32, 0, x_31);
-lean::cnstr_set(x_32, 1, x_15);
-x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_26);
-lean::cnstr_set(x_33, 1, x_32);
-x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_25);
-lean::cnstr_set(x_34, 1, x_33);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_precedence_parser), 5, 0);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_22, 0, x_21);
+x_23 = lean::mk_string(", ");
+x_24 = l_string_trim(x_23);
+lean::dec(x_23);
+lean::inc(x_24);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_27, 0, x_24);
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_28, 0, x_24);
+lean::closure_set(x_28, 1, x_5);
+lean::closure_set(x_28, 2, x_27);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_29, 0, x_5);
+x_30 = lean::mk_string(")");
+x_31 = l_string_trim(x_30);
+lean::dec(x_30);
+lean::inc(x_31);
+x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_34, 0, x_31);
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_35, 0, x_31);
+lean::closure_set(x_35, 1, x_5);
+lean::closure_set(x_35, 2, x_34);
 x_36 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_36, 0, x_35);
-lean::cnstr_set(x_36, 1, x_34);
+lean::cnstr_set(x_36, 1, x_17);
 x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_20);
+lean::cnstr_set(x_37, 0, x_29);
 lean::cnstr_set(x_37, 1, x_36);
 x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_18);
+lean::cnstr_set(x_38, 0, x_28);
 lean::cnstr_set(x_38, 1, x_37);
-x_39 = l_lean_parser_command_notation__spec_scoped__action;
-x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_40, 0, x_39);
-lean::closure_set(x_40, 1, x_38);
-x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_fold__action_parser), 5, 0);
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_39);
+lean::cnstr_set(x_40, 1, x_38);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_22);
+lean::cnstr_set(x_41, 1, x_40);
 x_42 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_42, 0, x_41);
-lean::cnstr_set(x_42, 1, x_15);
-x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_40);
-lean::cnstr_set(x_43, 1, x_42);
-x_44 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_44, 0, x_7);
-lean::cnstr_set(x_44, 1, x_43);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__1), 5, 0);
+lean::cnstr_set(x_42, 0, x_20);
+lean::cnstr_set(x_42, 1, x_41);
+x_43 = l_lean_parser_command_notation__spec_scoped__action;
+x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_44, 0, x_43);
+lean::closure_set(x_44, 1, x_42);
+x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_fold__action_parser), 5, 0);
 x_46 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_46, 0, x_45);
-lean::cnstr_set(x_46, 1, x_44);
-x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_47, 0, x_46);
-lean::closure_set(x_47, 1, x_4);
+lean::cnstr_set(x_46, 1, x_17);
+x_47 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_47, 0, x_44);
+lean::cnstr_set(x_47, 1, x_46);
 x_48 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_48, 0, x_47);
-lean::cnstr_set(x_48, 1, x_15);
-x_49 = l_lean_parser_command_notation__spec_action__kind;
-x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_50, 0, x_49);
-lean::closure_set(x_50, 1, x_48);
-x_51 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_51, 0, x_50);
-lean::cnstr_set(x_51, 1, x_15);
+lean::cnstr_set(x_48, 0, x_8);
+lean::cnstr_set(x_48, 1, x_47);
+x_49 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__1), 5, 0);
+x_50 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_50, 0, x_49);
+lean::cnstr_set(x_50, 1, x_48);
+x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_51, 0, x_50);
+lean::closure_set(x_51, 1, x_5);
 x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_5);
-lean::cnstr_set(x_52, 1, x_51);
-return x_52;
+lean::cnstr_set(x_52, 0, x_51);
+lean::cnstr_set(x_52, 1, x_17);
+x_53 = l_lean_parser_command_notation__spec_action__kind;
+x_54 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_54, 0, x_53);
+lean::closure_set(x_54, 1, x_52);
+x_55 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_55, 0, x_54);
+lean::cnstr_set(x_55, 1, x_17);
+x_56 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_56, 0, x_6);
+lean::cnstr_set(x_56, 1, x_55);
+return x_56;
 }
 }
 obj* l_lean_parser_command_notation__spec_action_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -19197,170 +19233,179 @@ return x_0;
 obj* _init_l_lean_parser_command_notation_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_24; obj* x_25; obj* x_27; obj* x_30; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_12; obj* x_15; obj* x_17; obj* x_19; obj* x_20; obj* x_22; obj* x_23; obj* x_24; obj* x_27; obj* x_28; obj* x_30; obj* x_33; 
 x_0 = lean::mk_string("local ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_tokens___rarg(x_2);
+lean::dec(x_0);
+x_4 = l_lean_parser_tokens___rarg(x_2);
 lean::dec(x_2);
-x_5 = lean::mk_string("notation");
-x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_1);
-x_7 = lean::box(0);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_6, x_7);
+x_6 = lean::mk_string("notation");
+x_7 = l_lean_parser_symbol_tokens___rarg(x_6, x_1);
 lean::dec(x_6);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_3, x_8);
-lean::dec(x_8);
-lean::dec(x_3);
-x_13 = l_lean_parser_tokens___rarg(x_10);
+x_9 = lean::box(0);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_7, x_9);
+lean::dec(x_7);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_4, x_10);
 lean::dec(x_10);
-x_15 = l_lean_parser_tokens___rarg(x_13);
-lean::dec(x_13);
-x_17 = lean::mk_string(":=");
-x_18 = l_lean_parser_symbol_tokens___rarg(x_17, x_1);
-x_19 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_20 = l_lean_parser_list_cons_tokens___rarg(x_19, x_7);
-x_21 = l_lean_parser_list_cons_tokens___rarg(x_18, x_20);
-lean::dec(x_20);
-lean::dec(x_18);
-x_24 = l_lean_parser_command_notation__spec_parser_lean_parser_has__tokens;
-x_25 = l_lean_parser_list_cons_tokens___rarg(x_24, x_21);
-lean::dec(x_21);
-x_27 = l_lean_parser_list_cons_tokens___rarg(x_15, x_25);
-lean::dec(x_25);
+lean::dec(x_4);
+x_15 = l_lean_parser_tokens___rarg(x_12);
+lean::dec(x_12);
+x_17 = l_lean_parser_tokens___rarg(x_15);
 lean::dec(x_15);
-x_30 = l_lean_parser_tokens___rarg(x_27);
-lean::dec(x_27);
-return x_30;
+x_19 = lean::mk_string(":=");
+x_20 = l_lean_parser_symbol_tokens___rarg(x_19, x_1);
+lean::dec(x_19);
+x_22 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_23 = l_lean_parser_list_cons_tokens___rarg(x_22, x_9);
+x_24 = l_lean_parser_list_cons_tokens___rarg(x_20, x_23);
+lean::dec(x_23);
+lean::dec(x_20);
+x_27 = l_lean_parser_command_notation__spec_parser_lean_parser_has__tokens;
+x_28 = l_lean_parser_list_cons_tokens___rarg(x_27, x_24);
+lean::dec(x_24);
+x_30 = l_lean_parser_list_cons_tokens___rarg(x_17, x_28);
+lean::dec(x_28);
+lean::dec(x_17);
+x_33 = l_lean_parser_tokens___rarg(x_30);
+lean::dec(x_30);
+return x_33;
 }
 }
 obj* _init_l_lean_parser_command_notation_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; 
 x_0 = lean::mk_string("local ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_6, 0, x_5);
-x_7 = lean::mk_string("notation");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::box(0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_11);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_6);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_15, 0, x_14);
-x_16 = lean::mk_string(":=");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_4);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_21, 0, x_4);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_12);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_20);
-lean::cnstr_set(x_23, 1, x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_parser), 5, 0);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_7, 0, x_6);
+x_8 = lean::mk_string("notation");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::box(0);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_13);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_16, 0, x_7);
+lean::cnstr_set(x_16, 1, x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_17, 0, x_16);
+x_18 = lean::mk_string(":=");
+x_19 = l_string_trim(x_18);
+lean::dec(x_18);
+lean::inc(x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_22, 0, x_19);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_23, 0, x_19);
+lean::closure_set(x_23, 1, x_5);
+lean::closure_set(x_23, 2, x_22);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_24, 0, x_5);
 x_25 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_23);
+lean::cnstr_set(x_25, 1, x_14);
 x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_15);
+lean::cnstr_set(x_26, 0, x_23);
 lean::cnstr_set(x_26, 1, x_25);
-x_27 = l_lean_parser_term__parser__m_monad;
-x_28 = l_lean_parser_term__parser__m_monad__except;
-x_29 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_30 = l_lean_parser_term__parser__m_alternative;
-x_31 = l_lean_parser_command_notation;
-x_32 = l_lean_parser_command_notation_has__view;
-x_33 = l_lean_parser_combinators_node_view___rarg(x_27, x_28, x_29, x_30, x_31, x_26, x_32);
-lean::dec(x_26);
-return x_33;
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_parser), 5, 0);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_26);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_17);
+lean::cnstr_set(x_29, 1, x_28);
+x_30 = l_lean_parser_term__parser__m_monad;
+x_31 = l_lean_parser_term__parser__m_monad__except;
+x_32 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_33 = l_lean_parser_term__parser__m_alternative;
+x_34 = l_lean_parser_command_notation;
+x_35 = l_lean_parser_command_notation_has__view;
+x_36 = l_lean_parser_combinators_node_view___rarg(x_30, x_31, x_32, x_33, x_34, x_29, x_35);
+lean::dec(x_29);
+return x_36;
 }
 }
 obj* _init_l_lean_parser_command_notation_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; 
 x_0 = lean::mk_string("local ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_6, 0, x_5);
-x_7 = lean::mk_string("notation");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::box(0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_11);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_6);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_15, 0, x_14);
-x_16 = lean::mk_string(":=");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_4);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_21, 0, x_4);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_12);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_20);
-lean::cnstr_set(x_23, 1, x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_parser), 5, 0);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_7, 0, x_6);
+x_8 = lean::mk_string("notation");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::box(0);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_13);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_16, 0, x_7);
+lean::cnstr_set(x_16, 1, x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_17, 0, x_16);
+x_18 = lean::mk_string(":=");
+x_19 = l_string_trim(x_18);
+lean::dec(x_18);
+lean::inc(x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_22, 0, x_19);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_23, 0, x_19);
+lean::closure_set(x_23, 1, x_5);
+lean::closure_set(x_23, 2, x_22);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_24, 0, x_5);
 x_25 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_23);
+lean::cnstr_set(x_25, 1, x_14);
 x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_15);
+lean::cnstr_set(x_26, 0, x_23);
 lean::cnstr_set(x_26, 1, x_25);
-return x_26;
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_parser), 5, 0);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_26);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_17);
+lean::cnstr_set(x_29, 1, x_28);
+return x_29;
 }
 }
 obj* l_lean_parser_command_notation_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -20039,122 +20084,128 @@ return x_0;
 obj* _init_l_lean_parser_command_reserve__notation_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_20; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_22; 
 x_0 = lean::mk_string("reserve");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string("notation");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
+lean::dec(x_0);
+x_4 = lean::mk_string("notation");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
-lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
+x_7 = lean::box(0);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_5, x_7);
+lean::dec(x_5);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_2, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_tokens___rarg(x_11);
-lean::dec(x_11);
-x_15 = l_lean_parser_command_notation__spec_parser_lean_parser_has__tokens;
-x_16 = l_lean_parser_list_cons_tokens___rarg(x_15, x_5);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_13, x_16);
-lean::dec(x_16);
+lean::dec(x_2);
+x_13 = l_lean_parser_tokens___rarg(x_10);
+lean::dec(x_10);
+x_15 = l_lean_parser_tokens___rarg(x_13);
 lean::dec(x_13);
-x_20 = l_lean_parser_tokens___rarg(x_17);
-lean::dec(x_17);
-return x_20;
+x_17 = l_lean_parser_command_notation__spec_parser_lean_parser_has__tokens;
+x_18 = l_lean_parser_list_cons_tokens___rarg(x_17, x_7);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_15, x_18);
+lean::dec(x_18);
+lean::dec(x_15);
+x_22 = l_lean_parser_tokens___rarg(x_19);
+lean::dec(x_19);
+return x_22;
 }
 }
 obj* _init_l_lean_parser_command_reserve__notation_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; 
 x_0 = lean::mk_string("reserve");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("notation");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_14, 0, x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_parser), 5, 0);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_15);
-lean::cnstr_set(x_16, 1, x_11);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_14);
-lean::cnstr_set(x_17, 1, x_16);
-x_18 = l_lean_parser_term__parser__m_monad;
-x_19 = l_lean_parser_term__parser__m_monad__except;
-x_20 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_21 = l_lean_parser_term__parser__m_alternative;
-x_22 = l_lean_parser_command_reserve__notation;
-x_23 = l_lean_parser_command_reserve__notation_has__view;
-x_24 = l_lean_parser_combinators_node_view___rarg(x_18, x_19, x_20, x_21, x_22, x_17, x_23);
-lean::dec(x_17);
-return x_24;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("notation");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_16, 0, x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_parser), 5, 0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_13);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_16);
+lean::cnstr_set(x_19, 1, x_18);
+x_20 = l_lean_parser_term__parser__m_monad;
+x_21 = l_lean_parser_term__parser__m_monad__except;
+x_22 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_23 = l_lean_parser_term__parser__m_alternative;
+x_24 = l_lean_parser_command_reserve__notation;
+x_25 = l_lean_parser_command_reserve__notation_has__view;
+x_26 = l_lean_parser_combinators_node_view___rarg(x_20, x_21, x_22, x_23, x_24, x_19, x_25);
+lean::dec(x_19);
+return x_26;
 }
 }
 obj* _init_l_lean_parser_command_reserve__notation_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; 
 x_0 = lean::mk_string("reserve");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("notation");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_14, 0, x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_parser), 5, 0);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_15);
-lean::cnstr_set(x_16, 1, x_11);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_14);
-lean::cnstr_set(x_17, 1, x_16);
-return x_17;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("notation");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_16, 0, x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_parser), 5, 0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_13);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_16);
+lean::cnstr_set(x_19, 1, x_18);
+return x_19;
 }
 }
 obj* l_lean_parser_command_reserve__notation_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -21168,198 +21219,213 @@ return x_0;
 obj* _init_l_lean_parser_command_mixfix_kind_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_17; obj* x_20; obj* x_23; obj* x_26; obj* x_28; obj* x_30; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_19; obj* x_22; obj* x_25; obj* x_28; obj* x_31; obj* x_33; obj* x_35; 
 x_0 = lean::mk_string("prefix");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string("infix");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::mk_string("infixl");
-x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_1);
-x_7 = lean::mk_string("infixr");
-x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_1);
-x_9 = lean::mk_string("postfix");
-x_10 = l_lean_parser_symbol_tokens___rarg(x_9, x_1);
-x_11 = lean::box(0);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_10, x_11);
-lean::dec(x_10);
-x_14 = l_lean_parser_list_cons_tokens___rarg(x_8, x_12);
-lean::dec(x_12);
-lean::dec(x_8);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_6, x_14);
-lean::dec(x_14);
-lean::dec(x_6);
-x_20 = l_lean_parser_list_cons_tokens___rarg(x_4, x_17);
-lean::dec(x_17);
+lean::dec(x_0);
+x_4 = lean::mk_string("infix");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_23 = l_lean_parser_list_cons_tokens___rarg(x_2, x_20);
-lean::dec(x_20);
+x_7 = lean::mk_string("infixl");
+x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_1);
+lean::dec(x_7);
+x_10 = lean::mk_string("infixr");
+x_11 = l_lean_parser_symbol_tokens___rarg(x_10, x_1);
+lean::dec(x_10);
+x_13 = lean::mk_string("postfix");
+x_14 = l_lean_parser_symbol_tokens___rarg(x_13, x_1);
+lean::dec(x_13);
+x_16 = lean::box(0);
+x_17 = l_lean_parser_list_cons_tokens___rarg(x_14, x_16);
+lean::dec(x_14);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_11, x_17);
+lean::dec(x_17);
+lean::dec(x_11);
+x_22 = l_lean_parser_list_cons_tokens___rarg(x_8, x_19);
+lean::dec(x_19);
+lean::dec(x_8);
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_5, x_22);
+lean::dec(x_22);
+lean::dec(x_5);
+x_28 = l_lean_parser_list_cons_tokens___rarg(x_2, x_25);
+lean::dec(x_25);
 lean::dec(x_2);
-x_26 = l_lean_parser_tokens___rarg(x_23);
-lean::dec(x_23);
-x_28 = l_lean_parser_list_cons_tokens___rarg(x_26, x_11);
-lean::dec(x_26);
-x_30 = l_lean_parser_tokens___rarg(x_28);
+x_31 = l_lean_parser_tokens___rarg(x_28);
 lean::dec(x_28);
-return x_30;
+x_33 = l_lean_parser_list_cons_tokens___rarg(x_31, x_16);
+lean::dec(x_31);
+x_35 = l_lean_parser_tokens___rarg(x_33);
+lean::dec(x_33);
+return x_35;
 }
 }
 obj* _init_l_lean_parser_command_mixfix_kind_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; 
 x_0 = lean::mk_string("prefix");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("infix");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::mk_string("infixl");
-x_12 = l_string_trim(x_11);
-lean::inc(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_14, 0, x_12);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_15, 0, x_12);
-lean::closure_set(x_15, 1, x_4);
-lean::closure_set(x_15, 2, x_14);
-x_16 = lean::mk_string("infixr");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_4);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::mk_string("postfix");
-x_22 = l_string_trim(x_21);
-lean::inc(x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_24, 0, x_22);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_25, 0, x_22);
-lean::closure_set(x_25, 1, x_4);
-lean::closure_set(x_25, 2, x_24);
-x_26 = lean::box(0);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_25);
-lean::cnstr_set(x_27, 1, x_26);
-x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_20);
-lean::cnstr_set(x_28, 1, x_27);
-x_29 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_29, 0, x_15);
-lean::cnstr_set(x_29, 1, x_28);
-x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_10);
-lean::cnstr_set(x_30, 1, x_29);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_5);
-lean::cnstr_set(x_31, 1, x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_32, 0, x_31);
-lean::closure_set(x_32, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("infix");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::mk_string("infixl");
+x_14 = l_string_trim(x_13);
+lean::dec(x_13);
+lean::inc(x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_17, 0, x_14);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_18, 0, x_14);
+lean::closure_set(x_18, 1, x_5);
+lean::closure_set(x_18, 2, x_17);
+x_19 = lean::mk_string("infixr");
+x_20 = l_string_trim(x_19);
+lean::dec(x_19);
+lean::inc(x_20);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_23, 0, x_20);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_24, 0, x_20);
+lean::closure_set(x_24, 1, x_5);
+lean::closure_set(x_24, 2, x_23);
+x_25 = lean::mk_string("postfix");
+x_26 = l_string_trim(x_25);
+lean::dec(x_25);
+lean::inc(x_26);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_29, 0, x_26);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_30, 0, x_26);
+lean::closure_set(x_30, 1, x_5);
+lean::closure_set(x_30, 2, x_29);
+x_31 = lean::box(0);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_30);
+lean::cnstr_set(x_32, 1, x_31);
 x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_32);
-lean::cnstr_set(x_33, 1, x_26);
-x_34 = l_lean_parser_term__parser__m_monad;
-x_35 = l_lean_parser_term__parser__m_monad__except;
-x_36 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_37 = l_lean_parser_term__parser__m_alternative;
-x_38 = l_lean_parser_command_mixfix_kind;
-x_39 = l_lean_parser_command_mixfix_kind_has__view;
-x_40 = l_lean_parser_combinators_node_view___rarg(x_34, x_35, x_36, x_37, x_38, x_33, x_39);
-lean::dec(x_33);
-return x_40;
+lean::cnstr_set(x_33, 0, x_24);
+lean::cnstr_set(x_33, 1, x_32);
+x_34 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_34, 0, x_18);
+lean::cnstr_set(x_34, 1, x_33);
+x_35 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_35, 0, x_12);
+lean::cnstr_set(x_35, 1, x_34);
+x_36 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_36, 0, x_6);
+lean::cnstr_set(x_36, 1, x_35);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_37, 0, x_36);
+lean::closure_set(x_37, 1, x_5);
+x_38 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_38, 0, x_37);
+lean::cnstr_set(x_38, 1, x_31);
+x_39 = l_lean_parser_term__parser__m_monad;
+x_40 = l_lean_parser_term__parser__m_monad__except;
+x_41 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_42 = l_lean_parser_term__parser__m_alternative;
+x_43 = l_lean_parser_command_mixfix_kind;
+x_44 = l_lean_parser_command_mixfix_kind_has__view;
+x_45 = l_lean_parser_combinators_node_view___rarg(x_39, x_40, x_41, x_42, x_43, x_38, x_44);
+lean::dec(x_38);
+return x_45;
 }
 }
 obj* _init_l_lean_parser_command_mixfix_kind_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; 
 x_0 = lean::mk_string("prefix");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("infix");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::mk_string("infixl");
-x_12 = l_string_trim(x_11);
-lean::inc(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_14, 0, x_12);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_15, 0, x_12);
-lean::closure_set(x_15, 1, x_4);
-lean::closure_set(x_15, 2, x_14);
-x_16 = lean::mk_string("infixr");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_4);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::mk_string("postfix");
-x_22 = l_string_trim(x_21);
-lean::inc(x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_24, 0, x_22);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_25, 0, x_22);
-lean::closure_set(x_25, 1, x_4);
-lean::closure_set(x_25, 2, x_24);
-x_26 = lean::box(0);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_25);
-lean::cnstr_set(x_27, 1, x_26);
-x_28 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_28, 0, x_20);
-lean::cnstr_set(x_28, 1, x_27);
-x_29 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_29, 0, x_15);
-lean::cnstr_set(x_29, 1, x_28);
-x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_10);
-lean::cnstr_set(x_30, 1, x_29);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_5);
-lean::cnstr_set(x_31, 1, x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_32, 0, x_31);
-lean::closure_set(x_32, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("infix");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::mk_string("infixl");
+x_14 = l_string_trim(x_13);
+lean::dec(x_13);
+lean::inc(x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_17, 0, x_14);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_18, 0, x_14);
+lean::closure_set(x_18, 1, x_5);
+lean::closure_set(x_18, 2, x_17);
+x_19 = lean::mk_string("infixr");
+x_20 = l_string_trim(x_19);
+lean::dec(x_19);
+lean::inc(x_20);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_23, 0, x_20);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_24, 0, x_20);
+lean::closure_set(x_24, 1, x_5);
+lean::closure_set(x_24, 2, x_23);
+x_25 = lean::mk_string("postfix");
+x_26 = l_string_trim(x_25);
+lean::dec(x_25);
+lean::inc(x_26);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_29, 0, x_26);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_30, 0, x_26);
+lean::closure_set(x_30, 1, x_5);
+lean::closure_set(x_30, 2, x_29);
+x_31 = lean::box(0);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_30);
+lean::cnstr_set(x_32, 1, x_31);
 x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_32);
-lean::cnstr_set(x_33, 1, x_26);
-return x_33;
+lean::cnstr_set(x_33, 0, x_24);
+lean::cnstr_set(x_33, 1, x_32);
+x_34 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_34, 0, x_18);
+lean::cnstr_set(x_34, 1, x_33);
+x_35 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_35, 0, x_12);
+lean::cnstr_set(x_35, 1, x_34);
+x_36 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_36, 0, x_6);
+lean::cnstr_set(x_36, 1, x_35);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_37, 0, x_36);
+lean::closure_set(x_37, 1, x_5);
+x_38 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_38, 0, x_37);
+lean::cnstr_set(x_38, 1, x_31);
+return x_38;
 }
 }
 obj* l_lean_parser_command_mixfix_kind_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -22284,152 +22350,158 @@ return x_0;
 obj* _init_l_lean_parser_command_mixfix_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_25; obj* x_28; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_14; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_24; obj* x_25; obj* x_27; obj* x_30; 
 x_0 = lean::mk_string("local ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_tokens___rarg(x_2);
+lean::dec(x_0);
+x_4 = l_lean_parser_tokens___rarg(x_2);
 lean::dec(x_2);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_command_mixfix_kind_parser_lean_parser_has__tokens;
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_5);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_3, x_7);
-lean::dec(x_7);
-lean::dec(x_3);
-x_11 = l_lean_parser_tokens___rarg(x_8);
+x_6 = lean::box(0);
+x_7 = l_lean_parser_command_mixfix_kind_parser_lean_parser_has__tokens;
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_6);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_4, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_tokens___rarg(x_11);
-lean::dec(x_11);
-x_15 = lean::mk_string(":=");
-x_16 = l_lean_parser_symbol_tokens___rarg(x_15, x_1);
-x_17 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_18 = l_lean_parser_list_cons_tokens___rarg(x_17, x_5);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_16, x_18);
-lean::dec(x_18);
+lean::dec(x_4);
+x_12 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+x_14 = l_lean_parser_tokens___rarg(x_12);
+lean::dec(x_12);
+x_16 = lean::mk_string(":=");
+x_17 = l_lean_parser_symbol_tokens___rarg(x_16, x_1);
 lean::dec(x_16);
-x_22 = l_lean_parser_command_notation__spec_mixfix__symbol_parser_lean_parser_has__tokens;
-x_23 = l_lean_parser_list_cons_tokens___rarg(x_22, x_19);
-lean::dec(x_19);
-x_25 = l_lean_parser_list_cons_tokens___rarg(x_13, x_23);
-lean::dec(x_23);
-lean::dec(x_13);
-x_28 = l_lean_parser_tokens___rarg(x_25);
+x_19 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_20 = l_lean_parser_list_cons_tokens___rarg(x_19, x_6);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_17, x_20);
+lean::dec(x_20);
+lean::dec(x_17);
+x_24 = l_lean_parser_command_notation__spec_mixfix__symbol_parser_lean_parser_has__tokens;
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_24, x_21);
+lean::dec(x_21);
+x_27 = l_lean_parser_list_cons_tokens___rarg(x_14, x_25);
 lean::dec(x_25);
-return x_28;
+lean::dec(x_14);
+x_30 = l_lean_parser_tokens___rarg(x_27);
+lean::dec(x_27);
+return x_30;
 }
 }
 obj* _init_l_lean_parser_command_mixfix_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; 
 x_0 = lean::mk_string("local ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_6, 0, x_5);
-x_7 = lean::box(0);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_mixfix_kind_parser), 5, 0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_8);
-lean::cnstr_set(x_9, 1, x_7);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_7, 0, x_6);
+x_8 = lean::box(0);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_mixfix_kind_parser), 5, 0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_6);
-lean::cnstr_set(x_10, 1, x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_11, 0, x_10);
-x_12 = lean::mk_string(":=");
-x_13 = l_string_trim(x_12);
-lean::inc(x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_15, 0, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_13);
-lean::closure_set(x_16, 1, x_4);
-lean::closure_set(x_16, 2, x_15);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_17, 0, x_4);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_17);
-lean::cnstr_set(x_18, 1, x_7);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_16);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_mixfix__symbol_parser), 5, 0);
+lean::cnstr_set(x_10, 0, x_9);
+lean::cnstr_set(x_10, 1, x_8);
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_7);
+lean::cnstr_set(x_11, 1, x_10);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_12, 0, x_11);
+x_13 = lean::mk_string(":=");
+x_14 = l_string_trim(x_13);
+lean::dec(x_13);
+lean::inc(x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_17, 0, x_14);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_18, 0, x_14);
+lean::closure_set(x_18, 1, x_5);
+lean::closure_set(x_18, 2, x_17);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_19, 0, x_5);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_19);
+lean::cnstr_set(x_20, 1, x_8);
 x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_19);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_11);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = l_lean_parser_term__parser__m_monad;
-x_24 = l_lean_parser_term__parser__m_monad__except;
-x_25 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_26 = l_lean_parser_term__parser__m_alternative;
-x_27 = l_lean_parser_command_mixfix;
-x_28 = l_lean_parser_command_mixfix_has__view;
-x_29 = l_lean_parser_combinators_node_view___rarg(x_23, x_24, x_25, x_26, x_27, x_22, x_28);
-lean::dec(x_22);
-return x_29;
+lean::cnstr_set(x_21, 0, x_18);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_mixfix__symbol_parser), 5, 0);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_21);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_12);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = l_lean_parser_term__parser__m_monad;
+x_26 = l_lean_parser_term__parser__m_monad__except;
+x_27 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_28 = l_lean_parser_term__parser__m_alternative;
+x_29 = l_lean_parser_command_mixfix;
+x_30 = l_lean_parser_command_mixfix_has__view;
+x_31 = l_lean_parser_combinators_node_view___rarg(x_25, x_26, x_27, x_28, x_29, x_24, x_30);
+lean::dec(x_24);
+return x_31;
 }
 }
 obj* _init_l_lean_parser_command_mixfix_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
 x_0 = lean::mk_string("local ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_6, 0, x_5);
-x_7 = lean::box(0);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_mixfix_kind_parser), 5, 0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_8);
-lean::cnstr_set(x_9, 1, x_7);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_7, 0, x_6);
+x_8 = lean::box(0);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_mixfix_kind_parser), 5, 0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_6);
-lean::cnstr_set(x_10, 1, x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_11, 0, x_10);
-x_12 = lean::mk_string(":=");
-x_13 = l_string_trim(x_12);
-lean::inc(x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_15, 0, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_13);
-lean::closure_set(x_16, 1, x_4);
-lean::closure_set(x_16, 2, x_15);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_17, 0, x_4);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_17);
-lean::cnstr_set(x_18, 1, x_7);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_16);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_mixfix__symbol_parser), 5, 0);
+lean::cnstr_set(x_10, 0, x_9);
+lean::cnstr_set(x_10, 1, x_8);
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_7);
+lean::cnstr_set(x_11, 1, x_10);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_12, 0, x_11);
+x_13 = lean::mk_string(":=");
+x_14 = l_string_trim(x_13);
+lean::dec(x_13);
+lean::inc(x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_17, 0, x_14);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_18, 0, x_14);
+lean::closure_set(x_18, 1, x_5);
+lean::closure_set(x_18, 2, x_17);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_19, 0, x_5);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_19);
+lean::cnstr_set(x_20, 1, x_8);
 x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_19);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_11);
-lean::cnstr_set(x_22, 1, x_21);
-return x_22;
+lean::cnstr_set(x_21, 0, x_18);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_mixfix__symbol_parser), 5, 0);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_21);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_12);
+lean::cnstr_set(x_24, 1, x_23);
+return x_24;
 }
 }
 obj* l_lean_parser_command_mixfix_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -23408,104 +23480,107 @@ return x_0;
 obj* _init_l_lean_parser_command_reserve__mixfix_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_9; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_18; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_10; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_19; 
 x_0 = lean::mk_string("reserve");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_command_mixfix_kind_parser_lean_parser_has__tokens;
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
-lean::dec(x_5);
-lean::dec(x_2);
-x_9 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_command_mixfix_kind_parser_lean_parser_has__tokens;
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
 lean::dec(x_6);
-x_11 = l_lean_parser_tokens___rarg(x_9);
-lean::dec(x_9);
-x_13 = l_lean_parser_command_notation__spec_notation__symbol_parser_lean_parser_has__tokens;
-x_14 = l_lean_parser_list_cons_tokens___rarg(x_13, x_3);
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_11, x_14);
-lean::dec(x_14);
-lean::dec(x_11);
-x_18 = l_lean_parser_tokens___rarg(x_15);
+lean::dec(x_2);
+x_10 = l_lean_parser_tokens___rarg(x_7);
+lean::dec(x_7);
+x_12 = l_lean_parser_tokens___rarg(x_10);
+lean::dec(x_10);
+x_14 = l_lean_parser_command_notation__spec_notation__symbol_parser_lean_parser_has__tokens;
+x_15 = l_lean_parser_list_cons_tokens___rarg(x_14, x_4);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_12, x_15);
 lean::dec(x_15);
-return x_18;
+lean::dec(x_12);
+x_19 = l_lean_parser_tokens___rarg(x_16);
+lean::dec(x_16);
+return x_19;
 }
 }
 obj* _init_l_lean_parser_command_reserve__mixfix_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; 
 x_0 = lean::mk_string("reserve");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_mixfix_kind_parser), 5, 0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_7);
-lean::cnstr_set(x_8, 1, x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_mixfix_kind_parser), 5, 0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
-lean::cnstr_set(x_9, 1, x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_10, 0, x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_notation__symbol_parser), 5, 0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_11);
-lean::cnstr_set(x_12, 1, x_6);
+lean::cnstr_set(x_9, 0, x_8);
+lean::cnstr_set(x_9, 1, x_7);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_11, 0, x_10);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_notation__symbol_parser), 5, 0);
 x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_10);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = l_lean_parser_term__parser__m_monad;
-x_15 = l_lean_parser_term__parser__m_monad__except;
-x_16 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_17 = l_lean_parser_term__parser__m_alternative;
-x_18 = l_lean_parser_command_reserve__mixfix;
-x_19 = l_lean_parser_command_reserve__mixfix_has__view;
-x_20 = l_lean_parser_combinators_node_view___rarg(x_14, x_15, x_16, x_17, x_18, x_13, x_19);
-lean::dec(x_13);
-return x_20;
+lean::cnstr_set(x_13, 0, x_12);
+lean::cnstr_set(x_13, 1, x_7);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_11);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = l_lean_parser_term__parser__m_monad;
+x_16 = l_lean_parser_term__parser__m_monad__except;
+x_17 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_18 = l_lean_parser_term__parser__m_alternative;
+x_19 = l_lean_parser_command_reserve__mixfix;
+x_20 = l_lean_parser_command_reserve__mixfix_has__view;
+x_21 = l_lean_parser_combinators_node_view___rarg(x_15, x_16, x_17, x_18, x_19, x_14, x_20);
+lean::dec(x_14);
+return x_21;
 }
 }
 obj* _init_l_lean_parser_command_reserve__mixfix_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; 
 x_0 = lean::mk_string("reserve");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_mixfix_kind_parser), 5, 0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_7);
-lean::cnstr_set(x_8, 1, x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_mixfix_kind_parser), 5, 0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
-lean::cnstr_set(x_9, 1, x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_10, 0, x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_notation__symbol_parser), 5, 0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_11);
-lean::cnstr_set(x_12, 1, x_6);
+lean::cnstr_set(x_9, 0, x_8);
+lean::cnstr_set(x_9, 1, x_7);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_action_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_11, 0, x_10);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__spec_notation__symbol_parser), 5, 0);
 x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_10);
-lean::cnstr_set(x_13, 1, x_12);
-return x_13;
+lean::cnstr_set(x_13, 0, x_12);
+lean::cnstr_set(x_13, 1, x_7);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_11);
+lean::cnstr_set(x_14, 1, x_13);
+return x_14;
 }
 }
 obj* l_lean_parser_command_reserve__mixfix_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
diff --git a/src/boot/init/lean/parser/term.cpp b/src/boot/init/lean/parser/term.cpp
index 98915aecc1..e35bb629f1 100644
--- a/src/boot/init/lean/parser/term.cpp
+++ b/src/boot/init/lean/parser/term.cpp
@@ -2039,28 +2039,30 @@ return x_18;
 obj* _init_l_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_15; obj* x_18; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_14; obj* x_17; obj* x_20; 
 x_0 = lean::mk_string(".{");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = l_lean_parser_level_parser_lean_parser_has__tokens___closed__1;
-x_4 = l_lean_parser_tokens___rarg(x_3);
+lean::dec(x_0);
+x_4 = l_lean_parser_level_parser_lean_parser_has__tokens___closed__1;
 x_5 = l_lean_parser_tokens___rarg(x_4);
-lean::dec(x_4);
-x_7 = lean::mk_string("}");
-x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_1);
-x_9 = lean::box(0);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_8, x_9);
-lean::dec(x_8);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_5, x_10);
-lean::dec(x_10);
+x_6 = l_lean_parser_tokens___rarg(x_5);
 lean::dec(x_5);
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_2, x_12);
+x_8 = lean::mk_string("}");
+x_9 = l_lean_parser_symbol_tokens___rarg(x_8, x_1);
+lean::dec(x_8);
+x_11 = lean::box(0);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_9, x_11);
+lean::dec(x_9);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_6, x_12);
 lean::dec(x_12);
+lean::dec(x_6);
+x_17 = l_lean_parser_list_cons_tokens___rarg(x_2, x_14);
+lean::dec(x_14);
 lean::dec(x_2);
-x_18 = l_lean_parser_tokens___rarg(x_15);
-lean::dec(x_15);
-return x_18;
+x_20 = l_lean_parser_tokens___rarg(x_17);
+lean::dec(x_17);
+return x_20;
 }
 }
 obj* l___private_init_lean_parser_combinators_1__many1__aux___main___at_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens___spec__2___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5) {
@@ -2075,93 +2077,97 @@ return x_6;
 obj* _init_l_lean_parser_ident__univ__spec_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; 
 x_0 = lean::mk_string(".{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_parser), 5, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level__parser_run), 4, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens___spec__1), 4, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_parser), 5, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level__parser_run), 4, 1);
 lean::closure_set(x_8, 0, x_7);
-x_9 = lean::mk_string("}");
-x_10 = l_string_trim(x_9);
-lean::inc(x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_12, 0, x_10);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
-lean::closure_set(x_13, 0, x_10);
-lean::closure_set(x_13, 1, x_4);
-lean::closure_set(x_13, 2, x_12);
-x_14 = lean::box(0);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_13);
-lean::cnstr_set(x_15, 1, x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_8);
-lean::cnstr_set(x_16, 1, x_15);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens___spec__1), 4, 1);
+lean::closure_set(x_9, 0, x_8);
+x_10 = lean::mk_string("}");
+x_11 = l_string_trim(x_10);
+lean::dec(x_10);
+lean::inc(x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_14, 0, x_11);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
+lean::closure_set(x_15, 0, x_11);
+lean::closure_set(x_15, 1, x_5);
+lean::closure_set(x_15, 2, x_14);
+x_16 = lean::box(0);
 x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_5);
+lean::cnstr_set(x_17, 0, x_15);
 lean::cnstr_set(x_17, 1, x_16);
-x_18 = l_lean_parser_basic__parser__m_monad;
-x_19 = l_lean_parser_basic__parser__m_monad__except;
-x_20 = l_lean_parser_basic__parser__m_lean_parser_monad__parsec;
-x_21 = l_lean_parser_basic__parser__m_alternative;
-x_22 = l_lean_parser_ident__univ__spec;
-x_23 = l_lean_parser_ident__univ__spec_has__view;
-x_24 = l_lean_parser_combinators_node_view___rarg(x_18, x_19, x_20, x_21, x_22, x_17, x_23);
-lean::dec(x_17);
-return x_24;
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_9);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_6);
+lean::cnstr_set(x_19, 1, x_18);
+x_20 = l_lean_parser_basic__parser__m_monad;
+x_21 = l_lean_parser_basic__parser__m_monad__except;
+x_22 = l_lean_parser_basic__parser__m_lean_parser_monad__parsec;
+x_23 = l_lean_parser_basic__parser__m_alternative;
+x_24 = l_lean_parser_ident__univ__spec;
+x_25 = l_lean_parser_ident__univ__spec_has__view;
+x_26 = l_lean_parser_combinators_node_view___rarg(x_20, x_21, x_22, x_23, x_24, x_19, x_25);
+lean::dec(x_19);
+return x_26;
 }
 }
 obj* _init_l_lean_parser_ident__univ__spec_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; 
 x_0 = lean::mk_string(".{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_parser), 5, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level__parser_run), 4, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens___spec__1), 4, 1);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level_parser), 5, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_level__parser_run), 4, 1);
 lean::closure_set(x_8, 0, x_7);
-x_9 = lean::mk_string("}");
-x_10 = l_string_trim(x_9);
-lean::inc(x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_12, 0, x_10);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
-lean::closure_set(x_13, 0, x_10);
-lean::closure_set(x_13, 1, x_4);
-lean::closure_set(x_13, 2, x_12);
-x_14 = lean::box(0);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_13);
-lean::cnstr_set(x_15, 1, x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_8);
-lean::cnstr_set(x_16, 1, x_15);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_ident__univ__spec_parser_lean_parser_has__tokens___spec__1), 4, 1);
+lean::closure_set(x_9, 0, x_8);
+x_10 = lean::mk_string("}");
+x_11 = l_string_trim(x_10);
+lean::dec(x_10);
+lean::inc(x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_14, 0, x_11);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_unicode__symbol_lean_parser_has__tokens___spec__1___boxed), 6, 3);
+lean::closure_set(x_15, 0, x_11);
+lean::closure_set(x_15, 1, x_5);
+lean::closure_set(x_15, 2, x_14);
+x_16 = lean::box(0);
 x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_5);
+lean::cnstr_set(x_17, 0, x_15);
 lean::cnstr_set(x_17, 1, x_16);
-return x_17;
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_9);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_6);
+lean::cnstr_set(x_19, 1, x_18);
+return x_19;
 }
 }
 obj* l_lean_parser_ident__univ__spec_parser(obj* x_0, obj* x_1, obj* x_2) {
@@ -6693,65 +6699,69 @@ return x_23;
 obj* _init_l_lean_parser_term_paren_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_24; obj* x_26; obj* x_29; obj* x_31; obj* x_33; obj* x_35; obj* x_37; obj* x_39; obj* x_41; obj* x_43; obj* x_45; obj* x_46; obj* x_47; obj* x_49; obj* x_52; obj* x_55; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_13; obj* x_16; obj* x_18; obj* x_19; obj* x_21; obj* x_22; obj* x_25; obj* x_27; obj* x_29; obj* x_32; obj* x_34; obj* x_36; obj* x_38; obj* x_40; obj* x_42; obj* x_44; obj* x_46; obj* x_48; obj* x_49; obj* x_51; obj* x_53; obj* x_56; obj* x_59; 
 x_0 = lean::mk_string("(");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(", ");
-x_4 = lean::mk_nat_obj(0u);
-x_5 = l_lean_parser_symbol_tokens___rarg(x_3, x_4);
-x_6 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_7 = l_lean_parser_combinators_sep__by_tokens___rarg(x_6, x_5);
-x_8 = lean::box(0);
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_7, x_8);
-lean::dec(x_7);
-x_11 = l_lean_parser_list_cons_tokens___rarg(x_5, x_9);
+lean::dec(x_0);
+x_4 = lean::mk_string(", ");
+x_5 = lean::mk_nat_obj(0u);
+x_6 = l_lean_parser_symbol_tokens___rarg(x_4, x_5);
+lean::dec(x_4);
+x_8 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_9 = l_lean_parser_combinators_sep__by_tokens___rarg(x_8, x_6);
+x_10 = lean::box(0);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_9, x_10);
 lean::dec(x_9);
-lean::dec(x_5);
-x_14 = l_lean_parser_tokens___rarg(x_11);
+x_13 = l_lean_parser_list_cons_tokens___rarg(x_6, x_11);
 lean::dec(x_11);
-x_16 = lean::mk_string(" : ");
-x_17 = l_lean_parser_symbol_tokens___rarg(x_16, x_4);
-x_18 = l_lean_parser_list_cons_tokens___rarg(x_6, x_8);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_17, x_18);
+lean::dec(x_6);
+x_16 = l_lean_parser_tokens___rarg(x_13);
+lean::dec(x_13);
+x_18 = lean::mk_string(" : ");
+x_19 = l_lean_parser_symbol_tokens___rarg(x_18, x_5);
 lean::dec(x_18);
-lean::dec(x_17);
-x_22 = l_lean_parser_tokens___rarg(x_19);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_8, x_10);
+x_22 = l_lean_parser_list_cons_tokens___rarg(x_19, x_21);
+lean::dec(x_21);
 lean::dec(x_19);
-x_24 = l_lean_parser_list_cons_tokens___rarg(x_22, x_8);
+x_25 = l_lean_parser_tokens___rarg(x_22);
 lean::dec(x_22);
-x_26 = l_lean_parser_list_cons_tokens___rarg(x_14, x_24);
-lean::dec(x_24);
-lean::dec(x_14);
-x_29 = l_lean_parser_tokens___rarg(x_26);
-lean::dec(x_26);
-x_31 = l_lean_parser_list_cons_tokens___rarg(x_29, x_8);
+x_27 = l_lean_parser_list_cons_tokens___rarg(x_25, x_10);
+lean::dec(x_25);
+x_29 = l_lean_parser_list_cons_tokens___rarg(x_16, x_27);
+lean::dec(x_27);
+lean::dec(x_16);
+x_32 = l_lean_parser_tokens___rarg(x_29);
 lean::dec(x_29);
-x_33 = l_lean_parser_tokens___rarg(x_31);
-lean::dec(x_31);
-x_35 = l_lean_parser_tokens___rarg(x_33);
-lean::dec(x_33);
-x_37 = l_lean_parser_list_cons_tokens___rarg(x_35, x_8);
-lean::dec(x_35);
-x_39 = l_lean_parser_list_cons_tokens___rarg(x_6, x_37);
-lean::dec(x_37);
-x_41 = l_lean_parser_tokens___rarg(x_39);
-lean::dec(x_39);
-x_43 = l_lean_parser_tokens___rarg(x_41);
-lean::dec(x_41);
-x_45 = lean::mk_string(")");
-x_46 = l_lean_parser_symbol_tokens___rarg(x_45, x_4);
-x_47 = l_lean_parser_list_cons_tokens___rarg(x_46, x_8);
-lean::dec(x_46);
-x_49 = l_lean_parser_list_cons_tokens___rarg(x_43, x_47);
-lean::dec(x_47);
-lean::dec(x_43);
-x_52 = l_lean_parser_list_cons_tokens___rarg(x_2, x_49);
+x_34 = l_lean_parser_list_cons_tokens___rarg(x_32, x_10);
+lean::dec(x_32);
+x_36 = l_lean_parser_tokens___rarg(x_34);
+lean::dec(x_34);
+x_38 = l_lean_parser_tokens___rarg(x_36);
+lean::dec(x_36);
+x_40 = l_lean_parser_list_cons_tokens___rarg(x_38, x_10);
+lean::dec(x_38);
+x_42 = l_lean_parser_list_cons_tokens___rarg(x_8, x_40);
+lean::dec(x_40);
+x_44 = l_lean_parser_tokens___rarg(x_42);
+lean::dec(x_42);
+x_46 = l_lean_parser_tokens___rarg(x_44);
+lean::dec(x_44);
+x_48 = lean::mk_string(")");
+x_49 = l_lean_parser_symbol_tokens___rarg(x_48, x_5);
+lean::dec(x_48);
+x_51 = l_lean_parser_list_cons_tokens___rarg(x_49, x_10);
 lean::dec(x_49);
+x_53 = l_lean_parser_list_cons_tokens___rarg(x_46, x_51);
+lean::dec(x_51);
+lean::dec(x_46);
+x_56 = l_lean_parser_list_cons_tokens___rarg(x_2, x_53);
+lean::dec(x_53);
 lean::dec(x_2);
-x_55 = l_lean_parser_tokens___rarg(x_52);
-lean::dec(x_52);
-return x_55;
+x_59 = l_lean_parser_tokens___rarg(x_56);
+lean::dec(x_56);
+return x_59;
 }
 }
 obj* l___private_init_lean_parser_combinators_2__sep__by__aux___main___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__2___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6, obj* x_7, obj* x_8, obj* x_9, obj* x_10) {
@@ -6777,241 +6787,249 @@ return x_9;
 obj* _init_l_lean_parser_term_paren_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; uint8 x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_26; obj* x_27; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; uint8 x_15; obj* x_16; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_nat_obj(0u);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string(", ");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_6);
-lean::closure_set(x_12, 2, x_11);
-x_13 = 0;
-x_14 = lean::box(x_13);
-lean::inc(x_12);
-lean::inc(x_7);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_17, 0, x_7);
-lean::closure_set(x_17, 1, x_12);
-lean::closure_set(x_17, 2, x_14);
-x_18 = lean::box(0);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_17);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_12);
-lean::cnstr_set(x_20, 1, x_19);
-x_21 = l_lean_parser_term_tuple;
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_22, 0, x_21);
-lean::closure_set(x_22, 1, x_20);
-x_23 = lean::mk_string(" : ");
-x_24 = l_string_trim(x_23);
-lean::inc(x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_26, 0, x_24);
-x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_27, 0, x_24);
-lean::closure_set(x_27, 1, x_6);
-lean::closure_set(x_27, 2, x_26);
-lean::inc(x_7);
-x_29 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_29, 0, x_7);
-lean::cnstr_set(x_29, 1, x_18);
-x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_27);
-lean::cnstr_set(x_30, 1, x_29);
-x_31 = l_lean_parser_term_typed;
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_32, 0, x_31);
-lean::closure_set(x_32, 1, x_30);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_nat_obj(0u);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string(", ");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_7);
+lean::closure_set(x_14, 2, x_13);
+x_15 = 0;
+x_16 = lean::box(x_15);
+lean::inc(x_14);
+lean::inc(x_8);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_19, 0, x_8);
+lean::closure_set(x_19, 1, x_14);
+lean::closure_set(x_19, 2, x_16);
+x_20 = lean::box(0);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_19);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_14);
+lean::cnstr_set(x_22, 1, x_21);
+x_23 = l_lean_parser_term_tuple;
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_24, 0, x_23);
+lean::closure_set(x_24, 1, x_22);
+x_25 = lean::mk_string(" : ");
+x_26 = l_string_trim(x_25);
+lean::dec(x_25);
+lean::inc(x_26);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_29, 0, x_26);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_30, 0, x_26);
+lean::closure_set(x_30, 1, x_7);
+lean::closure_set(x_30, 2, x_29);
+lean::inc(x_8);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_8);
+lean::cnstr_set(x_32, 1, x_20);
 x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_32);
-lean::cnstr_set(x_33, 1, x_18);
-x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_22);
-lean::cnstr_set(x_34, 1, x_33);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::cnstr_set(x_33, 0, x_30);
+lean::cnstr_set(x_33, 1, x_32);
+x_34 = l_lean_parser_term_typed;
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_35, 0, x_34);
-lean::closure_set(x_35, 1, x_6);
+lean::closure_set(x_35, 1, x_33);
 x_36 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_36, 0, x_35);
-lean::cnstr_set(x_36, 1, x_18);
-x_37 = l_lean_parser_term_paren__special;
-x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::cnstr_set(x_36, 1, x_20);
+x_37 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_37, 0, x_24);
+lean::cnstr_set(x_37, 1, x_36);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
 lean::closure_set(x_38, 0, x_37);
-lean::closure_set(x_38, 1, x_36);
-x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_39, 0, x_38);
-x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_39);
-lean::cnstr_set(x_40, 1, x_18);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_7);
-lean::cnstr_set(x_41, 1, x_40);
-x_42 = l_lean_parser_term_paren__content;
-x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_43, 0, x_42);
-lean::closure_set(x_43, 1, x_41);
-x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_44, 0, x_43);
-x_45 = lean::mk_string(")");
-x_46 = l_string_trim(x_45);
-lean::inc(x_46);
-x_48 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_48, 0, x_46);
-x_49 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_49, 0, x_46);
-lean::closure_set(x_49, 1, x_6);
-lean::closure_set(x_49, 2, x_48);
-x_50 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_50, 0, x_49);
-lean::cnstr_set(x_50, 1, x_18);
-x_51 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_51, 0, x_44);
-lean::cnstr_set(x_51, 1, x_50);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_5);
-lean::cnstr_set(x_52, 1, x_51);
-x_53 = l_lean_parser_term__parser__m_monad;
-x_54 = l_lean_parser_term__parser__m_monad__except;
-x_55 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_56 = l_lean_parser_term__parser__m_alternative;
-x_57 = l_lean_parser_term_paren;
-x_58 = l_lean_parser_term_paren_has__view;
-x_59 = l_lean_parser_combinators_node_view___rarg(x_53, x_54, x_55, x_56, x_57, x_52, x_58);
-lean::dec(x_52);
-return x_59;
+lean::closure_set(x_38, 1, x_7);
+x_39 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_39, 0, x_38);
+lean::cnstr_set(x_39, 1, x_20);
+x_40 = l_lean_parser_term_paren__special;
+x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_41, 0, x_40);
+lean::closure_set(x_41, 1, x_39);
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_42, 0, x_41);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_42);
+lean::cnstr_set(x_43, 1, x_20);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_8);
+lean::cnstr_set(x_44, 1, x_43);
+x_45 = l_lean_parser_term_paren__content;
+x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_46, 0, x_45);
+lean::closure_set(x_46, 1, x_44);
+x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_47, 0, x_46);
+x_48 = lean::mk_string(")");
+x_49 = l_string_trim(x_48);
+lean::dec(x_48);
+lean::inc(x_49);
+x_52 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_52, 0, x_49);
+x_53 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_53, 0, x_49);
+lean::closure_set(x_53, 1, x_7);
+lean::closure_set(x_53, 2, x_52);
+x_54 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_54, 0, x_53);
+lean::cnstr_set(x_54, 1, x_20);
+x_55 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_55, 0, x_47);
+lean::cnstr_set(x_55, 1, x_54);
+x_56 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_56, 0, x_6);
+lean::cnstr_set(x_56, 1, x_55);
+x_57 = l_lean_parser_term__parser__m_monad;
+x_58 = l_lean_parser_term__parser__m_monad__except;
+x_59 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_60 = l_lean_parser_term__parser__m_alternative;
+x_61 = l_lean_parser_term_paren;
+x_62 = l_lean_parser_term_paren_has__view;
+x_63 = l_lean_parser_combinators_node_view___rarg(x_57, x_58, x_59, x_60, x_61, x_56, x_62);
+lean::dec(x_56);
+return x_63;
 }
 }
 obj* _init_l_lean_parser_term_paren_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; uint8 x_13; obj* x_14; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_26; obj* x_27; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; uint8 x_15; obj* x_16; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_nat_obj(0u);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string(", ");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_6);
-lean::closure_set(x_12, 2, x_11);
-x_13 = 0;
-x_14 = lean::box(x_13);
-lean::inc(x_12);
-lean::inc(x_7);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_17, 0, x_7);
-lean::closure_set(x_17, 1, x_12);
-lean::closure_set(x_17, 2, x_14);
-x_18 = lean::box(0);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_17);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_12);
-lean::cnstr_set(x_20, 1, x_19);
-x_21 = l_lean_parser_term_tuple;
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_22, 0, x_21);
-lean::closure_set(x_22, 1, x_20);
-x_23 = lean::mk_string(" : ");
-x_24 = l_string_trim(x_23);
-lean::inc(x_24);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_26, 0, x_24);
-x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_27, 0, x_24);
-lean::closure_set(x_27, 1, x_6);
-lean::closure_set(x_27, 2, x_26);
-lean::inc(x_7);
-x_29 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_29, 0, x_7);
-lean::cnstr_set(x_29, 1, x_18);
-x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_27);
-lean::cnstr_set(x_30, 1, x_29);
-x_31 = l_lean_parser_term_typed;
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_32, 0, x_31);
-lean::closure_set(x_32, 1, x_30);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_nat_obj(0u);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string(", ");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_7);
+lean::closure_set(x_14, 2, x_13);
+x_15 = 0;
+x_16 = lean::box(x_15);
+lean::inc(x_14);
+lean::inc(x_8);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_19, 0, x_8);
+lean::closure_set(x_19, 1, x_14);
+lean::closure_set(x_19, 2, x_16);
+x_20 = lean::box(0);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_19);
+lean::cnstr_set(x_21, 1, x_20);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_14);
+lean::cnstr_set(x_22, 1, x_21);
+x_23 = l_lean_parser_term_tuple;
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_24, 0, x_23);
+lean::closure_set(x_24, 1, x_22);
+x_25 = lean::mk_string(" : ");
+x_26 = l_string_trim(x_25);
+lean::dec(x_25);
+lean::inc(x_26);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_29, 0, x_26);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_30, 0, x_26);
+lean::closure_set(x_30, 1, x_7);
+lean::closure_set(x_30, 2, x_29);
+lean::inc(x_8);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_8);
+lean::cnstr_set(x_32, 1, x_20);
 x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_32);
-lean::cnstr_set(x_33, 1, x_18);
-x_34 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_34, 0, x_22);
-lean::cnstr_set(x_34, 1, x_33);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::cnstr_set(x_33, 0, x_30);
+lean::cnstr_set(x_33, 1, x_32);
+x_34 = l_lean_parser_term_typed;
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_35, 0, x_34);
-lean::closure_set(x_35, 1, x_6);
+lean::closure_set(x_35, 1, x_33);
 x_36 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_36, 0, x_35);
-lean::cnstr_set(x_36, 1, x_18);
-x_37 = l_lean_parser_term_paren__special;
-x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::cnstr_set(x_36, 1, x_20);
+x_37 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_37, 0, x_24);
+lean::cnstr_set(x_37, 1, x_36);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
 lean::closure_set(x_38, 0, x_37);
-lean::closure_set(x_38, 1, x_36);
-x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_39, 0, x_38);
-x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_39);
-lean::cnstr_set(x_40, 1, x_18);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_7);
-lean::cnstr_set(x_41, 1, x_40);
-x_42 = l_lean_parser_term_paren__content;
-x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_43, 0, x_42);
-lean::closure_set(x_43, 1, x_41);
-x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_44, 0, x_43);
-x_45 = lean::mk_string(")");
-x_46 = l_string_trim(x_45);
-lean::inc(x_46);
-x_48 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_48, 0, x_46);
-x_49 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_49, 0, x_46);
-lean::closure_set(x_49, 1, x_6);
-lean::closure_set(x_49, 2, x_48);
-x_50 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_50, 0, x_49);
-lean::cnstr_set(x_50, 1, x_18);
-x_51 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_51, 0, x_44);
-lean::cnstr_set(x_51, 1, x_50);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_5);
-lean::cnstr_set(x_52, 1, x_51);
-return x_52;
+lean::closure_set(x_38, 1, x_7);
+x_39 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_39, 0, x_38);
+lean::cnstr_set(x_39, 1, x_20);
+x_40 = l_lean_parser_term_paren__special;
+x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_41, 0, x_40);
+lean::closure_set(x_41, 1, x_39);
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_42, 0, x_41);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_42);
+lean::cnstr_set(x_43, 1, x_20);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_8);
+lean::cnstr_set(x_44, 1, x_43);
+x_45 = l_lean_parser_term_paren__content;
+x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_46, 0, x_45);
+lean::closure_set(x_46, 1, x_44);
+x_47 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_47, 0, x_46);
+x_48 = lean::mk_string(")");
+x_49 = l_string_trim(x_48);
+lean::dec(x_48);
+lean::inc(x_49);
+x_52 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_52, 0, x_49);
+x_53 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_53, 0, x_49);
+lean::closure_set(x_53, 1, x_7);
+lean::closure_set(x_53, 2, x_52);
+x_54 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_54, 0, x_53);
+lean::cnstr_set(x_54, 1, x_20);
+x_55 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_55, 0, x_47);
+lean::cnstr_set(x_55, 1, x_54);
+x_56 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_56, 0, x_6);
+lean::cnstr_set(x_56, 1, x_55);
+return x_56;
 }
 }
 obj* l_lean_parser_term_paren_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -7120,66 +7138,69 @@ return x_0;
 obj* _init_l_lean_parser_term_hole_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_6; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; 
 x_0 = lean::mk_string("_");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_2, x_3);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_2, x_4);
 lean::dec(x_2);
-x_6 = l_lean_parser_tokens___rarg(x_4);
-lean::dec(x_4);
-return x_6;
+x_7 = l_lean_parser_tokens___rarg(x_5);
+lean::dec(x_5);
+return x_7;
 }
 }
 obj* _init_l_lean_parser_term_hole_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; 
 x_0 = lean::mk_string("_");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-x_8 = l_lean_parser_term__parser__m_monad;
-x_9 = l_lean_parser_term__parser__m_monad__except;
-x_10 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_11 = l_lean_parser_term__parser__m_alternative;
-x_12 = l_lean_parser_term_hole;
-x_13 = l_lean_parser_term_hole_has__view;
-x_14 = l_lean_parser_combinators_node_view___rarg(x_8, x_9, x_10, x_11, x_12, x_7, x_13);
-lean::dec(x_7);
-return x_14;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+x_9 = l_lean_parser_term__parser__m_monad;
+x_10 = l_lean_parser_term__parser__m_monad__except;
+x_11 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_12 = l_lean_parser_term__parser__m_alternative;
+x_13 = l_lean_parser_term_hole;
+x_14 = l_lean_parser_term_hole_has__view;
+x_15 = l_lean_parser_combinators_node_view___rarg(x_9, x_10, x_11, x_12, x_13, x_8, x_14);
+lean::dec(x_8);
+return x_15;
 }
 }
 obj* _init_l_lean_parser_term_hole_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; 
 x_0 = lean::mk_string("_");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-return x_7;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+return x_8;
 }
 }
 obj* l_lean_parser_term_hole_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -7715,113 +7736,119 @@ return x_0;
 obj* _init_l_lean_parser_term_sort_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; obj* x_13; obj* x_15; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_17; 
 x_0 = lean::mk_string("Sort");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string("Type");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
+lean::dec(x_0);
+x_4 = lean::mk_string("Type");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
-lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
+x_7 = lean::box(0);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_5, x_7);
+lean::dec(x_5);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_2, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_11, x_5);
-lean::dec(x_11);
-x_15 = l_lean_parser_tokens___rarg(x_13);
+lean::dec(x_2);
+x_13 = l_lean_parser_tokens___rarg(x_10);
+lean::dec(x_10);
+x_15 = l_lean_parser_list_cons_tokens___rarg(x_13, x_7);
 lean::dec(x_13);
-return x_15;
+x_17 = l_lean_parser_tokens___rarg(x_15);
+lean::dec(x_15);
+return x_17;
 }
 }
 obj* _init_l_lean_parser_term_sort_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; 
 x_0 = lean::mk_string("Sort");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("Type");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::mk_nat_obj(0u);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_15, 0, x_13);
-lean::closure_set(x_15, 1, x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_15);
-lean::cnstr_set(x_16, 1, x_11);
-x_17 = l_lean_parser_term__parser__m_monad;
-x_18 = l_lean_parser_term__parser__m_monad__except;
-x_19 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_20 = l_lean_parser_term__parser__m_alternative;
-x_21 = l_lean_parser_term_sort;
-x_22 = l_lean_parser_term_sort_has__view;
-x_23 = l_lean_parser_combinators_node_view___rarg(x_17, x_18, x_19, x_20, x_21, x_16, x_22);
-lean::dec(x_16);
-return x_23;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("Type");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::mk_nat_obj(0u);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_17, 0, x_15);
+lean::closure_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_13);
+x_19 = l_lean_parser_term__parser__m_monad;
+x_20 = l_lean_parser_term__parser__m_monad__except;
+x_21 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_22 = l_lean_parser_term__parser__m_alternative;
+x_23 = l_lean_parser_term_sort;
+x_24 = l_lean_parser_term_sort_has__view;
+x_25 = l_lean_parser_combinators_node_view___rarg(x_19, x_20, x_21, x_22, x_23, x_18, x_24);
+lean::dec(x_18);
+return x_25;
 }
 }
 obj* _init_l_lean_parser_term_sort_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; 
 x_0 = lean::mk_string("Sort");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("Type");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::mk_nat_obj(0u);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_15, 0, x_13);
-lean::closure_set(x_15, 1, x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_15);
-lean::cnstr_set(x_16, 1, x_11);
-return x_16;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("Type");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::mk_nat_obj(0u);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_17, 0, x_15);
+lean::closure_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_13);
+return x_18;
 }
 }
 obj* l_lean_parser_term_sort_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -8088,79 +8115,82 @@ return x_0;
 obj* _init_l_lean_parser_term_type__spec_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_10; 
 x_0 = lean::mk_string(" : ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
-lean::dec(x_5);
-lean::dec(x_2);
-x_9 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
 lean::dec(x_6);
-return x_9;
+lean::dec(x_2);
+x_10 = l_lean_parser_tokens___rarg(x_7);
+lean::dec(x_7);
+return x_10;
 }
 }
 obj* _init_l_lean_parser_term_type__spec_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
 x_0 = lean::mk_string(" : ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::box(0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_6);
-lean::cnstr_set(x_8, 1, x_7);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::box(0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
+lean::cnstr_set(x_9, 0, x_7);
 lean::cnstr_set(x_9, 1, x_8);
-x_10 = l_lean_parser_term__parser__m_monad;
-x_11 = l_lean_parser_term__parser__m_monad__except;
-x_12 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_13 = l_lean_parser_term__parser__m_alternative;
-x_14 = l_lean_parser_term_type__spec;
-x_15 = l_lean_parser_term_type__spec_has__view;
-x_16 = l_lean_parser_combinators_node_view___rarg(x_10, x_11, x_12, x_13, x_14, x_9, x_15);
-lean::dec(x_9);
-return x_16;
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+x_11 = l_lean_parser_term__parser__m_monad;
+x_12 = l_lean_parser_term__parser__m_monad__except;
+x_13 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_14 = l_lean_parser_term__parser__m_alternative;
+x_15 = l_lean_parser_term_type__spec;
+x_16 = l_lean_parser_term_type__spec_has__view;
+x_17 = l_lean_parser_combinators_node_view___rarg(x_11, x_12, x_13, x_14, x_15, x_10, x_16);
+lean::dec(x_10);
+return x_17;
 }
 }
 obj* _init_l_lean_parser_term_type__spec_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
 x_0 = lean::mk_string(" : ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::box(0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_6);
-lean::cnstr_set(x_8, 1, x_7);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::box(0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
+lean::cnstr_set(x_9, 0, x_7);
 lean::cnstr_set(x_9, 1, x_8);
-return x_9;
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+return x_10;
 }
 }
 obj* l_lean_parser_term_type__spec_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -9536,162 +9566,168 @@ return x_0;
 obj* _init_l_lean_parser_term_binder__default_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_15; obj* x_17; obj* x_19; obj* x_22; obj* x_24; obj* x_26; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_12; obj* x_14; obj* x_17; obj* x_19; obj* x_21; obj* x_24; obj* x_26; obj* x_28; 
 x_0 = lean::mk_string(":=");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
 lean::dec(x_2);
-x_8 = l_lean_parser_tokens___rarg(x_6);
-lean::dec(x_6);
-x_10 = lean::mk_string(".");
-x_11 = l_lean_parser_symbol_tokens___rarg(x_10, x_1);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_11, x_5);
-lean::dec(x_5);
+x_9 = l_lean_parser_tokens___rarg(x_7);
+lean::dec(x_7);
+x_11 = lean::mk_string(".");
+x_12 = l_lean_parser_symbol_tokens___rarg(x_11, x_1);
 lean::dec(x_11);
-x_15 = l_lean_parser_tokens___rarg(x_12);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_12, x_6);
+lean::dec(x_6);
 lean::dec(x_12);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_15, x_3);
-lean::dec(x_15);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_8, x_17);
+x_17 = l_lean_parser_tokens___rarg(x_14);
+lean::dec(x_14);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_17, x_4);
 lean::dec(x_17);
-lean::dec(x_8);
-x_22 = l_lean_parser_tokens___rarg(x_19);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_9, x_19);
 lean::dec(x_19);
-x_24 = l_lean_parser_list_cons_tokens___rarg(x_22, x_3);
-lean::dec(x_22);
-x_26 = l_lean_parser_tokens___rarg(x_24);
+lean::dec(x_9);
+x_24 = l_lean_parser_tokens___rarg(x_21);
+lean::dec(x_21);
+x_26 = l_lean_parser_list_cons_tokens___rarg(x_24, x_4);
 lean::dec(x_24);
-return x_26;
+x_28 = l_lean_parser_tokens___rarg(x_26);
+lean::dec(x_26);
+return x_28;
 }
 }
 obj* _init_l_lean_parser_term_binder__default_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; 
 x_0 = lean::mk_string(":=");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::box(0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_6);
-lean::cnstr_set(x_8, 1, x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
-lean::cnstr_set(x_10, 1, x_8);
-x_11 = l_lean_parser_term_binder__default__val;
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_12, 0, x_11);
-lean::closure_set(x_12, 1, x_10);
-x_13 = lean::mk_string(".");
-x_14 = l_string_trim(x_13);
-lean::inc(x_14);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_16, 0, x_14);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_17, 0, x_14);
-lean::closure_set(x_17, 1, x_4);
-lean::closure_set(x_17, 2, x_16);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_17);
-lean::cnstr_set(x_18, 1, x_8);
-x_19 = l_lean_parser_term_binder__default__tac;
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_20, 0, x_19);
-lean::closure_set(x_20, 1, x_18);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_7);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_12);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_23, 0, x_22);
-lean::closure_set(x_23, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::box(0);
+x_9 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_9, 0, x_7);
+lean::cnstr_set(x_9, 1, x_8);
+lean::inc(x_9);
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_9);
+x_12 = l_lean_parser_term_binder__default__val;
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_13, 0, x_12);
+lean::closure_set(x_13, 1, x_11);
+x_14 = lean::mk_string(".");
+x_15 = l_string_trim(x_14);
+lean::dec(x_14);
+lean::inc(x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_18, 0, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_19, 0, x_15);
+lean::closure_set(x_19, 1, x_5);
+lean::closure_set(x_19, 2, x_18);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_19);
+lean::cnstr_set(x_20, 1, x_9);
+x_21 = l_lean_parser_term_binder__default__tac;
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_22, 0, x_21);
+lean::closure_set(x_22, 1, x_20);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_8);
 x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_23);
-lean::cnstr_set(x_24, 1, x_7);
-x_25 = l_lean_parser_term__parser__m_monad;
-x_26 = l_lean_parser_term__parser__m_monad__except;
-x_27 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_28 = l_lean_parser_term__parser__m_alternative;
-x_29 = l_lean_parser_term_binder__default;
-x_30 = l_lean_parser_term_binder__default_has__view;
-x_31 = l_lean_parser_combinators_node_view___rarg(x_25, x_26, x_27, x_28, x_29, x_24, x_30);
-lean::dec(x_24);
-return x_31;
+lean::cnstr_set(x_24, 0, x_13);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_5);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_25);
+lean::cnstr_set(x_26, 1, x_8);
+x_27 = l_lean_parser_term__parser__m_monad;
+x_28 = l_lean_parser_term__parser__m_monad__except;
+x_29 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_30 = l_lean_parser_term__parser__m_alternative;
+x_31 = l_lean_parser_term_binder__default;
+x_32 = l_lean_parser_term_binder__default_has__view;
+x_33 = l_lean_parser_combinators_node_view___rarg(x_27, x_28, x_29, x_30, x_31, x_26, x_32);
+lean::dec(x_26);
+return x_33;
 }
 }
 obj* _init_l_lean_parser_term_binder__default_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; 
 x_0 = lean::mk_string(":=");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::box(0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_6);
-lean::cnstr_set(x_8, 1, x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
-lean::cnstr_set(x_10, 1, x_8);
-x_11 = l_lean_parser_term_binder__default__val;
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_12, 0, x_11);
-lean::closure_set(x_12, 1, x_10);
-x_13 = lean::mk_string(".");
-x_14 = l_string_trim(x_13);
-lean::inc(x_14);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_16, 0, x_14);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_17, 0, x_14);
-lean::closure_set(x_17, 1, x_4);
-lean::closure_set(x_17, 2, x_16);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_17);
-lean::cnstr_set(x_18, 1, x_8);
-x_19 = l_lean_parser_term_binder__default__tac;
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_20, 0, x_19);
-lean::closure_set(x_20, 1, x_18);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_7);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_12);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_23, 0, x_22);
-lean::closure_set(x_23, 1, x_4);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::box(0);
+x_9 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_9, 0, x_7);
+lean::cnstr_set(x_9, 1, x_8);
+lean::inc(x_9);
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_9);
+x_12 = l_lean_parser_term_binder__default__val;
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_13, 0, x_12);
+lean::closure_set(x_13, 1, x_11);
+x_14 = lean::mk_string(".");
+x_15 = l_string_trim(x_14);
+lean::dec(x_14);
+lean::inc(x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_18, 0, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_19, 0, x_15);
+lean::closure_set(x_19, 1, x_5);
+lean::closure_set(x_19, 2, x_18);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_19);
+lean::cnstr_set(x_20, 1, x_9);
+x_21 = l_lean_parser_term_binder__default__tac;
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_22, 0, x_21);
+lean::closure_set(x_22, 1, x_20);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_8);
 x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_23);
-lean::cnstr_set(x_24, 1, x_7);
-return x_24;
+lean::cnstr_set(x_24, 0, x_13);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_5);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_25);
+lean::cnstr_set(x_26, 1, x_8);
+return x_26;
 }
 }
 obj* l_lean_parser_term_binder__default_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -15266,499 +15302,526 @@ return x_0;
 obj* _init_l_lean_parser_term_simple__binder_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_13; obj* x_15; obj* x_17; obj* x_20; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_28; obj* x_30; obj* x_32; obj* x_34; obj* x_37; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_45; obj* x_47; obj* x_49; obj* x_51; obj* x_54; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_62; obj* x_64; obj* x_67; obj* x_69; obj* x_72; obj* x_74; obj* x_76; obj* x_79; obj* x_82; obj* x_85; obj* x_87; obj* x_89; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_11; obj* x_13; obj* x_14; obj* x_16; obj* x_18; obj* x_20; obj* x_23; obj* x_25; obj* x_26; obj* x_28; obj* x_29; obj* x_31; obj* x_33; obj* x_35; obj* x_37; obj* x_39; obj* x_42; obj* x_44; obj* x_45; obj* x_47; obj* x_48; obj* x_50; obj* x_52; obj* x_54; obj* x_56; obj* x_58; obj* x_61; obj* x_63; obj* x_64; obj* x_66; obj* x_67; obj* x_69; obj* x_71; obj* x_73; obj* x_76; obj* x_78; obj* x_81; obj* x_83; obj* x_85; obj* x_88; obj* x_91; obj* x_94; obj* x_96; obj* x_98; 
 x_0 = lean::mk_string("(");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = lean::mk_string(" : ");
-x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
-x_6 = lean::mk_string(")");
-x_7 = l_lean_parser_symbol_tokens___rarg(x_6, x_1);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_3);
-lean::dec(x_7);
-x_10 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_11 = l_lean_parser_list_cons_tokens___rarg(x_10, x_8);
-lean::dec(x_8);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_5, x_11);
-lean::dec(x_11);
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_3, x_13);
-lean::dec(x_13);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_2, x_15);
-lean::dec(x_15);
-lean::dec(x_2);
-x_20 = l_lean_parser_tokens___rarg(x_17);
-lean::dec(x_17);
-x_22 = lean::mk_string("{");
-x_23 = l_lean_parser_symbol_tokens___rarg(x_22, x_1);
-x_24 = lean::mk_string("}");
-x_25 = l_lean_parser_symbol_tokens___rarg(x_24, x_1);
-x_26 = l_lean_parser_list_cons_tokens___rarg(x_25, x_3);
-lean::dec(x_25);
-x_28 = l_lean_parser_list_cons_tokens___rarg(x_10, x_26);
-lean::dec(x_26);
-x_30 = l_lean_parser_list_cons_tokens___rarg(x_5, x_28);
-lean::dec(x_28);
-x_32 = l_lean_parser_list_cons_tokens___rarg(x_3, x_30);
-lean::dec(x_30);
-x_34 = l_lean_parser_list_cons_tokens___rarg(x_23, x_32);
-lean::dec(x_32);
-lean::dec(x_23);
-x_37 = l_lean_parser_tokens___rarg(x_34);
-lean::dec(x_34);
-x_39 = lean::mk_string("\xe2\xa6\x83");
-x_40 = l_lean_parser_symbol_tokens___rarg(x_39, x_1);
-x_41 = lean::mk_string("\xe2\xa6\x84");
-x_42 = l_lean_parser_symbol_tokens___rarg(x_41, x_1);
-x_43 = l_lean_parser_list_cons_tokens___rarg(x_42, x_3);
-lean::dec(x_42);
-x_45 = l_lean_parser_list_cons_tokens___rarg(x_10, x_43);
-lean::dec(x_43);
-x_47 = l_lean_parser_list_cons_tokens___rarg(x_5, x_45);
-lean::dec(x_45);
-x_49 = l_lean_parser_list_cons_tokens___rarg(x_3, x_47);
-lean::dec(x_47);
-x_51 = l_lean_parser_list_cons_tokens___rarg(x_40, x_49);
-lean::dec(x_49);
-lean::dec(x_40);
-x_54 = l_lean_parser_tokens___rarg(x_51);
-lean::dec(x_51);
-x_56 = lean::mk_string("[");
-x_57 = l_lean_parser_symbol_tokens___rarg(x_56, x_1);
-x_58 = lean::mk_string("]");
-x_59 = l_lean_parser_symbol_tokens___rarg(x_58, x_1);
-x_60 = l_lean_parser_list_cons_tokens___rarg(x_59, x_3);
-lean::dec(x_59);
-x_62 = l_lean_parser_list_cons_tokens___rarg(x_10, x_60);
-lean::dec(x_60);
-x_64 = l_lean_parser_list_cons_tokens___rarg(x_5, x_62);
-lean::dec(x_62);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = lean::mk_string(" : ");
+x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_1);
 lean::dec(x_5);
-x_67 = l_lean_parser_list_cons_tokens___rarg(x_3, x_64);
-lean::dec(x_64);
-x_69 = l_lean_parser_list_cons_tokens___rarg(x_57, x_67);
-lean::dec(x_67);
-lean::dec(x_57);
-x_72 = l_lean_parser_tokens___rarg(x_69);
-lean::dec(x_69);
-x_74 = l_lean_parser_list_cons_tokens___rarg(x_72, x_3);
-lean::dec(x_72);
-x_76 = l_lean_parser_list_cons_tokens___rarg(x_54, x_74);
-lean::dec(x_74);
-lean::dec(x_54);
-x_79 = l_lean_parser_list_cons_tokens___rarg(x_37, x_76);
-lean::dec(x_76);
-lean::dec(x_37);
-x_82 = l_lean_parser_list_cons_tokens___rarg(x_20, x_79);
-lean::dec(x_79);
+x_8 = lean::mk_string(")");
+x_9 = l_lean_parser_symbol_tokens___rarg(x_8, x_1);
+lean::dec(x_8);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_9, x_4);
+lean::dec(x_9);
+x_13 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_13, x_11);
+lean::dec(x_11);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_6, x_14);
+lean::dec(x_14);
+x_18 = l_lean_parser_list_cons_tokens___rarg(x_4, x_16);
+lean::dec(x_16);
+x_20 = l_lean_parser_list_cons_tokens___rarg(x_2, x_18);
+lean::dec(x_18);
+lean::dec(x_2);
+x_23 = l_lean_parser_tokens___rarg(x_20);
 lean::dec(x_20);
-x_85 = l_lean_parser_tokens___rarg(x_82);
-lean::dec(x_82);
-x_87 = l_lean_parser_list_cons_tokens___rarg(x_85, x_3);
+x_25 = lean::mk_string("{");
+x_26 = l_lean_parser_symbol_tokens___rarg(x_25, x_1);
+lean::dec(x_25);
+x_28 = lean::mk_string("}");
+x_29 = l_lean_parser_symbol_tokens___rarg(x_28, x_1);
+lean::dec(x_28);
+x_31 = l_lean_parser_list_cons_tokens___rarg(x_29, x_4);
+lean::dec(x_29);
+x_33 = l_lean_parser_list_cons_tokens___rarg(x_13, x_31);
+lean::dec(x_31);
+x_35 = l_lean_parser_list_cons_tokens___rarg(x_6, x_33);
+lean::dec(x_33);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_4, x_35);
+lean::dec(x_35);
+x_39 = l_lean_parser_list_cons_tokens___rarg(x_26, x_37);
+lean::dec(x_37);
+lean::dec(x_26);
+x_42 = l_lean_parser_tokens___rarg(x_39);
+lean::dec(x_39);
+x_44 = lean::mk_string("\xe2\xa6\x83");
+x_45 = l_lean_parser_symbol_tokens___rarg(x_44, x_1);
+lean::dec(x_44);
+x_47 = lean::mk_string("\xe2\xa6\x84");
+x_48 = l_lean_parser_symbol_tokens___rarg(x_47, x_1);
+lean::dec(x_47);
+x_50 = l_lean_parser_list_cons_tokens___rarg(x_48, x_4);
+lean::dec(x_48);
+x_52 = l_lean_parser_list_cons_tokens___rarg(x_13, x_50);
+lean::dec(x_50);
+x_54 = l_lean_parser_list_cons_tokens___rarg(x_6, x_52);
+lean::dec(x_52);
+x_56 = l_lean_parser_list_cons_tokens___rarg(x_4, x_54);
+lean::dec(x_54);
+x_58 = l_lean_parser_list_cons_tokens___rarg(x_45, x_56);
+lean::dec(x_56);
+lean::dec(x_45);
+x_61 = l_lean_parser_tokens___rarg(x_58);
+lean::dec(x_58);
+x_63 = lean::mk_string("[");
+x_64 = l_lean_parser_symbol_tokens___rarg(x_63, x_1);
+lean::dec(x_63);
+x_66 = lean::mk_string("]");
+x_67 = l_lean_parser_symbol_tokens___rarg(x_66, x_1);
+lean::dec(x_66);
+x_69 = l_lean_parser_list_cons_tokens___rarg(x_67, x_4);
+lean::dec(x_67);
+x_71 = l_lean_parser_list_cons_tokens___rarg(x_13, x_69);
+lean::dec(x_69);
+x_73 = l_lean_parser_list_cons_tokens___rarg(x_6, x_71);
+lean::dec(x_71);
+lean::dec(x_6);
+x_76 = l_lean_parser_list_cons_tokens___rarg(x_4, x_73);
+lean::dec(x_73);
+x_78 = l_lean_parser_list_cons_tokens___rarg(x_64, x_76);
+lean::dec(x_76);
+lean::dec(x_64);
+x_81 = l_lean_parser_tokens___rarg(x_78);
+lean::dec(x_78);
+x_83 = l_lean_parser_list_cons_tokens___rarg(x_81, x_4);
+lean::dec(x_81);
+x_85 = l_lean_parser_list_cons_tokens___rarg(x_61, x_83);
+lean::dec(x_83);
+lean::dec(x_61);
+x_88 = l_lean_parser_list_cons_tokens___rarg(x_42, x_85);
 lean::dec(x_85);
-x_89 = l_lean_parser_tokens___rarg(x_87);
-lean::dec(x_87);
-return x_89;
+lean::dec(x_42);
+x_91 = l_lean_parser_list_cons_tokens___rarg(x_23, x_88);
+lean::dec(x_88);
+lean::dec(x_23);
+x_94 = l_lean_parser_tokens___rarg(x_91);
+lean::dec(x_91);
+x_96 = l_lean_parser_list_cons_tokens___rarg(x_94, x_4);
+lean::dec(x_94);
+x_98 = l_lean_parser_tokens___rarg(x_96);
+lean::dec(x_96);
+return x_98;
 }
 }
 obj* _init_l_lean_parser_term_simple__binder_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_20; obj* x_22; obj* x_23; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_37; obj* x_38; obj* x_39; obj* x_41; obj* x_43; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_57; obj* x_58; obj* x_59; obj* x_61; obj* x_63; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_94; obj* x_95; obj* x_96; obj* x_97; obj* x_98; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_25; obj* x_26; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_42; obj* x_43; obj* x_44; obj* x_46; obj* x_48; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_64; obj* x_65; obj* x_66; obj* x_68; obj* x_70; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_94; obj* x_95; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; obj* x_101; obj* x_102; obj* x_103; obj* x_104; obj* x_105; obj* x_106; obj* x_107; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(" : ");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_11, 0, x_4);
-x_12 = lean::mk_string(")");
-x_13 = l_string_trim(x_12);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(" : ");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_13, 0, x_5);
+x_14 = lean::mk_string(")");
+x_15 = l_string_trim(x_14);
+lean::dec(x_14);
+lean::inc(x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_18, 0, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_19, 0, x_15);
+lean::closure_set(x_19, 1, x_5);
+lean::closure_set(x_19, 2, x_18);
+x_20 = lean::box(0);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_19);
+lean::cnstr_set(x_21, 1, x_20);
 lean::inc(x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_15, 0, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_13);
-lean::closure_set(x_16, 1, x_4);
-lean::closure_set(x_16, 2, x_15);
-x_17 = lean::box(0);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_16);
-lean::cnstr_set(x_18, 1, x_17);
-lean::inc(x_11);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_11);
-lean::cnstr_set(x_20, 1, x_18);
-lean::inc(x_10);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_10);
-lean::cnstr_set(x_22, 1, x_20);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-lean::inc(x_23);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_13);
+lean::cnstr_set(x_23, 1, x_21);
+lean::inc(x_12);
 x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_23);
-lean::cnstr_set(x_25, 1, x_22);
-x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_5);
-lean::cnstr_set(x_26, 1, x_25);
-x_27 = l_lean_parser_term_simple__explicit__binder;
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_28, 0, x_27);
-lean::closure_set(x_28, 1, x_26);
-x_29 = lean::mk_string("{");
-x_30 = l_string_trim(x_29);
-lean::inc(x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_32, 0, x_30);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_33, 0, x_30);
-lean::closure_set(x_33, 1, x_4);
-lean::closure_set(x_33, 2, x_32);
-x_34 = lean::mk_string("}");
-x_35 = l_string_trim(x_34);
-lean::inc(x_35);
-x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_37, 0, x_35);
-x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_38, 0, x_35);
-lean::closure_set(x_38, 1, x_4);
-lean::closure_set(x_38, 2, x_37);
-x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_38);
-lean::cnstr_set(x_39, 1, x_17);
-lean::inc(x_11);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_11);
-lean::cnstr_set(x_41, 1, x_39);
-lean::inc(x_10);
-x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_10);
-lean::cnstr_set(x_43, 1, x_41);
-lean::inc(x_23);
-x_45 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_45, 0, x_23);
-lean::cnstr_set(x_45, 1, x_43);
+lean::cnstr_set(x_25, 0, x_12);
+lean::cnstr_set(x_25, 1, x_23);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+lean::inc(x_26);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_26);
+lean::cnstr_set(x_28, 1, x_25);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_6);
+lean::cnstr_set(x_29, 1, x_28);
+x_30 = l_lean_parser_term_simple__explicit__binder;
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_31, 0, x_30);
+lean::closure_set(x_31, 1, x_29);
+x_32 = lean::mk_string("{");
+x_33 = l_string_trim(x_32);
+lean::dec(x_32);
+lean::inc(x_33);
+x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_36, 0, x_33);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_37, 0, x_33);
+lean::closure_set(x_37, 1, x_5);
+lean::closure_set(x_37, 2, x_36);
+x_38 = lean::mk_string("}");
+x_39 = l_string_trim(x_38);
+lean::dec(x_38);
+lean::inc(x_39);
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_42, 0, x_39);
+x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_43, 0, x_39);
+lean::closure_set(x_43, 1, x_5);
+lean::closure_set(x_43, 2, x_42);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_43);
+lean::cnstr_set(x_44, 1, x_20);
+lean::inc(x_13);
 x_46 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_46, 0, x_33);
-lean::cnstr_set(x_46, 1, x_45);
-x_47 = l_lean_parser_term_simple__implicit__binder;
-x_48 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_48, 0, x_47);
-lean::closure_set(x_48, 1, x_46);
-x_49 = lean::mk_string("\xe2\xa6\x83");
-x_50 = l_string_trim(x_49);
-lean::inc(x_50);
-x_52 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_52, 0, x_50);
-x_53 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_53, 0, x_50);
-lean::closure_set(x_53, 1, x_4);
-lean::closure_set(x_53, 2, x_52);
-x_54 = lean::mk_string("\xe2\xa6\x84");
+lean::cnstr_set(x_46, 0, x_13);
+lean::cnstr_set(x_46, 1, x_44);
+lean::inc(x_12);
+x_48 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_48, 0, x_12);
+lean::cnstr_set(x_48, 1, x_46);
+lean::inc(x_26);
+x_50 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_50, 0, x_26);
+lean::cnstr_set(x_50, 1, x_48);
+x_51 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_51, 0, x_37);
+lean::cnstr_set(x_51, 1, x_50);
+x_52 = l_lean_parser_term_simple__implicit__binder;
+x_53 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_53, 0, x_52);
+lean::closure_set(x_53, 1, x_51);
+x_54 = lean::mk_string("\xe2\xa6\x83");
 x_55 = l_string_trim(x_54);
+lean::dec(x_54);
 lean::inc(x_55);
-x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_57, 0, x_55);
-x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
 lean::closure_set(x_58, 0, x_55);
-lean::closure_set(x_58, 1, x_4);
-lean::closure_set(x_58, 2, x_57);
-x_59 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_59, 0, x_58);
-lean::cnstr_set(x_59, 1, x_17);
-lean::inc(x_11);
-x_61 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_61, 0, x_11);
-lean::cnstr_set(x_61, 1, x_59);
-lean::inc(x_10);
-x_63 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_63, 0, x_10);
-lean::cnstr_set(x_63, 1, x_61);
-lean::inc(x_23);
-x_65 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_65, 0, x_23);
-lean::cnstr_set(x_65, 1, x_63);
+x_59 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_59, 0, x_55);
+lean::closure_set(x_59, 1, x_5);
+lean::closure_set(x_59, 2, x_58);
+x_60 = lean::mk_string("\xe2\xa6\x84");
+x_61 = l_string_trim(x_60);
+lean::dec(x_60);
+lean::inc(x_61);
+x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_64, 0, x_61);
+x_65 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_65, 0, x_61);
+lean::closure_set(x_65, 1, x_5);
+lean::closure_set(x_65, 2, x_64);
 x_66 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_66, 0, x_53);
-lean::cnstr_set(x_66, 1, x_65);
-x_67 = l_lean_parser_term_simple__strict__implicit__binder;
-x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_68, 0, x_67);
-lean::closure_set(x_68, 1, x_66);
-x_69 = lean::mk_string("[");
-x_70 = l_string_trim(x_69);
-lean::inc(x_70);
-x_72 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_72, 0, x_70);
-x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_73, 0, x_70);
-lean::closure_set(x_73, 1, x_4);
-lean::closure_set(x_73, 2, x_72);
-x_74 = lean::mk_string("]");
-x_75 = l_string_trim(x_74);
-lean::inc(x_75);
-x_77 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_77, 0, x_75);
-x_78 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_78, 0, x_75);
-lean::closure_set(x_78, 1, x_4);
-lean::closure_set(x_78, 2, x_77);
-x_79 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_79, 0, x_78);
-lean::cnstr_set(x_79, 1, x_17);
-x_80 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_80, 0, x_11);
-lean::cnstr_set(x_80, 1, x_79);
-x_81 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_81, 0, x_10);
-lean::cnstr_set(x_81, 1, x_80);
-x_82 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_82, 0, x_23);
-lean::cnstr_set(x_82, 1, x_81);
-x_83 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_83, 0, x_73);
-lean::cnstr_set(x_83, 1, x_82);
-x_84 = l_lean_parser_term_simple__inst__implicit__binder;
-x_85 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_85, 0, x_84);
-lean::closure_set(x_85, 1, x_83);
-x_86 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_86, 0, x_85);
-lean::cnstr_set(x_86, 1, x_17);
-x_87 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_87, 0, x_68);
-lean::cnstr_set(x_87, 1, x_86);
+lean::cnstr_set(x_66, 0, x_65);
+lean::cnstr_set(x_66, 1, x_20);
+lean::inc(x_13);
+x_68 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_68, 0, x_13);
+lean::cnstr_set(x_68, 1, x_66);
+lean::inc(x_12);
+x_70 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_70, 0, x_12);
+lean::cnstr_set(x_70, 1, x_68);
+lean::inc(x_26);
+x_72 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_72, 0, x_26);
+lean::cnstr_set(x_72, 1, x_70);
+x_73 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_73, 0, x_59);
+lean::cnstr_set(x_73, 1, x_72);
+x_74 = l_lean_parser_term_simple__strict__implicit__binder;
+x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_75, 0, x_74);
+lean::closure_set(x_75, 1, x_73);
+x_76 = lean::mk_string("[");
+x_77 = l_string_trim(x_76);
+lean::dec(x_76);
+lean::inc(x_77);
+x_80 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_80, 0, x_77);
+x_81 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_81, 0, x_77);
+lean::closure_set(x_81, 1, x_5);
+lean::closure_set(x_81, 2, x_80);
+x_82 = lean::mk_string("]");
+x_83 = l_string_trim(x_82);
+lean::dec(x_82);
+lean::inc(x_83);
+x_86 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_86, 0, x_83);
+x_87 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_87, 0, x_83);
+lean::closure_set(x_87, 1, x_5);
+lean::closure_set(x_87, 2, x_86);
 x_88 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_88, 0, x_48);
-lean::cnstr_set(x_88, 1, x_87);
+lean::cnstr_set(x_88, 0, x_87);
+lean::cnstr_set(x_88, 1, x_20);
 x_89 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_89, 0, x_28);
+lean::cnstr_set(x_89, 0, x_13);
 lean::cnstr_set(x_89, 1, x_88);
-x_90 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_90, 0, x_89);
-lean::closure_set(x_90, 1, x_4);
+x_90 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_90, 0, x_12);
+lean::cnstr_set(x_90, 1, x_89);
 x_91 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_91, 0, x_90);
-lean::cnstr_set(x_91, 1, x_17);
-x_92 = l_lean_parser_term__parser__m_monad;
-x_93 = l_lean_parser_term__parser__m_monad__except;
-x_94 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_95 = l_lean_parser_term__parser__m_alternative;
-x_96 = l_lean_parser_term_simple__binder;
-x_97 = l_lean_parser_term_simple__binder_has__view;
-x_98 = l_lean_parser_combinators_node_view___rarg(x_92, x_93, x_94, x_95, x_96, x_91, x_97);
-lean::dec(x_91);
-return x_98;
+lean::cnstr_set(x_91, 0, x_26);
+lean::cnstr_set(x_91, 1, x_90);
+x_92 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_92, 0, x_81);
+lean::cnstr_set(x_92, 1, x_91);
+x_93 = l_lean_parser_term_simple__inst__implicit__binder;
+x_94 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_94, 0, x_93);
+lean::closure_set(x_94, 1, x_92);
+x_95 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_95, 0, x_94);
+lean::cnstr_set(x_95, 1, x_20);
+x_96 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_96, 0, x_75);
+lean::cnstr_set(x_96, 1, x_95);
+x_97 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_97, 0, x_53);
+lean::cnstr_set(x_97, 1, x_96);
+x_98 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_98, 0, x_31);
+lean::cnstr_set(x_98, 1, x_97);
+x_99 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_99, 0, x_98);
+lean::closure_set(x_99, 1, x_5);
+x_100 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_100, 0, x_99);
+lean::cnstr_set(x_100, 1, x_20);
+x_101 = l_lean_parser_term__parser__m_monad;
+x_102 = l_lean_parser_term__parser__m_monad__except;
+x_103 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_104 = l_lean_parser_term__parser__m_alternative;
+x_105 = l_lean_parser_term_simple__binder;
+x_106 = l_lean_parser_term_simple__binder_has__view;
+x_107 = l_lean_parser_combinators_node_view___rarg(x_101, x_102, x_103, x_104, x_105, x_100, x_106);
+lean::dec(x_100);
+return x_107;
 }
 }
 obj* _init_l_lean_parser_term_simple__binder_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_20; obj* x_22; obj* x_23; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_37; obj* x_38; obj* x_39; obj* x_41; obj* x_43; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_57; obj* x_58; obj* x_59; obj* x_61; obj* x_63; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_25; obj* x_26; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_42; obj* x_43; obj* x_44; obj* x_46; obj* x_48; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_64; obj* x_65; obj* x_66; obj* x_68; obj* x_70; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_94; obj* x_95; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(" : ");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_11, 0, x_4);
-x_12 = lean::mk_string(")");
-x_13 = l_string_trim(x_12);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(" : ");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_13, 0, x_5);
+x_14 = lean::mk_string(")");
+x_15 = l_string_trim(x_14);
+lean::dec(x_14);
+lean::inc(x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_18, 0, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_19, 0, x_15);
+lean::closure_set(x_19, 1, x_5);
+lean::closure_set(x_19, 2, x_18);
+x_20 = lean::box(0);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_19);
+lean::cnstr_set(x_21, 1, x_20);
 lean::inc(x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_15, 0, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_13);
-lean::closure_set(x_16, 1, x_4);
-lean::closure_set(x_16, 2, x_15);
-x_17 = lean::box(0);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_16);
-lean::cnstr_set(x_18, 1, x_17);
-lean::inc(x_11);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_11);
-lean::cnstr_set(x_20, 1, x_18);
-lean::inc(x_10);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_10);
-lean::cnstr_set(x_22, 1, x_20);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-lean::inc(x_23);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_13);
+lean::cnstr_set(x_23, 1, x_21);
+lean::inc(x_12);
 x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_23);
-lean::cnstr_set(x_25, 1, x_22);
-x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_5);
-lean::cnstr_set(x_26, 1, x_25);
-x_27 = l_lean_parser_term_simple__explicit__binder;
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_28, 0, x_27);
-lean::closure_set(x_28, 1, x_26);
-x_29 = lean::mk_string("{");
-x_30 = l_string_trim(x_29);
-lean::inc(x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_32, 0, x_30);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_33, 0, x_30);
-lean::closure_set(x_33, 1, x_4);
-lean::closure_set(x_33, 2, x_32);
-x_34 = lean::mk_string("}");
-x_35 = l_string_trim(x_34);
-lean::inc(x_35);
-x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_37, 0, x_35);
-x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_38, 0, x_35);
-lean::closure_set(x_38, 1, x_4);
-lean::closure_set(x_38, 2, x_37);
-x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_38);
-lean::cnstr_set(x_39, 1, x_17);
-lean::inc(x_11);
-x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_11);
-lean::cnstr_set(x_41, 1, x_39);
-lean::inc(x_10);
-x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_10);
-lean::cnstr_set(x_43, 1, x_41);
-lean::inc(x_23);
-x_45 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_45, 0, x_23);
-lean::cnstr_set(x_45, 1, x_43);
+lean::cnstr_set(x_25, 0, x_12);
+lean::cnstr_set(x_25, 1, x_23);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+lean::inc(x_26);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_26);
+lean::cnstr_set(x_28, 1, x_25);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_6);
+lean::cnstr_set(x_29, 1, x_28);
+x_30 = l_lean_parser_term_simple__explicit__binder;
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_31, 0, x_30);
+lean::closure_set(x_31, 1, x_29);
+x_32 = lean::mk_string("{");
+x_33 = l_string_trim(x_32);
+lean::dec(x_32);
+lean::inc(x_33);
+x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_36, 0, x_33);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_37, 0, x_33);
+lean::closure_set(x_37, 1, x_5);
+lean::closure_set(x_37, 2, x_36);
+x_38 = lean::mk_string("}");
+x_39 = l_string_trim(x_38);
+lean::dec(x_38);
+lean::inc(x_39);
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_42, 0, x_39);
+x_43 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_43, 0, x_39);
+lean::closure_set(x_43, 1, x_5);
+lean::closure_set(x_43, 2, x_42);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_43);
+lean::cnstr_set(x_44, 1, x_20);
+lean::inc(x_13);
 x_46 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_46, 0, x_33);
-lean::cnstr_set(x_46, 1, x_45);
-x_47 = l_lean_parser_term_simple__implicit__binder;
-x_48 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_48, 0, x_47);
-lean::closure_set(x_48, 1, x_46);
-x_49 = lean::mk_string("\xe2\xa6\x83");
-x_50 = l_string_trim(x_49);
-lean::inc(x_50);
-x_52 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_52, 0, x_50);
-x_53 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_53, 0, x_50);
-lean::closure_set(x_53, 1, x_4);
-lean::closure_set(x_53, 2, x_52);
-x_54 = lean::mk_string("\xe2\xa6\x84");
+lean::cnstr_set(x_46, 0, x_13);
+lean::cnstr_set(x_46, 1, x_44);
+lean::inc(x_12);
+x_48 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_48, 0, x_12);
+lean::cnstr_set(x_48, 1, x_46);
+lean::inc(x_26);
+x_50 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_50, 0, x_26);
+lean::cnstr_set(x_50, 1, x_48);
+x_51 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_51, 0, x_37);
+lean::cnstr_set(x_51, 1, x_50);
+x_52 = l_lean_parser_term_simple__implicit__binder;
+x_53 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_53, 0, x_52);
+lean::closure_set(x_53, 1, x_51);
+x_54 = lean::mk_string("\xe2\xa6\x83");
 x_55 = l_string_trim(x_54);
+lean::dec(x_54);
 lean::inc(x_55);
-x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_57, 0, x_55);
-x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
 lean::closure_set(x_58, 0, x_55);
-lean::closure_set(x_58, 1, x_4);
-lean::closure_set(x_58, 2, x_57);
-x_59 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_59, 0, x_58);
-lean::cnstr_set(x_59, 1, x_17);
-lean::inc(x_11);
-x_61 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_61, 0, x_11);
-lean::cnstr_set(x_61, 1, x_59);
-lean::inc(x_10);
-x_63 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_63, 0, x_10);
-lean::cnstr_set(x_63, 1, x_61);
-lean::inc(x_23);
-x_65 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_65, 0, x_23);
-lean::cnstr_set(x_65, 1, x_63);
+x_59 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_59, 0, x_55);
+lean::closure_set(x_59, 1, x_5);
+lean::closure_set(x_59, 2, x_58);
+x_60 = lean::mk_string("\xe2\xa6\x84");
+x_61 = l_string_trim(x_60);
+lean::dec(x_60);
+lean::inc(x_61);
+x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_64, 0, x_61);
+x_65 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_65, 0, x_61);
+lean::closure_set(x_65, 1, x_5);
+lean::closure_set(x_65, 2, x_64);
 x_66 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_66, 0, x_53);
-lean::cnstr_set(x_66, 1, x_65);
-x_67 = l_lean_parser_term_simple__strict__implicit__binder;
-x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_68, 0, x_67);
-lean::closure_set(x_68, 1, x_66);
-x_69 = lean::mk_string("[");
-x_70 = l_string_trim(x_69);
-lean::inc(x_70);
-x_72 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_72, 0, x_70);
-x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_73, 0, x_70);
-lean::closure_set(x_73, 1, x_4);
-lean::closure_set(x_73, 2, x_72);
-x_74 = lean::mk_string("]");
-x_75 = l_string_trim(x_74);
-lean::inc(x_75);
-x_77 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_77, 0, x_75);
-x_78 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_78, 0, x_75);
-lean::closure_set(x_78, 1, x_4);
-lean::closure_set(x_78, 2, x_77);
-x_79 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_79, 0, x_78);
-lean::cnstr_set(x_79, 1, x_17);
-x_80 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_80, 0, x_11);
-lean::cnstr_set(x_80, 1, x_79);
-x_81 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_81, 0, x_10);
-lean::cnstr_set(x_81, 1, x_80);
-x_82 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_82, 0, x_23);
-lean::cnstr_set(x_82, 1, x_81);
-x_83 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_83, 0, x_73);
-lean::cnstr_set(x_83, 1, x_82);
-x_84 = l_lean_parser_term_simple__inst__implicit__binder;
-x_85 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_85, 0, x_84);
-lean::closure_set(x_85, 1, x_83);
-x_86 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_86, 0, x_85);
-lean::cnstr_set(x_86, 1, x_17);
-x_87 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_87, 0, x_68);
-lean::cnstr_set(x_87, 1, x_86);
+lean::cnstr_set(x_66, 0, x_65);
+lean::cnstr_set(x_66, 1, x_20);
+lean::inc(x_13);
+x_68 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_68, 0, x_13);
+lean::cnstr_set(x_68, 1, x_66);
+lean::inc(x_12);
+x_70 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_70, 0, x_12);
+lean::cnstr_set(x_70, 1, x_68);
+lean::inc(x_26);
+x_72 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_72, 0, x_26);
+lean::cnstr_set(x_72, 1, x_70);
+x_73 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_73, 0, x_59);
+lean::cnstr_set(x_73, 1, x_72);
+x_74 = l_lean_parser_term_simple__strict__implicit__binder;
+x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_75, 0, x_74);
+lean::closure_set(x_75, 1, x_73);
+x_76 = lean::mk_string("[");
+x_77 = l_string_trim(x_76);
+lean::dec(x_76);
+lean::inc(x_77);
+x_80 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_80, 0, x_77);
+x_81 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_81, 0, x_77);
+lean::closure_set(x_81, 1, x_5);
+lean::closure_set(x_81, 2, x_80);
+x_82 = lean::mk_string("]");
+x_83 = l_string_trim(x_82);
+lean::dec(x_82);
+lean::inc(x_83);
+x_86 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_86, 0, x_83);
+x_87 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_87, 0, x_83);
+lean::closure_set(x_87, 1, x_5);
+lean::closure_set(x_87, 2, x_86);
 x_88 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_88, 0, x_48);
-lean::cnstr_set(x_88, 1, x_87);
+lean::cnstr_set(x_88, 0, x_87);
+lean::cnstr_set(x_88, 1, x_20);
 x_89 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_89, 0, x_28);
+lean::cnstr_set(x_89, 0, x_13);
 lean::cnstr_set(x_89, 1, x_88);
-x_90 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_90, 0, x_89);
-lean::closure_set(x_90, 1, x_4);
+x_90 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_90, 0, x_12);
+lean::cnstr_set(x_90, 1, x_89);
 x_91 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_91, 0, x_90);
-lean::cnstr_set(x_91, 1, x_17);
-return x_91;
+lean::cnstr_set(x_91, 0, x_26);
+lean::cnstr_set(x_91, 1, x_90);
+x_92 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_92, 0, x_81);
+lean::cnstr_set(x_92, 1, x_91);
+x_93 = l_lean_parser_term_simple__inst__implicit__binder;
+x_94 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_94, 0, x_93);
+lean::closure_set(x_94, 1, x_92);
+x_95 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_95, 0, x_94);
+lean::cnstr_set(x_95, 1, x_20);
+x_96 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_96, 0, x_75);
+lean::cnstr_set(x_96, 1, x_95);
+x_97 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_97, 0, x_53);
+lean::cnstr_set(x_97, 1, x_96);
+x_98 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_98, 0, x_31);
+lean::cnstr_set(x_98, 1, x_97);
+x_99 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_99, 0, x_98);
+lean::closure_set(x_99, 1, x_5);
+x_100 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_100, 0, x_99);
+lean::cnstr_set(x_100, 1, x_20);
+return x_100;
 }
 }
 obj* l_lean_parser_term_simple__binder_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -16734,146 +16797,155 @@ return x_0;
 obj* _init_l_lean_parser_term_anonymous__constructor_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_17; obj* x_20; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_14; obj* x_15; obj* x_17; obj* x_20; obj* x_23; 
 x_0 = lean::mk_string("\xe2\x9f\xa8");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(",");
-x_4 = lean::mk_nat_obj(0u);
-x_5 = l_lean_parser_symbol_tokens___rarg(x_3, x_4);
-x_6 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_7 = l_lean_parser_combinators_sep__by_tokens___rarg(x_6, x_5);
-lean::dec(x_5);
-x_9 = lean::mk_string("\xe2\x9f\xa9");
-x_10 = l_lean_parser_symbol_tokens___rarg(x_9, x_4);
-x_11 = lean::box(0);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_10, x_11);
-lean::dec(x_10);
-x_14 = l_lean_parser_list_cons_tokens___rarg(x_7, x_12);
+lean::dec(x_0);
+x_4 = lean::mk_string(",");
+x_5 = lean::mk_nat_obj(0u);
+x_6 = l_lean_parser_symbol_tokens___rarg(x_4, x_5);
+lean::dec(x_4);
+x_8 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_9 = l_lean_parser_combinators_sep__by_tokens___rarg(x_8, x_6);
+lean::dec(x_6);
+x_11 = lean::mk_string("\xe2\x9f\xa9");
+x_12 = l_lean_parser_symbol_tokens___rarg(x_11, x_5);
+lean::dec(x_11);
+x_14 = lean::box(0);
+x_15 = l_lean_parser_list_cons_tokens___rarg(x_12, x_14);
 lean::dec(x_12);
-lean::dec(x_7);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_2, x_14);
-lean::dec(x_14);
-lean::dec(x_2);
-x_20 = l_lean_parser_tokens___rarg(x_17);
+x_17 = l_lean_parser_list_cons_tokens___rarg(x_9, x_15);
+lean::dec(x_15);
+lean::dec(x_9);
+x_20 = l_lean_parser_list_cons_tokens___rarg(x_2, x_17);
 lean::dec(x_17);
-return x_20;
+lean::dec(x_2);
+x_23 = l_lean_parser_tokens___rarg(x_20);
+lean::dec(x_20);
+return x_23;
 }
 }
 obj* _init_l_lean_parser_term_anonymous__constructor_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; uint8 x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; uint8 x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; 
 x_0 = lean::mk_string("\xe2\x9f\xa8");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_nat_obj(0u);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string(",");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_6);
-lean::closure_set(x_12, 2, x_11);
-x_13 = 1;
-x_14 = lean::box(x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_15, 0, x_7);
-lean::closure_set(x_15, 1, x_12);
-lean::closure_set(x_15, 2, x_14);
-x_16 = lean::mk_string("\xe2\x9f\xa9");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_6);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::box(0);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_20);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_15);
-lean::cnstr_set(x_23, 1, x_22);
-x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_5);
-lean::cnstr_set(x_24, 1, x_23);
-x_25 = l_lean_parser_term__parser__m_monad;
-x_26 = l_lean_parser_term__parser__m_monad__except;
-x_27 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_28 = l_lean_parser_term__parser__m_alternative;
-x_29 = l_lean_parser_term_anonymous__constructor;
-x_30 = l_lean_parser_term_anonymous__constructor_has__view;
-x_31 = l_lean_parser_combinators_node_view___rarg(x_25, x_26, x_27, x_28, x_29, x_24, x_30);
-lean::dec(x_24);
-return x_31;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_nat_obj(0u);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string(",");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_7);
+lean::closure_set(x_14, 2, x_13);
+x_15 = 1;
+x_16 = lean::box(x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_17, 0, x_8);
+lean::closure_set(x_17, 1, x_14);
+lean::closure_set(x_17, 2, x_16);
+x_18 = lean::mk_string("\xe2\x9f\xa9");
+x_19 = l_string_trim(x_18);
+lean::dec(x_18);
+lean::inc(x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_22, 0, x_19);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_23, 0, x_19);
+lean::closure_set(x_23, 1, x_7);
+lean::closure_set(x_23, 2, x_22);
+x_24 = lean::box(0);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_23);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_17);
+lean::cnstr_set(x_26, 1, x_25);
+x_27 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_27, 0, x_6);
+lean::cnstr_set(x_27, 1, x_26);
+x_28 = l_lean_parser_term__parser__m_monad;
+x_29 = l_lean_parser_term__parser__m_monad__except;
+x_30 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_31 = l_lean_parser_term__parser__m_alternative;
+x_32 = l_lean_parser_term_anonymous__constructor;
+x_33 = l_lean_parser_term_anonymous__constructor_has__view;
+x_34 = l_lean_parser_combinators_node_view___rarg(x_28, x_29, x_30, x_31, x_32, x_27, x_33);
+lean::dec(x_27);
+return x_34;
 }
 }
 obj* _init_l_lean_parser_term_anonymous__constructor_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; uint8 x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; uint8 x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; 
 x_0 = lean::mk_string("\xe2\x9f\xa8");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_nat_obj(0u);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string(",");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_6);
-lean::closure_set(x_12, 2, x_11);
-x_13 = 1;
-x_14 = lean::box(x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_15, 0, x_7);
-lean::closure_set(x_15, 1, x_12);
-lean::closure_set(x_15, 2, x_14);
-x_16 = lean::mk_string("\xe2\x9f\xa9");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_6);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::box(0);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_20);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_15);
-lean::cnstr_set(x_23, 1, x_22);
-x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_5);
-lean::cnstr_set(x_24, 1, x_23);
-return x_24;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_nat_obj(0u);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string(",");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_7);
+lean::closure_set(x_14, 2, x_13);
+x_15 = 1;
+x_16 = lean::box(x_15);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_17, 0, x_8);
+lean::closure_set(x_17, 1, x_14);
+lean::closure_set(x_17, 2, x_16);
+x_18 = lean::mk_string("\xe2\x9f\xa9");
+x_19 = l_string_trim(x_18);
+lean::dec(x_18);
+lean::inc(x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_22, 0, x_19);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_23, 0, x_19);
+lean::closure_set(x_23, 1, x_7);
+lean::closure_set(x_23, 2, x_22);
+x_24 = lean::box(0);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_23);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_26, 0, x_17);
+lean::cnstr_set(x_26, 1, x_25);
+x_27 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_27, 0, x_6);
+lean::cnstr_set(x_27, 1, x_26);
+return x_27;
 }
 }
 obj* l_lean_parser_term_anonymous__constructor_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -22413,118 +22485,127 @@ return x_67;
 obj* _init_l_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_22; obj* x_25; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_33; obj* x_35; obj* x_38; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_46; obj* x_48; obj* x_51; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_61; obj* x_63; obj* x_65; obj* x_67; obj* x_69; obj* x_72; obj* x_74; obj* x_76; obj* x_78; obj* x_79; obj* x_80; obj* x_82; obj* x_85; obj* x_88; obj* x_90; obj* x_91; obj* x_92; obj* x_95; obj* x_98; obj* x_101; obj* x_104; obj* x_106; obj* x_108; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_12; obj* x_14; obj* x_16; obj* x_17; obj* x_19; obj* x_21; obj* x_24; obj* x_27; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_35; obj* x_37; obj* x_39; obj* x_42; obj* x_44; obj* x_45; obj* x_47; obj* x_48; obj* x_50; obj* x_52; obj* x_54; obj* x_57; obj* x_59; obj* x_60; obj* x_62; obj* x_63; obj* x_65; obj* x_66; obj* x_67; obj* x_69; obj* x_71; obj* x_73; obj* x_75; obj* x_77; obj* x_80; obj* x_82; obj* x_84; obj* x_86; obj* x_87; obj* x_89; obj* x_91; obj* x_94; obj* x_97; obj* x_99; obj* x_100; obj* x_101; obj* x_104; obj* x_107; obj* x_110; obj* x_113; obj* x_115; obj* x_117; 
 x_0 = lean::mk_string("(");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_term_binder__content_parser_lean_parser_has__tokens;
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-x_6 = l_lean_parser_command_notation__like_parser_lean_parser_has__tokens;
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_5);
-lean::dec(x_5);
-x_9 = l_lean_parser_tokens___rarg(x_7);
-lean::dec(x_7);
-x_11 = l_lean_parser_list_cons_tokens___rarg(x_9, x_3);
-lean::dec(x_9);
-x_13 = l_lean_parser_tokens___rarg(x_11);
-lean::dec(x_11);
-x_15 = lean::mk_string(")");
-x_16 = l_lean_parser_symbol_tokens___rarg(x_15, x_1);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_16, x_3);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_term_binder__content_parser_lean_parser_has__tokens;
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
+x_7 = l_lean_parser_command_notation__like_parser_lean_parser_has__tokens;
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_6);
+lean::dec(x_6);
+x_10 = l_lean_parser_tokens___rarg(x_8);
+lean::dec(x_8);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_10, x_4);
+lean::dec(x_10);
+x_14 = l_lean_parser_tokens___rarg(x_12);
+lean::dec(x_12);
+x_16 = lean::mk_string(")");
+x_17 = l_lean_parser_symbol_tokens___rarg(x_16, x_1);
 lean::dec(x_16);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_13, x_17);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_17, x_4);
 lean::dec(x_17);
-lean::dec(x_13);
-x_22 = l_lean_parser_list_cons_tokens___rarg(x_2, x_19);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_14, x_19);
 lean::dec(x_19);
+lean::dec(x_14);
+x_24 = l_lean_parser_list_cons_tokens___rarg(x_2, x_21);
+lean::dec(x_21);
 lean::dec(x_2);
-x_25 = l_lean_parser_tokens___rarg(x_22);
-lean::dec(x_22);
-x_27 = lean::mk_string("{");
-x_28 = l_lean_parser_symbol_tokens___rarg(x_27, x_1);
-x_29 = lean::mk_string("}");
+x_27 = l_lean_parser_tokens___rarg(x_24);
+lean::dec(x_24);
+x_29 = lean::mk_string("{");
 x_30 = l_lean_parser_symbol_tokens___rarg(x_29, x_1);
-x_31 = l_lean_parser_list_cons_tokens___rarg(x_30, x_3);
-lean::dec(x_30);
-x_33 = l_lean_parser_list_cons_tokens___rarg(x_4, x_31);
-lean::dec(x_31);
-x_35 = l_lean_parser_list_cons_tokens___rarg(x_28, x_33);
+lean::dec(x_29);
+x_32 = lean::mk_string("}");
+x_33 = l_lean_parser_symbol_tokens___rarg(x_32, x_1);
+lean::dec(x_32);
+x_35 = l_lean_parser_list_cons_tokens___rarg(x_33, x_4);
 lean::dec(x_33);
-lean::dec(x_28);
-x_38 = l_lean_parser_tokens___rarg(x_35);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_5, x_35);
 lean::dec(x_35);
-x_40 = lean::mk_string("\xe2\xa6\x83");
-x_41 = l_lean_parser_symbol_tokens___rarg(x_40, x_1);
-x_42 = lean::mk_string("\xe2\xa6\x84");
-x_43 = l_lean_parser_symbol_tokens___rarg(x_42, x_1);
-x_44 = l_lean_parser_list_cons_tokens___rarg(x_43, x_3);
-lean::dec(x_43);
-x_46 = l_lean_parser_list_cons_tokens___rarg(x_4, x_44);
+x_39 = l_lean_parser_list_cons_tokens___rarg(x_30, x_37);
+lean::dec(x_37);
+lean::dec(x_30);
+x_42 = l_lean_parser_tokens___rarg(x_39);
+lean::dec(x_39);
+x_44 = lean::mk_string("\xe2\xa6\x83");
+x_45 = l_lean_parser_symbol_tokens___rarg(x_44, x_1);
 lean::dec(x_44);
-x_48 = l_lean_parser_list_cons_tokens___rarg(x_41, x_46);
-lean::dec(x_46);
-lean::dec(x_41);
-x_51 = l_lean_parser_tokens___rarg(x_48);
+x_47 = lean::mk_string("\xe2\xa6\x84");
+x_48 = l_lean_parser_symbol_tokens___rarg(x_47, x_1);
+lean::dec(x_47);
+x_50 = l_lean_parser_list_cons_tokens___rarg(x_48, x_4);
 lean::dec(x_48);
-x_53 = lean::mk_string("[");
-x_54 = l_lean_parser_symbol_tokens___rarg(x_53, x_1);
-x_55 = lean::mk_string(" : ");
-x_56 = l_lean_parser_symbol_tokens___rarg(x_55, x_1);
-x_57 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_58 = l_lean_parser_list_cons_tokens___rarg(x_57, x_3);
-x_59 = l_lean_parser_list_cons_tokens___rarg(x_56, x_58);
-lean::dec(x_56);
-x_61 = l_lean_parser_list_cons_tokens___rarg(x_3, x_59);
-lean::dec(x_59);
-x_63 = l_lean_parser_tokens___rarg(x_61);
-lean::dec(x_61);
-x_65 = l_lean_parser_tokens___rarg(x_58);
-lean::dec(x_58);
-x_67 = l_lean_parser_list_cons_tokens___rarg(x_65, x_3);
-lean::dec(x_65);
-x_69 = l_lean_parser_list_cons_tokens___rarg(x_63, x_67);
-lean::dec(x_67);
-lean::dec(x_63);
-x_72 = l_lean_parser_tokens___rarg(x_69);
-lean::dec(x_69);
-x_74 = l_lean_parser_list_cons_tokens___rarg(x_72, x_3);
-lean::dec(x_72);
-x_76 = l_lean_parser_tokens___rarg(x_74);
-lean::dec(x_74);
-x_78 = lean::mk_string("]");
-x_79 = l_lean_parser_symbol_tokens___rarg(x_78, x_1);
-x_80 = l_lean_parser_list_cons_tokens___rarg(x_79, x_3);
-lean::dec(x_79);
-x_82 = l_lean_parser_list_cons_tokens___rarg(x_76, x_80);
-lean::dec(x_80);
-lean::dec(x_76);
-x_85 = l_lean_parser_list_cons_tokens___rarg(x_54, x_82);
-lean::dec(x_82);
+x_52 = l_lean_parser_list_cons_tokens___rarg(x_5, x_50);
+lean::dec(x_50);
+x_54 = l_lean_parser_list_cons_tokens___rarg(x_45, x_52);
+lean::dec(x_52);
+lean::dec(x_45);
+x_57 = l_lean_parser_tokens___rarg(x_54);
 lean::dec(x_54);
-x_88 = l_lean_parser_tokens___rarg(x_85);
-lean::dec(x_85);
-x_90 = l_lean_parser_term_anonymous__constructor_parser_lean_parser_has__tokens;
-x_91 = l_lean_parser_list_cons_tokens___rarg(x_90, x_3);
-x_92 = l_lean_parser_list_cons_tokens___rarg(x_88, x_91);
+x_59 = lean::mk_string("[");
+x_60 = l_lean_parser_symbol_tokens___rarg(x_59, x_1);
+lean::dec(x_59);
+x_62 = lean::mk_string(" : ");
+x_63 = l_lean_parser_symbol_tokens___rarg(x_62, x_1);
+lean::dec(x_62);
+x_65 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_66 = l_lean_parser_list_cons_tokens___rarg(x_65, x_4);
+x_67 = l_lean_parser_list_cons_tokens___rarg(x_63, x_66);
+lean::dec(x_63);
+x_69 = l_lean_parser_list_cons_tokens___rarg(x_4, x_67);
+lean::dec(x_67);
+x_71 = l_lean_parser_tokens___rarg(x_69);
+lean::dec(x_69);
+x_73 = l_lean_parser_tokens___rarg(x_66);
+lean::dec(x_66);
+x_75 = l_lean_parser_list_cons_tokens___rarg(x_73, x_4);
+lean::dec(x_73);
+x_77 = l_lean_parser_list_cons_tokens___rarg(x_71, x_75);
+lean::dec(x_75);
+lean::dec(x_71);
+x_80 = l_lean_parser_tokens___rarg(x_77);
+lean::dec(x_77);
+x_82 = l_lean_parser_list_cons_tokens___rarg(x_80, x_4);
+lean::dec(x_80);
+x_84 = l_lean_parser_tokens___rarg(x_82);
+lean::dec(x_82);
+x_86 = lean::mk_string("]");
+x_87 = l_lean_parser_symbol_tokens___rarg(x_86, x_1);
+lean::dec(x_86);
+x_89 = l_lean_parser_list_cons_tokens___rarg(x_87, x_4);
+lean::dec(x_87);
+x_91 = l_lean_parser_list_cons_tokens___rarg(x_84, x_89);
+lean::dec(x_89);
+lean::dec(x_84);
+x_94 = l_lean_parser_list_cons_tokens___rarg(x_60, x_91);
 lean::dec(x_91);
-lean::dec(x_88);
-x_95 = l_lean_parser_list_cons_tokens___rarg(x_51, x_92);
-lean::dec(x_92);
-lean::dec(x_51);
-x_98 = l_lean_parser_list_cons_tokens___rarg(x_38, x_95);
-lean::dec(x_95);
-lean::dec(x_38);
-x_101 = l_lean_parser_list_cons_tokens___rarg(x_25, x_98);
-lean::dec(x_98);
-lean::dec(x_25);
-x_104 = l_lean_parser_tokens___rarg(x_101);
+lean::dec(x_60);
+x_97 = l_lean_parser_tokens___rarg(x_94);
+lean::dec(x_94);
+x_99 = l_lean_parser_term_anonymous__constructor_parser_lean_parser_has__tokens;
+x_100 = l_lean_parser_list_cons_tokens___rarg(x_99, x_4);
+x_101 = l_lean_parser_list_cons_tokens___rarg(x_97, x_100);
+lean::dec(x_100);
+lean::dec(x_97);
+x_104 = l_lean_parser_list_cons_tokens___rarg(x_57, x_101);
 lean::dec(x_101);
-x_106 = l_lean_parser_list_cons_tokens___rarg(x_104, x_3);
+lean::dec(x_57);
+x_107 = l_lean_parser_list_cons_tokens___rarg(x_42, x_104);
 lean::dec(x_104);
-x_108 = l_lean_parser_tokens___rarg(x_106);
-lean::dec(x_106);
-return x_108;
+lean::dec(x_42);
+x_110 = l_lean_parser_list_cons_tokens___rarg(x_27, x_107);
+lean::dec(x_107);
+lean::dec(x_27);
+x_113 = l_lean_parser_tokens___rarg(x_110);
+lean::dec(x_110);
+x_115 = l_lean_parser_list_cons_tokens___rarg(x_113, x_4);
+lean::dec(x_113);
+x_117 = l_lean_parser_tokens___rarg(x_115);
+lean::dec(x_115);
+return x_117;
 }
 }
 obj* l_lean_parser_parsec__t_lookahead___at_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens___spec__4___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6, obj* x_7) {
@@ -22548,449 +22629,467 @@ return x_7;
 obj* _init_l_lean_parser_term_bracketed__binder_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_34; obj* x_35; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_94; obj* x_95; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; obj* x_101; obj* x_102; obj* x_103; obj* x_104; obj* x_105; obj* x_106; obj* x_107; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_38; obj* x_39; obj* x_40; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_95; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; obj* x_101; obj* x_102; obj* x_103; obj* x_104; obj* x_105; obj* x_106; obj* x_107; obj* x_108; obj* x_109; obj* x_110; obj* x_111; obj* x_112; obj* x_113; obj* x_114; obj* x_115; obj* x_116; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binder__content_parser), 5, 0);
-lean::inc(x_7);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_6);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_10);
-lean::cnstr_set(x_11, 1, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_12, 0, x_11);
-lean::closure_set(x_12, 1, x_4);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_12);
-lean::cnstr_set(x_13, 1, x_6);
-x_14 = l_lean_parser_term_explicit__binder__content;
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_15, 0, x_14);
-lean::closure_set(x_15, 1, x_13);
-x_16 = lean::mk_string(")");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_4);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_6);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_15);
-lean::cnstr_set(x_22, 1, x_21);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binder__content_parser), 5, 0);
+lean::inc(x_8);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_8);
+lean::cnstr_set(x_10, 1, x_7);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_11);
+lean::cnstr_set(x_12, 1, x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_13, 0, x_12);
+lean::closure_set(x_13, 1, x_5);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_13);
+lean::cnstr_set(x_14, 1, x_7);
+x_15 = l_lean_parser_term_explicit__binder__content;
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_16, 0, x_15);
+lean::closure_set(x_16, 1, x_14);
+x_17 = lean::mk_string(")");
+x_18 = l_string_trim(x_17);
+lean::dec(x_17);
+lean::inc(x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_21, 0, x_18);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_22, 0, x_18);
+lean::closure_set(x_22, 1, x_5);
+lean::closure_set(x_22, 2, x_21);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_5);
-lean::cnstr_set(x_23, 1, x_22);
-x_24 = l_lean_parser_term_explicit__binder;
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_25, 0, x_24);
-lean::closure_set(x_25, 1, x_23);
-x_26 = lean::mk_string("{");
-x_27 = l_string_trim(x_26);
-lean::inc(x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_29, 0, x_27);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_30, 0, x_27);
-lean::closure_set(x_30, 1, x_4);
-lean::closure_set(x_30, 2, x_29);
-x_31 = lean::mk_string("}");
-x_32 = l_string_trim(x_31);
-lean::inc(x_32);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_34, 0, x_32);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_35, 0, x_32);
-lean::closure_set(x_35, 1, x_4);
-lean::closure_set(x_35, 2, x_34);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_35);
-lean::cnstr_set(x_36, 1, x_6);
-lean::inc(x_7);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_7);
-lean::cnstr_set(x_38, 1, x_36);
-x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_30);
-lean::cnstr_set(x_39, 1, x_38);
-x_40 = l_lean_parser_term_implicit__binder;
-x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_41, 0, x_40);
-lean::closure_set(x_41, 1, x_39);
-x_42 = lean::mk_string("\xe2\xa6\x83");
-x_43 = l_string_trim(x_42);
-lean::inc(x_43);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_45, 0, x_43);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_46, 0, x_43);
-lean::closure_set(x_46, 1, x_4);
-lean::closure_set(x_46, 2, x_45);
-x_47 = lean::mk_string("\xe2\xa6\x84");
-x_48 = l_string_trim(x_47);
-lean::inc(x_48);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_7);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_16);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_6);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = l_lean_parser_term_explicit__binder;
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_27, 0, x_26);
+lean::closure_set(x_27, 1, x_25);
+x_28 = lean::mk_string("{");
+x_29 = l_string_trim(x_28);
+lean::dec(x_28);
+lean::inc(x_29);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_32, 0, x_29);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_33, 0, x_29);
+lean::closure_set(x_33, 1, x_5);
+lean::closure_set(x_33, 2, x_32);
+x_34 = lean::mk_string("}");
+x_35 = l_string_trim(x_34);
+lean::dec(x_34);
+lean::inc(x_35);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_38, 0, x_35);
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_39, 0, x_35);
+lean::closure_set(x_39, 1, x_5);
+lean::closure_set(x_39, 2, x_38);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_39);
+lean::cnstr_set(x_40, 1, x_7);
+lean::inc(x_8);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_8);
+lean::cnstr_set(x_42, 1, x_40);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_33);
+lean::cnstr_set(x_43, 1, x_42);
+x_44 = l_lean_parser_term_implicit__binder;
+x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_45, 0, x_44);
+lean::closure_set(x_45, 1, x_43);
+x_46 = lean::mk_string("\xe2\xa6\x83");
+x_47 = l_string_trim(x_46);
+lean::dec(x_46);
+lean::inc(x_47);
 x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_50, 0, x_48);
+lean::closure_set(x_50, 0, x_47);
 x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_51, 0, x_48);
-lean::closure_set(x_51, 1, x_4);
+lean::closure_set(x_51, 0, x_47);
+lean::closure_set(x_51, 1, x_5);
 lean::closure_set(x_51, 2, x_50);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_51);
-lean::cnstr_set(x_52, 1, x_6);
-x_53 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_53, 0, x_7);
-lean::cnstr_set(x_53, 1, x_52);
-x_54 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_54, 0, x_46);
-lean::cnstr_set(x_54, 1, x_53);
-x_55 = l_lean_parser_term_strict__implicit__binder;
-x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_56, 0, x_55);
-lean::closure_set(x_56, 1, x_54);
-x_57 = lean::mk_string("[");
-x_58 = l_string_trim(x_57);
-lean::inc(x_58);
-x_60 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_60, 0, x_58);
-x_61 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_61, 0, x_58);
-lean::closure_set(x_61, 1, x_4);
-lean::closure_set(x_61, 2, x_60);
-x_62 = lean::mk_string(" : ");
-x_63 = l_string_trim(x_62);
-lean::inc(x_63);
-x_65 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_65, 0, x_63);
-x_66 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_66, 0, x_63);
-lean::closure_set(x_66, 1, x_4);
-lean::closure_set(x_66, 2, x_65);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_67, 0, x_4);
-x_68 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_68, 0, x_67);
-lean::cnstr_set(x_68, 1, x_6);
-lean::inc(x_68);
-x_70 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_70, 0, x_66);
-lean::cnstr_set(x_70, 1, x_68);
-x_71 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-x_72 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_72, 0, x_71);
-lean::cnstr_set(x_72, 1, x_70);
-x_73 = l_lean_parser_term_inst__implicit__named__binder;
-x_74 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_74, 0, x_73);
-lean::closure_set(x_74, 1, x_72);
-x_75 = l_lean_parser_term_inst__implicit__anonymous__binder;
-x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_76, 0, x_75);
-lean::closure_set(x_76, 1, x_68);
-x_77 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_77, 0, x_76);
-lean::cnstr_set(x_77, 1, x_6);
+x_52 = lean::mk_string("\xe2\xa6\x84");
+x_53 = l_string_trim(x_52);
+lean::dec(x_52);
+lean::inc(x_53);
+x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_56, 0, x_53);
+x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_57, 0, x_53);
+lean::closure_set(x_57, 1, x_5);
+lean::closure_set(x_57, 2, x_56);
+x_58 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_58, 0, x_57);
+lean::cnstr_set(x_58, 1, x_7);
+x_59 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_59, 0, x_8);
+lean::cnstr_set(x_59, 1, x_58);
+x_60 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_60, 0, x_51);
+lean::cnstr_set(x_60, 1, x_59);
+x_61 = l_lean_parser_term_strict__implicit__binder;
+x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_62, 0, x_61);
+lean::closure_set(x_62, 1, x_60);
+x_63 = lean::mk_string("[");
+x_64 = l_string_trim(x_63);
+lean::dec(x_63);
+lean::inc(x_64);
+x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_67, 0, x_64);
+x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_68, 0, x_64);
+lean::closure_set(x_68, 1, x_5);
+lean::closure_set(x_68, 2, x_67);
+x_69 = lean::mk_string(" : ");
+x_70 = l_string_trim(x_69);
+lean::dec(x_69);
+lean::inc(x_70);
+x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_73, 0, x_70);
+x_74 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_74, 0, x_70);
+lean::closure_set(x_74, 1, x_5);
+lean::closure_set(x_74, 2, x_73);
+x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_75, 0, x_5);
+x_76 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_76, 0, x_75);
+lean::cnstr_set(x_76, 1, x_7);
+lean::inc(x_76);
 x_78 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_78, 0, x_74);
-lean::cnstr_set(x_78, 1, x_77);
-x_79 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_longest__choice___at_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens___spec__1), 6, 1);
-lean::closure_set(x_79, 0, x_78);
+lean::cnstr_set(x_78, 1, x_76);
+x_79 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
 x_80 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_80, 0, x_79);
-lean::cnstr_set(x_80, 1, x_6);
-x_81 = l_lean_parser_term_inst__implicit__binder__content;
+lean::cnstr_set(x_80, 1, x_78);
+x_81 = l_lean_parser_term_inst__implicit__named__binder;
 x_82 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_82, 0, x_81);
 lean::closure_set(x_82, 1, x_80);
-x_83 = lean::mk_string("]");
-x_84 = l_string_trim(x_83);
-lean::inc(x_84);
-x_86 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_86, 0, x_84);
-x_87 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_87, 0, x_84);
-lean::closure_set(x_87, 1, x_4);
-lean::closure_set(x_87, 2, x_86);
+x_83 = l_lean_parser_term_inst__implicit__anonymous__binder;
+x_84 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_84, 0, x_83);
+lean::closure_set(x_84, 1, x_76);
+x_85 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_85, 0, x_84);
+lean::cnstr_set(x_85, 1, x_7);
+x_86 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_86, 0, x_82);
+lean::cnstr_set(x_86, 1, x_85);
+x_87 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_longest__choice___at_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens___spec__1), 6, 1);
+lean::closure_set(x_87, 0, x_86);
 x_88 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_88, 0, x_87);
-lean::cnstr_set(x_88, 1, x_6);
-x_89 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_89, 0, x_82);
-lean::cnstr_set(x_89, 1, x_88);
-x_90 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_90, 0, x_61);
-lean::cnstr_set(x_90, 1, x_89);
-x_91 = l_lean_parser_term_inst__implicit__binder;
-x_92 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_92, 0, x_91);
-lean::closure_set(x_92, 1, x_90);
-x_93 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_anonymous__constructor_parser), 5, 0);
-x_94 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_94, 0, x_93);
-lean::cnstr_set(x_94, 1, x_6);
-x_95 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_95, 0, x_92);
-lean::cnstr_set(x_95, 1, x_94);
-x_96 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_96, 0, x_56);
-lean::cnstr_set(x_96, 1, x_95);
+lean::cnstr_set(x_88, 1, x_7);
+x_89 = l_lean_parser_term_inst__implicit__binder__content;
+x_90 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_90, 0, x_89);
+lean::closure_set(x_90, 1, x_88);
+x_91 = lean::mk_string("]");
+x_92 = l_string_trim(x_91);
+lean::dec(x_91);
+lean::inc(x_92);
+x_95 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_95, 0, x_92);
+x_96 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_96, 0, x_92);
+lean::closure_set(x_96, 1, x_5);
+lean::closure_set(x_96, 2, x_95);
 x_97 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_97, 0, x_41);
-lean::cnstr_set(x_97, 1, x_96);
+lean::cnstr_set(x_97, 0, x_96);
+lean::cnstr_set(x_97, 1, x_7);
 x_98 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_98, 0, x_25);
+lean::cnstr_set(x_98, 0, x_90);
 lean::cnstr_set(x_98, 1, x_97);
-x_99 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_99, 0, x_98);
-lean::closure_set(x_99, 1, x_4);
-x_100 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_100, 0, x_99);
-lean::cnstr_set(x_100, 1, x_6);
-x_101 = l_lean_parser_term__parser__m_monad;
-x_102 = l_lean_parser_term__parser__m_monad__except;
-x_103 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_104 = l_lean_parser_term__parser__m_alternative;
-x_105 = l_lean_parser_term_bracketed__binder;
-x_106 = l_lean_parser_term_bracketed__binder_has__view;
-x_107 = l_lean_parser_combinators_node_view___rarg(x_101, x_102, x_103, x_104, x_105, x_100, x_106);
-lean::dec(x_100);
-return x_107;
+x_99 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_99, 0, x_68);
+lean::cnstr_set(x_99, 1, x_98);
+x_100 = l_lean_parser_term_inst__implicit__binder;
+x_101 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_101, 0, x_100);
+lean::closure_set(x_101, 1, x_99);
+x_102 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_anonymous__constructor_parser), 5, 0);
+x_103 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_103, 0, x_102);
+lean::cnstr_set(x_103, 1, x_7);
+x_104 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_104, 0, x_101);
+lean::cnstr_set(x_104, 1, x_103);
+x_105 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_105, 0, x_62);
+lean::cnstr_set(x_105, 1, x_104);
+x_106 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_106, 0, x_45);
+lean::cnstr_set(x_106, 1, x_105);
+x_107 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_107, 0, x_27);
+lean::cnstr_set(x_107, 1, x_106);
+x_108 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_108, 0, x_107);
+lean::closure_set(x_108, 1, x_5);
+x_109 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_109, 0, x_108);
+lean::cnstr_set(x_109, 1, x_7);
+x_110 = l_lean_parser_term__parser__m_monad;
+x_111 = l_lean_parser_term__parser__m_monad__except;
+x_112 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_113 = l_lean_parser_term__parser__m_alternative;
+x_114 = l_lean_parser_term_bracketed__binder;
+x_115 = l_lean_parser_term_bracketed__binder_has__view;
+x_116 = l_lean_parser_combinators_node_view___rarg(x_110, x_111, x_112, x_113, x_114, x_109, x_115);
+lean::dec(x_109);
+return x_116;
 }
 }
 obj* _init_l_lean_parser_term_bracketed__binder_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_34; obj* x_35; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_65; obj* x_66; obj* x_67; obj* x_68; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_93; obj* x_94; obj* x_95; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_38; obj* x_39; obj* x_40; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_64; obj* x_67; obj* x_68; obj* x_69; obj* x_70; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_87; obj* x_88; obj* x_89; obj* x_90; obj* x_91; obj* x_92; obj* x_95; obj* x_96; obj* x_97; obj* x_98; obj* x_99; obj* x_100; obj* x_101; obj* x_102; obj* x_103; obj* x_104; obj* x_105; obj* x_106; obj* x_107; obj* x_108; obj* x_109; 
 x_0 = lean::mk_string("(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binder__content_parser), 5, 0);
-lean::inc(x_7);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_6);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_10);
-lean::cnstr_set(x_11, 1, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_12, 0, x_11);
-lean::closure_set(x_12, 1, x_4);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_12);
-lean::cnstr_set(x_13, 1, x_6);
-x_14 = l_lean_parser_term_explicit__binder__content;
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_15, 0, x_14);
-lean::closure_set(x_15, 1, x_13);
-x_16 = lean::mk_string(")");
-x_17 = l_string_trim(x_16);
-lean::inc(x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_19, 0, x_17);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_20, 0, x_17);
-lean::closure_set(x_20, 1, x_4);
-lean::closure_set(x_20, 2, x_19);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_6);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_15);
-lean::cnstr_set(x_22, 1, x_21);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binder__content_parser), 5, 0);
+lean::inc(x_8);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_8);
+lean::cnstr_set(x_10, 1, x_7);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_command_notation__like_parser), 5, 0);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_11);
+lean::cnstr_set(x_12, 1, x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_13, 0, x_12);
+lean::closure_set(x_13, 1, x_5);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_13);
+lean::cnstr_set(x_14, 1, x_7);
+x_15 = l_lean_parser_term_explicit__binder__content;
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_16, 0, x_15);
+lean::closure_set(x_16, 1, x_14);
+x_17 = lean::mk_string(")");
+x_18 = l_string_trim(x_17);
+lean::dec(x_17);
+lean::inc(x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_21, 0, x_18);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_22, 0, x_18);
+lean::closure_set(x_22, 1, x_5);
+lean::closure_set(x_22, 2, x_21);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_5);
-lean::cnstr_set(x_23, 1, x_22);
-x_24 = l_lean_parser_term_explicit__binder;
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_25, 0, x_24);
-lean::closure_set(x_25, 1, x_23);
-x_26 = lean::mk_string("{");
-x_27 = l_string_trim(x_26);
-lean::inc(x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_29, 0, x_27);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_30, 0, x_27);
-lean::closure_set(x_30, 1, x_4);
-lean::closure_set(x_30, 2, x_29);
-x_31 = lean::mk_string("}");
-x_32 = l_string_trim(x_31);
-lean::inc(x_32);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_34, 0, x_32);
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_35, 0, x_32);
-lean::closure_set(x_35, 1, x_4);
-lean::closure_set(x_35, 2, x_34);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_35);
-lean::cnstr_set(x_36, 1, x_6);
-lean::inc(x_7);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_7);
-lean::cnstr_set(x_38, 1, x_36);
-x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_30);
-lean::cnstr_set(x_39, 1, x_38);
-x_40 = l_lean_parser_term_implicit__binder;
-x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_41, 0, x_40);
-lean::closure_set(x_41, 1, x_39);
-x_42 = lean::mk_string("\xe2\xa6\x83");
-x_43 = l_string_trim(x_42);
-lean::inc(x_43);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_45, 0, x_43);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_46, 0, x_43);
-lean::closure_set(x_46, 1, x_4);
-lean::closure_set(x_46, 2, x_45);
-x_47 = lean::mk_string("\xe2\xa6\x84");
-x_48 = l_string_trim(x_47);
-lean::inc(x_48);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_7);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_16);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_6);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = l_lean_parser_term_explicit__binder;
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_27, 0, x_26);
+lean::closure_set(x_27, 1, x_25);
+x_28 = lean::mk_string("{");
+x_29 = l_string_trim(x_28);
+lean::dec(x_28);
+lean::inc(x_29);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_32, 0, x_29);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_33, 0, x_29);
+lean::closure_set(x_33, 1, x_5);
+lean::closure_set(x_33, 2, x_32);
+x_34 = lean::mk_string("}");
+x_35 = l_string_trim(x_34);
+lean::dec(x_34);
+lean::inc(x_35);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_38, 0, x_35);
+x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_39, 0, x_35);
+lean::closure_set(x_39, 1, x_5);
+lean::closure_set(x_39, 2, x_38);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_39);
+lean::cnstr_set(x_40, 1, x_7);
+lean::inc(x_8);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_8);
+lean::cnstr_set(x_42, 1, x_40);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_33);
+lean::cnstr_set(x_43, 1, x_42);
+x_44 = l_lean_parser_term_implicit__binder;
+x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_45, 0, x_44);
+lean::closure_set(x_45, 1, x_43);
+x_46 = lean::mk_string("\xe2\xa6\x83");
+x_47 = l_string_trim(x_46);
+lean::dec(x_46);
+lean::inc(x_47);
 x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_50, 0, x_48);
+lean::closure_set(x_50, 0, x_47);
 x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_51, 0, x_48);
-lean::closure_set(x_51, 1, x_4);
+lean::closure_set(x_51, 0, x_47);
+lean::closure_set(x_51, 1, x_5);
 lean::closure_set(x_51, 2, x_50);
-x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_51);
-lean::cnstr_set(x_52, 1, x_6);
-x_53 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_53, 0, x_7);
-lean::cnstr_set(x_53, 1, x_52);
-x_54 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_54, 0, x_46);
-lean::cnstr_set(x_54, 1, x_53);
-x_55 = l_lean_parser_term_strict__implicit__binder;
-x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_56, 0, x_55);
-lean::closure_set(x_56, 1, x_54);
-x_57 = lean::mk_string("[");
-x_58 = l_string_trim(x_57);
-lean::inc(x_58);
-x_60 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_60, 0, x_58);
-x_61 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_61, 0, x_58);
-lean::closure_set(x_61, 1, x_4);
-lean::closure_set(x_61, 2, x_60);
-x_62 = lean::mk_string(" : ");
-x_63 = l_string_trim(x_62);
-lean::inc(x_63);
-x_65 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_65, 0, x_63);
-x_66 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_66, 0, x_63);
-lean::closure_set(x_66, 1, x_4);
-lean::closure_set(x_66, 2, x_65);
-x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_67, 0, x_4);
-x_68 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_68, 0, x_67);
-lean::cnstr_set(x_68, 1, x_6);
-lean::inc(x_68);
-x_70 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_70, 0, x_66);
-lean::cnstr_set(x_70, 1, x_68);
-x_71 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-x_72 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_72, 0, x_71);
-lean::cnstr_set(x_72, 1, x_70);
-x_73 = l_lean_parser_term_inst__implicit__named__binder;
-x_74 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_74, 0, x_73);
-lean::closure_set(x_74, 1, x_72);
-x_75 = l_lean_parser_term_inst__implicit__anonymous__binder;
-x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_76, 0, x_75);
-lean::closure_set(x_76, 1, x_68);
-x_77 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_77, 0, x_76);
-lean::cnstr_set(x_77, 1, x_6);
+x_52 = lean::mk_string("\xe2\xa6\x84");
+x_53 = l_string_trim(x_52);
+lean::dec(x_52);
+lean::inc(x_53);
+x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_56, 0, x_53);
+x_57 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_57, 0, x_53);
+lean::closure_set(x_57, 1, x_5);
+lean::closure_set(x_57, 2, x_56);
+x_58 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_58, 0, x_57);
+lean::cnstr_set(x_58, 1, x_7);
+x_59 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_59, 0, x_8);
+lean::cnstr_set(x_59, 1, x_58);
+x_60 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_60, 0, x_51);
+lean::cnstr_set(x_60, 1, x_59);
+x_61 = l_lean_parser_term_strict__implicit__binder;
+x_62 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_62, 0, x_61);
+lean::closure_set(x_62, 1, x_60);
+x_63 = lean::mk_string("[");
+x_64 = l_string_trim(x_63);
+lean::dec(x_63);
+lean::inc(x_64);
+x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_67, 0, x_64);
+x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_68, 0, x_64);
+lean::closure_set(x_68, 1, x_5);
+lean::closure_set(x_68, 2, x_67);
+x_69 = lean::mk_string(" : ");
+x_70 = l_string_trim(x_69);
+lean::dec(x_69);
+lean::inc(x_70);
+x_73 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_73, 0, x_70);
+x_74 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_74, 0, x_70);
+lean::closure_set(x_74, 1, x_5);
+lean::closure_set(x_74, 2, x_73);
+x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_75, 0, x_5);
+x_76 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_76, 0, x_75);
+lean::cnstr_set(x_76, 1, x_7);
+lean::inc(x_76);
 x_78 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_78, 0, x_74);
-lean::cnstr_set(x_78, 1, x_77);
-x_79 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_longest__choice___at_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens___spec__1), 6, 1);
-lean::closure_set(x_79, 0, x_78);
+lean::cnstr_set(x_78, 1, x_76);
+x_79 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
 x_80 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_80, 0, x_79);
-lean::cnstr_set(x_80, 1, x_6);
-x_81 = l_lean_parser_term_inst__implicit__binder__content;
+lean::cnstr_set(x_80, 1, x_78);
+x_81 = l_lean_parser_term_inst__implicit__named__binder;
 x_82 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_82, 0, x_81);
 lean::closure_set(x_82, 1, x_80);
-x_83 = lean::mk_string("]");
-x_84 = l_string_trim(x_83);
-lean::inc(x_84);
-x_86 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_86, 0, x_84);
-x_87 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_87, 0, x_84);
-lean::closure_set(x_87, 1, x_4);
-lean::closure_set(x_87, 2, x_86);
+x_83 = l_lean_parser_term_inst__implicit__anonymous__binder;
+x_84 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_84, 0, x_83);
+lean::closure_set(x_84, 1, x_76);
+x_85 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_85, 0, x_84);
+lean::cnstr_set(x_85, 1, x_7);
+x_86 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_86, 0, x_82);
+lean::cnstr_set(x_86, 1, x_85);
+x_87 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_longest__choice___at_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens___spec__1), 6, 1);
+lean::closure_set(x_87, 0, x_86);
 x_88 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_88, 0, x_87);
-lean::cnstr_set(x_88, 1, x_6);
-x_89 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_89, 0, x_82);
-lean::cnstr_set(x_89, 1, x_88);
-x_90 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_90, 0, x_61);
-lean::cnstr_set(x_90, 1, x_89);
-x_91 = l_lean_parser_term_inst__implicit__binder;
-x_92 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_92, 0, x_91);
-lean::closure_set(x_92, 1, x_90);
-x_93 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_anonymous__constructor_parser), 5, 0);
-x_94 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_94, 0, x_93);
-lean::cnstr_set(x_94, 1, x_6);
-x_95 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_95, 0, x_92);
-lean::cnstr_set(x_95, 1, x_94);
-x_96 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_96, 0, x_56);
-lean::cnstr_set(x_96, 1, x_95);
+lean::cnstr_set(x_88, 1, x_7);
+x_89 = l_lean_parser_term_inst__implicit__binder__content;
+x_90 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_90, 0, x_89);
+lean::closure_set(x_90, 1, x_88);
+x_91 = lean::mk_string("]");
+x_92 = l_string_trim(x_91);
+lean::dec(x_91);
+lean::inc(x_92);
+x_95 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_95, 0, x_92);
+x_96 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_96, 0, x_92);
+lean::closure_set(x_96, 1, x_5);
+lean::closure_set(x_96, 2, x_95);
 x_97 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_97, 0, x_41);
-lean::cnstr_set(x_97, 1, x_96);
+lean::cnstr_set(x_97, 0, x_96);
+lean::cnstr_set(x_97, 1, x_7);
 x_98 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_98, 0, x_25);
+lean::cnstr_set(x_98, 0, x_90);
 lean::cnstr_set(x_98, 1, x_97);
-x_99 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_99, 0, x_98);
-lean::closure_set(x_99, 1, x_4);
-x_100 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_100, 0, x_99);
-lean::cnstr_set(x_100, 1, x_6);
-return x_100;
+x_99 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_99, 0, x_68);
+lean::cnstr_set(x_99, 1, x_98);
+x_100 = l_lean_parser_term_inst__implicit__binder;
+x_101 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_101, 0, x_100);
+lean::closure_set(x_101, 1, x_99);
+x_102 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_anonymous__constructor_parser), 5, 0);
+x_103 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_103, 0, x_102);
+lean::cnstr_set(x_103, 1, x_7);
+x_104 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_104, 0, x_101);
+lean::cnstr_set(x_104, 1, x_103);
+x_105 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_105, 0, x_62);
+lean::cnstr_set(x_105, 1, x_104);
+x_106 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_106, 0, x_45);
+lean::cnstr_set(x_106, 1, x_105);
+x_107 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_107, 0, x_27);
+lean::cnstr_set(x_107, 1, x_106);
+x_108 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_108, 0, x_107);
+lean::closure_set(x_108, 1, x_5);
+x_109 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_109, 0, x_108);
+lean::cnstr_set(x_109, 1, x_7);
+return x_109;
 }
 }
 obj* l_lean_parser_term_bracketed__binder_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -25220,215 +25319,218 @@ return x_0;
 obj* _init_l_lean_parser_term_binders__ext_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_17; obj* x_19; obj* x_21; obj* x_23; obj* x_25; obj* x_27; obj* x_30; obj* x_32; obj* x_34; obj* x_36; obj* x_38; obj* x_40; obj* x_43; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_20; obj* x_22; obj* x_24; obj* x_26; obj* x_28; obj* x_31; obj* x_33; obj* x_35; obj* x_37; obj* x_39; obj* x_41; obj* x_44; 
 x_0 = l_lean_parser_term_binder__ident_parser_lean_parser_has__tokens;
 x_1 = l_lean_parser_tokens___rarg(x_0);
 x_2 = lean::mk_string(":");
 x_3 = lean::mk_nat_obj(0u);
 x_4 = l_lean_parser_symbol_tokens___rarg(x_2, x_3);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_5);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_4, x_7);
-lean::dec(x_7);
-lean::dec(x_4);
-x_11 = l_lean_parser_tokens___rarg(x_8);
+lean::dec(x_2);
+x_6 = lean::box(0);
+x_7 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_6);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_4, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_0, x_5);
-x_14 = l_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens;
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_14, x_13);
-lean::dec(x_13);
-x_17 = l_lean_parser_tokens___rarg(x_15);
-lean::dec(x_15);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_17, x_5);
-lean::dec(x_17);
-x_21 = l_lean_parser_tokens___rarg(x_19);
-lean::dec(x_19);
-x_23 = l_lean_parser_tokens___rarg(x_21);
-lean::dec(x_21);
-x_25 = l_lean_parser_list_cons_tokens___rarg(x_23, x_5);
-lean::dec(x_23);
-x_27 = l_lean_parser_list_cons_tokens___rarg(x_11, x_25);
-lean::dec(x_25);
-lean::dec(x_11);
-x_30 = l_lean_parser_tokens___rarg(x_27);
-lean::dec(x_27);
-x_32 = l_lean_parser_list_cons_tokens___rarg(x_30, x_5);
-lean::dec(x_30);
-x_34 = l_lean_parser_tokens___rarg(x_32);
-lean::dec(x_32);
-x_36 = l_lean_parser_tokens___rarg(x_34);
-lean::dec(x_34);
-x_38 = l_lean_parser_list_cons_tokens___rarg(x_36, x_5);
-lean::dec(x_36);
-x_40 = l_lean_parser_list_cons_tokens___rarg(x_1, x_38);
-lean::dec(x_38);
+lean::dec(x_4);
+x_12 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_0, x_6);
+x_15 = l_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens;
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_15, x_14);
+lean::dec(x_14);
+x_18 = l_lean_parser_tokens___rarg(x_16);
+lean::dec(x_16);
+x_20 = l_lean_parser_list_cons_tokens___rarg(x_18, x_6);
+lean::dec(x_18);
+x_22 = l_lean_parser_tokens___rarg(x_20);
+lean::dec(x_20);
+x_24 = l_lean_parser_tokens___rarg(x_22);
+lean::dec(x_22);
+x_26 = l_lean_parser_list_cons_tokens___rarg(x_24, x_6);
+lean::dec(x_24);
+x_28 = l_lean_parser_list_cons_tokens___rarg(x_12, x_26);
+lean::dec(x_26);
+lean::dec(x_12);
+x_31 = l_lean_parser_tokens___rarg(x_28);
+lean::dec(x_28);
+x_33 = l_lean_parser_list_cons_tokens___rarg(x_31, x_6);
+lean::dec(x_31);
+x_35 = l_lean_parser_tokens___rarg(x_33);
+lean::dec(x_33);
+x_37 = l_lean_parser_tokens___rarg(x_35);
+lean::dec(x_35);
+x_39 = l_lean_parser_list_cons_tokens___rarg(x_37, x_6);
+lean::dec(x_37);
+x_41 = l_lean_parser_list_cons_tokens___rarg(x_1, x_39);
+lean::dec(x_39);
 lean::dec(x_1);
-x_43 = l_lean_parser_tokens___rarg(x_40);
-lean::dec(x_40);
-return x_43;
+x_44 = l_lean_parser_tokens___rarg(x_41);
+lean::dec(x_41);
+return x_44;
 }
 }
 obj* _init_l_lean_parser_term_binders__ext_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_2; obj* x_3; obj* x_4; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; 
+obj* x_0; obj* x_2; obj* x_3; obj* x_4; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; 
 x_0 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binder__ident_parser), 5, 0);
 lean::inc(x_0);
 x_2 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__1), 6, 1);
 lean::closure_set(x_2, 0, x_0);
 x_3 = lean::mk_string(":");
 x_4 = l_string_trim(x_3);
+lean::dec(x_3);
 lean::inc(x_4);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_nat_obj(0u);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_8, 0, x_4);
-lean::closure_set(x_8, 1, x_7);
-lean::closure_set(x_8, 2, x_6);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::box(0);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_9);
-lean::cnstr_set(x_11, 1, x_10);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_7, 0, x_4);
+x_8 = lean::mk_nat_obj(0u);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_9, 0, x_4);
+lean::closure_set(x_9, 1, x_8);
+lean::closure_set(x_9, 2, x_7);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_10, 0, x_8);
+x_11 = lean::box(0);
 x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_8);
+lean::cnstr_set(x_12, 0, x_10);
 lean::cnstr_set(x_12, 1, x_11);
-x_13 = l_lean_parser_term_binders__types;
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_14, 0, x_13);
-lean::closure_set(x_14, 1, x_12);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_0);
-lean::cnstr_set(x_15, 1, x_10);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binder_parser), 5, 0);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_16);
-lean::cnstr_set(x_17, 1, x_15);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_7);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_18);
-lean::cnstr_set(x_19, 1, x_10);
-x_20 = l_lean_parser_term_mixed__binder;
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_21, 0, x_20);
-lean::closure_set(x_21, 1, x_19);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__2), 6, 1);
+x_13 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_13, 0, x_9);
+lean::cnstr_set(x_13, 1, x_12);
+x_14 = l_lean_parser_term_binders__types;
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_15, 0, x_14);
+lean::closure_set(x_15, 1, x_13);
+x_16 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_16, 0, x_0);
+lean::cnstr_set(x_16, 1, x_11);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binder_parser), 5, 0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_16);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_19, 0, x_18);
+lean::closure_set(x_19, 1, x_8);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_19);
+lean::cnstr_set(x_20, 1, x_11);
+x_21 = l_lean_parser_term_mixed__binder;
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_22, 0, x_21);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_22);
-lean::cnstr_set(x_23, 1, x_10);
+lean::closure_set(x_22, 1, x_20);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__2), 6, 1);
+lean::closure_set(x_23, 0, x_22);
 x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_14);
-lean::cnstr_set(x_24, 1, x_23);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_25, 0, x_24);
-lean::closure_set(x_25, 1, x_7);
-x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_25);
-lean::cnstr_set(x_26, 1, x_10);
-x_27 = l_lean_parser_term_binders__remainder;
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_28, 0, x_27);
-lean::closure_set(x_28, 1, x_26);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::cnstr_set(x_24, 0, x_23);
+lean::cnstr_set(x_24, 1, x_11);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_15);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_26, 0, x_25);
+lean::closure_set(x_26, 1, x_8);
+x_27 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_27, 0, x_26);
+lean::cnstr_set(x_27, 1, x_11);
+x_28 = l_lean_parser_term_binders__remainder;
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_29, 0, x_28);
-x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_29);
-lean::cnstr_set(x_30, 1, x_10);
+lean::closure_set(x_29, 1, x_27);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_30, 0, x_29);
 x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_2);
-lean::cnstr_set(x_31, 1, x_30);
-x_32 = l_lean_parser_term__parser__m_monad;
-x_33 = l_lean_parser_term__parser__m_monad__except;
-x_34 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_35 = l_lean_parser_term__parser__m_alternative;
-x_36 = l_lean_parser_term_binders__ext;
-x_37 = l_lean_parser_term_binders__ext_has__view;
-x_38 = l_lean_parser_combinators_node_view___rarg(x_32, x_33, x_34, x_35, x_36, x_31, x_37);
-lean::dec(x_31);
-return x_38;
+lean::cnstr_set(x_31, 0, x_30);
+lean::cnstr_set(x_31, 1, x_11);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_2);
+lean::cnstr_set(x_32, 1, x_31);
+x_33 = l_lean_parser_term__parser__m_monad;
+x_34 = l_lean_parser_term__parser__m_monad__except;
+x_35 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_36 = l_lean_parser_term__parser__m_alternative;
+x_37 = l_lean_parser_term_binders__ext;
+x_38 = l_lean_parser_term_binders__ext_has__view;
+x_39 = l_lean_parser_combinators_node_view___rarg(x_33, x_34, x_35, x_36, x_37, x_32, x_38);
+lean::dec(x_32);
+return x_39;
 }
 }
 obj* _init_l_lean_parser_term_binders__ext_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_2; obj* x_3; obj* x_4; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; 
+obj* x_0; obj* x_2; obj* x_3; obj* x_4; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; 
 x_0 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binder__ident_parser), 5, 0);
 lean::inc(x_0);
 x_2 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__1), 6, 1);
 lean::closure_set(x_2, 0, x_0);
 x_3 = lean::mk_string(":");
 x_4 = l_string_trim(x_3);
+lean::dec(x_3);
 lean::inc(x_4);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_nat_obj(0u);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_8, 0, x_4);
-lean::closure_set(x_8, 1, x_7);
-lean::closure_set(x_8, 2, x_6);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::box(0);
-x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_9);
-lean::cnstr_set(x_11, 1, x_10);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_7, 0, x_4);
+x_8 = lean::mk_nat_obj(0u);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_9, 0, x_4);
+lean::closure_set(x_9, 1, x_8);
+lean::closure_set(x_9, 2, x_7);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_10, 0, x_8);
+x_11 = lean::box(0);
 x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_8);
+lean::cnstr_set(x_12, 0, x_10);
 lean::cnstr_set(x_12, 1, x_11);
-x_13 = l_lean_parser_term_binders__types;
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_14, 0, x_13);
-lean::closure_set(x_14, 1, x_12);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_0);
-lean::cnstr_set(x_15, 1, x_10);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binder_parser), 5, 0);
-x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_16);
-lean::cnstr_set(x_17, 1, x_15);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_7);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_18);
-lean::cnstr_set(x_19, 1, x_10);
-x_20 = l_lean_parser_term_mixed__binder;
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_21, 0, x_20);
-lean::closure_set(x_21, 1, x_19);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__2), 6, 1);
+x_13 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_13, 0, x_9);
+lean::cnstr_set(x_13, 1, x_12);
+x_14 = l_lean_parser_term_binders__types;
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_15, 0, x_14);
+lean::closure_set(x_15, 1, x_13);
+x_16 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_16, 0, x_0);
+lean::cnstr_set(x_16, 1, x_11);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binder_parser), 5, 0);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_16);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_19, 0, x_18);
+lean::closure_set(x_19, 1, x_8);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_19);
+lean::cnstr_set(x_20, 1, x_11);
+x_21 = l_lean_parser_term_mixed__binder;
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_22, 0, x_21);
-x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_22);
-lean::cnstr_set(x_23, 1, x_10);
+lean::closure_set(x_22, 1, x_20);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many1___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__2), 6, 1);
+lean::closure_set(x_23, 0, x_22);
 x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_14);
-lean::cnstr_set(x_24, 1, x_23);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_25, 0, x_24);
-lean::closure_set(x_25, 1, x_7);
-x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_25);
-lean::cnstr_set(x_26, 1, x_10);
-x_27 = l_lean_parser_term_binders__remainder;
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_28, 0, x_27);
-lean::closure_set(x_28, 1, x_26);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::cnstr_set(x_24, 0, x_23);
+lean::cnstr_set(x_24, 1, x_11);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_15);
+lean::cnstr_set(x_25, 1, x_24);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_26, 0, x_25);
+lean::closure_set(x_26, 1, x_8);
+x_27 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_27, 0, x_26);
+lean::cnstr_set(x_27, 1, x_11);
+x_28 = l_lean_parser_term_binders__remainder;
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_29, 0, x_28);
-x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_29);
-lean::cnstr_set(x_30, 1, x_10);
+lean::closure_set(x_29, 1, x_27);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_30, 0, x_29);
 x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_2);
-lean::cnstr_set(x_31, 1, x_30);
-return x_31;
+lean::cnstr_set(x_31, 0, x_30);
+lean::cnstr_set(x_31, 1, x_11);
+x_32 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_32, 0, x_2);
+lean::cnstr_set(x_32, 1, x_31);
+return x_32;
 }
 }
 obj* l_lean_parser_term_binders__ext_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -26966,29 +27068,32 @@ return x_20;
 obj* _init_l_lean_parser_term_lambda_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_16; obj* x_19; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_16; obj* x_17; obj* x_19; obj* x_22; 
 x_0 = lean::mk_string("\xce\xbb");
 x_1 = lean::mk_string("fun");
 x_2 = l_lean_parser_max__prec;
 x_3 = l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg(x_0, x_1, x_2);
-x_4 = lean::mk_string(",");
-x_5 = lean::mk_nat_obj(0u);
-x_6 = l_lean_parser_symbol_tokens___rarg(x_4, x_5);
-x_7 = lean::box(0);
-x_8 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_8, x_7);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_6, x_9);
-lean::dec(x_9);
+lean::dec(x_1);
+lean::dec(x_0);
+x_6 = lean::mk_string(",");
+x_7 = lean::mk_nat_obj(0u);
+x_8 = l_lean_parser_symbol_tokens___rarg(x_6, x_7);
 lean::dec(x_6);
-x_13 = l_lean_parser_term_binders_parser_lean_parser_has__tokens;
-x_14 = l_lean_parser_list_cons_tokens___rarg(x_13, x_10);
-lean::dec(x_10);
-x_16 = l_lean_parser_list_cons_tokens___rarg(x_3, x_14);
-lean::dec(x_14);
+x_10 = lean::box(0);
+x_11 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_11, x_10);
+x_13 = l_lean_parser_list_cons_tokens___rarg(x_8, x_12);
+lean::dec(x_12);
+lean::dec(x_8);
+x_16 = l_lean_parser_term_binders_parser_lean_parser_has__tokens;
+x_17 = l_lean_parser_list_cons_tokens___rarg(x_16, x_13);
+lean::dec(x_13);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_3, x_17);
+lean::dec(x_17);
 lean::dec(x_3);
-x_19 = l_lean_parser_tokens___rarg(x_16);
-lean::dec(x_16);
-return x_19;
+x_22 = l_lean_parser_tokens___rarg(x_19);
+lean::dec(x_19);
+return x_22;
 }
 }
 obj* l_lean_parser_unicode__symbol___at_lean_parser_term_lambda_parser_lean_parser_has__tokens___spec__1___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6, obj* x_7) {
@@ -26996,6 +27101,8 @@ _start:
 {
 obj* x_8; 
 x_8 = l_lean_parser_unicode__symbol___at_lean_parser_term_lambda_parser_lean_parser_has__tokens___spec__1(x_0, x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+lean::dec(x_0);
+lean::dec(x_1);
 lean::dec(x_3);
 lean::dec(x_5);
 return x_8;
@@ -27004,7 +27111,7 @@ return x_8;
 obj* _init_l_lean_parser_term_lambda_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
 x_0 = lean::mk_string("\xce\xbb");
 x_1 = lean::mk_string("fun");
 x_2 = l_lean_parser_max__prec;
@@ -27014,45 +27121,46 @@ lean::closure_set(x_3, 1, x_1);
 lean::closure_set(x_3, 2, x_2);
 x_4 = lean::mk_string(",");
 x_5 = l_string_trim(x_4);
+lean::dec(x_4);
 lean::inc(x_5);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_7, 0, x_5);
-x_8 = lean::mk_nat_obj(0u);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_9, 0, x_5);
-lean::closure_set(x_9, 1, x_8);
-lean::closure_set(x_9, 2, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_8, 0, x_5);
+x_9 = lean::mk_nat_obj(0u);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_10, 0, x_5);
+lean::closure_set(x_10, 1, x_9);
+lean::closure_set(x_10, 2, x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_11, 0, x_9);
+x_12 = lean::box(0);
 x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_9);
+lean::cnstr_set(x_13, 0, x_11);
 lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_14);
-lean::cnstr_set(x_15, 1, x_13);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_10);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_3);
-lean::cnstr_set(x_16, 1, x_15);
-x_17 = l_lean_parser_term__parser__m_monad;
-x_18 = l_lean_parser_term__parser__m_monad__except;
-x_19 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_20 = l_lean_parser_term__parser__m_alternative;
-x_21 = l_lean_parser_term_lambda;
-x_22 = l_lean_parser_term_lambda_has__view;
-x_23 = l_lean_parser_combinators_node_view___rarg(x_17, x_18, x_19, x_20, x_21, x_16, x_22);
-lean::dec(x_16);
-return x_23;
+lean::cnstr_set(x_16, 0, x_15);
+lean::cnstr_set(x_16, 1, x_14);
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_3);
+lean::cnstr_set(x_17, 1, x_16);
+x_18 = l_lean_parser_term__parser__m_monad;
+x_19 = l_lean_parser_term__parser__m_monad__except;
+x_20 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_21 = l_lean_parser_term__parser__m_alternative;
+x_22 = l_lean_parser_term_lambda;
+x_23 = l_lean_parser_term_lambda_has__view;
+x_24 = l_lean_parser_combinators_node_view___rarg(x_18, x_19, x_20, x_21, x_22, x_17, x_23);
+lean::dec(x_17);
+return x_24;
 }
 }
 obj* _init_l_lean_parser_term_lambda_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
 x_0 = lean::mk_string("\xce\xbb");
 x_1 = lean::mk_string("fun");
 x_2 = l_lean_parser_max__prec;
@@ -27062,31 +27170,32 @@ lean::closure_set(x_3, 1, x_1);
 lean::closure_set(x_3, 2, x_2);
 x_4 = lean::mk_string(",");
 x_5 = l_string_trim(x_4);
+lean::dec(x_4);
 lean::inc(x_5);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_7, 0, x_5);
-x_8 = lean::mk_nat_obj(0u);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_9, 0, x_5);
-lean::closure_set(x_9, 1, x_8);
-lean::closure_set(x_9, 2, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_8, 0, x_5);
+x_9 = lean::mk_nat_obj(0u);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_10, 0, x_5);
+lean::closure_set(x_10, 1, x_9);
+lean::closure_set(x_10, 2, x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_11, 0, x_9);
+x_12 = lean::box(0);
 x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_9);
+lean::cnstr_set(x_13, 0, x_11);
 lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_14);
-lean::cnstr_set(x_15, 1, x_13);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_10);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_3);
-lean::cnstr_set(x_16, 1, x_15);
-return x_16;
+lean::cnstr_set(x_16, 0, x_15);
+lean::cnstr_set(x_16, 1, x_14);
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_3);
+lean::cnstr_set(x_17, 1, x_16);
+return x_17;
 }
 }
 obj* l_lean_parser_term_lambda_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -28337,205 +28446,214 @@ return x_0;
 obj* _init_l_lean_parser_term_assume_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_20; obj* x_22; obj* x_24; obj* x_25; obj* x_26; obj* x_29; obj* x_32; obj* x_35; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_20; obj* x_22; obj* x_24; obj* x_26; obj* x_27; obj* x_29; obj* x_32; obj* x_35; obj* x_38; 
 x_0 = lean::mk_string("assume ");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(": ");
-x_4 = lean::mk_nat_obj(0u);
-x_5 = l_lean_parser_symbol_tokens___rarg(x_3, x_4);
-x_6 = lean::box(0);
-x_7 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_6);
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_5, x_8);
-lean::dec(x_5);
-x_11 = l_lean_parser_tokens___rarg(x_9);
-lean::dec(x_9);
-x_13 = l_lean_parser_term_binders_parser_lean_parser_has__tokens;
-x_14 = l_lean_parser_list_cons_tokens___rarg(x_13, x_6);
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_11, x_14);
-lean::dec(x_14);
+lean::dec(x_0);
+x_4 = lean::mk_string(": ");
+x_5 = lean::mk_nat_obj(0u);
+x_6 = l_lean_parser_symbol_tokens___rarg(x_4, x_5);
+lean::dec(x_4);
+x_8 = lean::box(0);
+x_9 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_9, x_8);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_6, x_10);
+lean::dec(x_6);
+x_13 = l_lean_parser_tokens___rarg(x_11);
 lean::dec(x_11);
-x_18 = l_lean_parser_tokens___rarg(x_15);
-lean::dec(x_15);
-x_20 = l_lean_parser_list_cons_tokens___rarg(x_18, x_6);
-lean::dec(x_18);
-x_22 = l_lean_parser_tokens___rarg(x_20);
+x_15 = l_lean_parser_term_binders_parser_lean_parser_has__tokens;
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_15, x_8);
+x_17 = l_lean_parser_list_cons_tokens___rarg(x_13, x_16);
+lean::dec(x_16);
+lean::dec(x_13);
+x_20 = l_lean_parser_tokens___rarg(x_17);
+lean::dec(x_17);
+x_22 = l_lean_parser_list_cons_tokens___rarg(x_20, x_8);
 lean::dec(x_20);
-x_24 = lean::mk_string(", ");
-x_25 = l_lean_parser_symbol_tokens___rarg(x_24, x_4);
-x_26 = l_lean_parser_list_cons_tokens___rarg(x_25, x_8);
-lean::dec(x_8);
-lean::dec(x_25);
-x_29 = l_lean_parser_list_cons_tokens___rarg(x_22, x_26);
-lean::dec(x_26);
+x_24 = l_lean_parser_tokens___rarg(x_22);
 lean::dec(x_22);
-x_32 = l_lean_parser_list_cons_tokens___rarg(x_2, x_29);
+x_26 = lean::mk_string(", ");
+x_27 = l_lean_parser_symbol_tokens___rarg(x_26, x_5);
+lean::dec(x_26);
+x_29 = l_lean_parser_list_cons_tokens___rarg(x_27, x_10);
+lean::dec(x_10);
+lean::dec(x_27);
+x_32 = l_lean_parser_list_cons_tokens___rarg(x_24, x_29);
 lean::dec(x_29);
-lean::dec(x_2);
-x_35 = l_lean_parser_tokens___rarg(x_32);
+lean::dec(x_24);
+x_35 = l_lean_parser_list_cons_tokens___rarg(x_2, x_32);
 lean::dec(x_32);
-return x_35;
+lean::dec(x_2);
+x_38 = l_lean_parser_tokens___rarg(x_35);
+lean::dec(x_35);
+return x_38;
 }
 }
 obj* _init_l_lean_parser_term_assume_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; 
 x_0 = lean::mk_string("assume ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(": ");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::mk_nat_obj(0u);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_7);
-lean::closure_set(x_11, 1, x_10);
-lean::closure_set(x_11, 2, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_12, 0, x_10);
-x_13 = lean::box(0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_12);
-lean::cnstr_set(x_14, 1, x_13);
-lean::inc(x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(": ");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::mk_nat_obj(0u);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_8);
+lean::closure_set(x_13, 1, x_12);
+lean::closure_set(x_13, 2, x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_14, 0, x_12);
+x_15 = lean::box(0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_11);
-lean::cnstr_set(x_16, 1, x_14);
-x_17 = l_lean_parser_term_assume__anonymous;
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_19);
-lean::cnstr_set(x_20, 1, x_13);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_18);
-lean::cnstr_set(x_21, 1, x_20);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_22, 0, x_21);
-lean::closure_set(x_22, 1, x_10);
+lean::cnstr_set(x_16, 0, x_14);
+lean::cnstr_set(x_16, 1, x_15);
+lean::inc(x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_13);
+lean::cnstr_set(x_18, 1, x_16);
+x_19 = l_lean_parser_term_assume__anonymous;
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_20, 0, x_19);
+lean::closure_set(x_20, 1, x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_21);
+lean::cnstr_set(x_22, 1, x_15);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_22);
-lean::cnstr_set(x_23, 1, x_13);
-x_24 = l_lean_parser_term_assume__binders;
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_25, 0, x_24);
-lean::closure_set(x_25, 1, x_23);
-x_26 = lean::mk_string(", ");
-x_27 = l_string_trim(x_26);
-lean::inc(x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_29, 0, x_27);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_30, 0, x_27);
-lean::closure_set(x_30, 1, x_10);
-lean::closure_set(x_30, 2, x_29);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_30);
-lean::cnstr_set(x_31, 1, x_14);
-x_32 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_32, 0, x_25);
-lean::cnstr_set(x_32, 1, x_31);
-x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_5);
-lean::cnstr_set(x_33, 1, x_32);
-x_34 = l_lean_parser_term__parser__m_monad;
-x_35 = l_lean_parser_term__parser__m_monad__except;
-x_36 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_37 = l_lean_parser_term__parser__m_alternative;
-x_38 = l_lean_parser_term_assume;
-x_39 = l_lean_parser_term_assume_has__view;
-x_40 = l_lean_parser_combinators_node_view___rarg(x_34, x_35, x_36, x_37, x_38, x_33, x_39);
-lean::dec(x_33);
-return x_40;
+lean::cnstr_set(x_23, 0, x_20);
+lean::cnstr_set(x_23, 1, x_22);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_24, 0, x_23);
+lean::closure_set(x_24, 1, x_12);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_24);
+lean::cnstr_set(x_25, 1, x_15);
+x_26 = l_lean_parser_term_assume__binders;
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_27, 0, x_26);
+lean::closure_set(x_27, 1, x_25);
+x_28 = lean::mk_string(", ");
+x_29 = l_string_trim(x_28);
+lean::dec(x_28);
+lean::inc(x_29);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_32, 0, x_29);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_33, 0, x_29);
+lean::closure_set(x_33, 1, x_12);
+lean::closure_set(x_33, 2, x_32);
+x_34 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_34, 0, x_33);
+lean::cnstr_set(x_34, 1, x_16);
+x_35 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_35, 0, x_27);
+lean::cnstr_set(x_35, 1, x_34);
+x_36 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_36, 0, x_6);
+lean::cnstr_set(x_36, 1, x_35);
+x_37 = l_lean_parser_term__parser__m_monad;
+x_38 = l_lean_parser_term__parser__m_monad__except;
+x_39 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_40 = l_lean_parser_term__parser__m_alternative;
+x_41 = l_lean_parser_term_assume;
+x_42 = l_lean_parser_term_assume_has__view;
+x_43 = l_lean_parser_combinators_node_view___rarg(x_37, x_38, x_39, x_40, x_41, x_36, x_42);
+lean::dec(x_36);
+return x_43;
 }
 }
 obj* _init_l_lean_parser_term_assume_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; 
 x_0 = lean::mk_string("assume ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(": ");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::mk_nat_obj(0u);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_7);
-lean::closure_set(x_11, 1, x_10);
-lean::closure_set(x_11, 2, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_12, 0, x_10);
-x_13 = lean::box(0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_12);
-lean::cnstr_set(x_14, 1, x_13);
-lean::inc(x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(": ");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::mk_nat_obj(0u);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_8);
+lean::closure_set(x_13, 1, x_12);
+lean::closure_set(x_13, 2, x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_14, 0, x_12);
+x_15 = lean::box(0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_11);
-lean::cnstr_set(x_16, 1, x_14);
-x_17 = l_lean_parser_term_assume__anonymous;
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_19);
-lean::cnstr_set(x_20, 1, x_13);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_18);
-lean::cnstr_set(x_21, 1, x_20);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_22, 0, x_21);
-lean::closure_set(x_22, 1, x_10);
+lean::cnstr_set(x_16, 0, x_14);
+lean::cnstr_set(x_16, 1, x_15);
+lean::inc(x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_13);
+lean::cnstr_set(x_18, 1, x_16);
+x_19 = l_lean_parser_term_assume__anonymous;
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_20, 0, x_19);
+lean::closure_set(x_20, 1, x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_21);
+lean::cnstr_set(x_22, 1, x_15);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_22);
-lean::cnstr_set(x_23, 1, x_13);
-x_24 = l_lean_parser_term_assume__binders;
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_25, 0, x_24);
-lean::closure_set(x_25, 1, x_23);
-x_26 = lean::mk_string(", ");
-x_27 = l_string_trim(x_26);
-lean::inc(x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_29, 0, x_27);
-x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_30, 0, x_27);
-lean::closure_set(x_30, 1, x_10);
-lean::closure_set(x_30, 2, x_29);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_30);
-lean::cnstr_set(x_31, 1, x_14);
-x_32 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_32, 0, x_25);
-lean::cnstr_set(x_32, 1, x_31);
-x_33 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_33, 0, x_5);
-lean::cnstr_set(x_33, 1, x_32);
-return x_33;
+lean::cnstr_set(x_23, 0, x_20);
+lean::cnstr_set(x_23, 1, x_22);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_24, 0, x_23);
+lean::closure_set(x_24, 1, x_12);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_24);
+lean::cnstr_set(x_25, 1, x_15);
+x_26 = l_lean_parser_term_assume__binders;
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_27, 0, x_26);
+lean::closure_set(x_27, 1, x_25);
+x_28 = lean::mk_string(", ");
+x_29 = l_string_trim(x_28);
+lean::dec(x_28);
+lean::inc(x_29);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_32, 0, x_29);
+x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_33, 0, x_29);
+lean::closure_set(x_33, 1, x_12);
+lean::closure_set(x_33, 2, x_32);
+x_34 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_34, 0, x_33);
+lean::cnstr_set(x_34, 1, x_16);
+x_35 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_35, 0, x_27);
+lean::cnstr_set(x_35, 1, x_34);
+x_36 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_36, 0, x_6);
+lean::cnstr_set(x_36, 1, x_35);
+return x_36;
 }
 }
 obj* l_lean_parser_term_assume_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -29059,45 +29177,50 @@ return x_0;
 obj* _init_l_lean_parser_term_pi_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_23; obj* x_24; obj* x_26; obj* x_29; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_14; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_28; obj* x_29; obj* x_31; obj* x_34; 
 x_0 = lean::mk_string("\xce\xa0");
 x_1 = lean::mk_string("Pi");
 x_2 = l_lean_parser_max__prec;
 x_3 = l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg(x_0, x_1, x_2);
-x_4 = lean::mk_string("\xe2\x88\x80");
-x_5 = lean::mk_string("forall");
-x_6 = l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg(x_4, x_5, x_2);
-x_7 = lean::box(0);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_6, x_7);
+lean::dec(x_1);
+lean::dec(x_0);
+x_6 = lean::mk_string("\xe2\x88\x80");
+x_7 = lean::mk_string("forall");
+x_8 = l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg(x_6, x_7, x_2);
+lean::dec(x_7);
 lean::dec(x_6);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_3, x_8);
+x_11 = lean::box(0);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_8, x_11);
 lean::dec(x_8);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_3, x_12);
+lean::dec(x_12);
 lean::dec(x_3);
-x_13 = l_lean_parser_tokens___rarg(x_10);
-lean::dec(x_10);
-x_15 = lean::mk_string(",");
-x_16 = lean::mk_nat_obj(0u);
-x_17 = l_lean_parser_symbol_tokens___rarg(x_15, x_16);
-x_18 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_18, x_7);
-x_20 = l_lean_parser_list_cons_tokens___rarg(x_17, x_19);
+x_17 = l_lean_parser_tokens___rarg(x_14);
+lean::dec(x_14);
+x_19 = lean::mk_string(",");
+x_20 = lean::mk_nat_obj(0u);
+x_21 = l_lean_parser_symbol_tokens___rarg(x_19, x_20);
 lean::dec(x_19);
-lean::dec(x_17);
-x_23 = l_lean_parser_term_binders_parser_lean_parser_has__tokens;
-x_24 = l_lean_parser_list_cons_tokens___rarg(x_23, x_20);
-lean::dec(x_20);
-x_26 = l_lean_parser_list_cons_tokens___rarg(x_13, x_24);
+x_23 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_24 = l_lean_parser_list_cons_tokens___rarg(x_23, x_11);
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_21, x_24);
 lean::dec(x_24);
-lean::dec(x_13);
-x_29 = l_lean_parser_tokens___rarg(x_26);
-lean::dec(x_26);
-return x_29;
+lean::dec(x_21);
+x_28 = l_lean_parser_term_binders_parser_lean_parser_has__tokens;
+x_29 = l_lean_parser_list_cons_tokens___rarg(x_28, x_25);
+lean::dec(x_25);
+x_31 = l_lean_parser_list_cons_tokens___rarg(x_17, x_29);
+lean::dec(x_29);
+lean::dec(x_17);
+x_34 = l_lean_parser_tokens___rarg(x_31);
+lean::dec(x_31);
+return x_34;
 }
 }
 obj* _init_l_lean_parser_term_pi_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; 
 x_0 = lean::mk_string("\xce\xa0");
 x_1 = lean::mk_string("Pi");
 x_2 = l_lean_parser_max__prec;
@@ -29122,44 +29245,45 @@ x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_any
 lean::closure_set(x_10, 0, x_9);
 x_11 = lean::mk_string(",");
 x_12 = l_string_trim(x_11);
+lean::dec(x_11);
 lean::inc(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_14, 0, x_12);
-x_15 = lean::mk_nat_obj(0u);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_12);
-lean::closure_set(x_16, 1, x_15);
-lean::closure_set(x_16, 2, x_14);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_17, 0, x_15);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_17);
-lean::cnstr_set(x_18, 1, x_7);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_15, 0, x_12);
+x_16 = lean::mk_nat_obj(0u);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_17, 0, x_12);
+lean::closure_set(x_17, 1, x_16);
+lean::closure_set(x_17, 2, x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_18, 0, x_16);
 x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_16);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_19);
+lean::cnstr_set(x_19, 0, x_18);
+lean::cnstr_set(x_19, 1, x_7);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_17);
+lean::cnstr_set(x_20, 1, x_19);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
 x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_10);
-lean::cnstr_set(x_22, 1, x_21);
-x_23 = l_lean_parser_term__parser__m_monad;
-x_24 = l_lean_parser_term__parser__m_monad__except;
-x_25 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_26 = l_lean_parser_term__parser__m_alternative;
-x_27 = l_lean_parser_term_pi;
-x_28 = l_lean_parser_term_pi_has__view;
-x_29 = l_lean_parser_combinators_node_view___rarg(x_23, x_24, x_25, x_26, x_27, x_22, x_28);
-lean::dec(x_22);
-return x_29;
+lean::cnstr_set(x_22, 0, x_21);
+lean::cnstr_set(x_22, 1, x_20);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_10);
+lean::cnstr_set(x_23, 1, x_22);
+x_24 = l_lean_parser_term__parser__m_monad;
+x_25 = l_lean_parser_term__parser__m_monad__except;
+x_26 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_27 = l_lean_parser_term__parser__m_alternative;
+x_28 = l_lean_parser_term_pi;
+x_29 = l_lean_parser_term_pi_has__view;
+x_30 = l_lean_parser_combinators_node_view___rarg(x_24, x_25, x_26, x_27, x_28, x_23, x_29);
+lean::dec(x_23);
+return x_30;
 }
 }
 obj* _init_l_lean_parser_term_pi_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
 x_0 = lean::mk_string("\xce\xa0");
 x_1 = lean::mk_string("Pi");
 x_2 = l_lean_parser_max__prec;
@@ -29184,30 +29308,31 @@ x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_any
 lean::closure_set(x_10, 0, x_9);
 x_11 = lean::mk_string(",");
 x_12 = l_string_trim(x_11);
+lean::dec(x_11);
 lean::inc(x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_14, 0, x_12);
-x_15 = lean::mk_nat_obj(0u);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_12);
-lean::closure_set(x_16, 1, x_15);
-lean::closure_set(x_16, 2, x_14);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_17, 0, x_15);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_17);
-lean::cnstr_set(x_18, 1, x_7);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_15, 0, x_12);
+x_16 = lean::mk_nat_obj(0u);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_17, 0, x_12);
+lean::closure_set(x_17, 1, x_16);
+lean::closure_set(x_17, 2, x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_18, 0, x_16);
 x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_16);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_20);
-lean::cnstr_set(x_21, 1, x_19);
+lean::cnstr_set(x_19, 0, x_18);
+lean::cnstr_set(x_19, 1, x_7);
+x_20 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_20, 0, x_17);
+lean::cnstr_set(x_20, 1, x_19);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_binders_parser), 5, 0);
 x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_10);
-lean::cnstr_set(x_22, 1, x_21);
-return x_22;
+lean::cnstr_set(x_22, 0, x_21);
+lean::cnstr_set(x_22, 1, x_20);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_10);
+lean::cnstr_set(x_23, 1, x_22);
+return x_23;
 }
 }
 obj* l_lean_parser_term_pi_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -29945,142 +30070,148 @@ return x_0;
 obj* _init_l_lean_parser_term_explicit_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_11; obj* x_13; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_22; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_13; obj* x_15; obj* x_17; obj* x_19; obj* x_20; obj* x_21; obj* x_24; 
 x_0 = lean::mk_string("@");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string("@@");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_4, x_5);
+lean::dec(x_0);
+x_4 = lean::mk_string("@@");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
-lean::dec(x_6);
-lean::dec(x_2);
-x_11 = l_lean_parser_tokens___rarg(x_8);
+x_7 = lean::box(0);
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_5, x_7);
+lean::dec(x_5);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_2, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_11, x_5);
-lean::dec(x_11);
-x_15 = l_lean_parser_tokens___rarg(x_13);
+lean::dec(x_2);
+x_13 = l_lean_parser_tokens___rarg(x_10);
+lean::dec(x_10);
+x_15 = l_lean_parser_list_cons_tokens___rarg(x_13, x_7);
 lean::dec(x_13);
-x_17 = l_lean_parser_ident__univs_parser_lean_parser_has__tokens;
-x_18 = l_lean_parser_list_cons_tokens___rarg(x_17, x_5);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_15, x_18);
-lean::dec(x_18);
+x_17 = l_lean_parser_tokens___rarg(x_15);
 lean::dec(x_15);
-x_22 = l_lean_parser_tokens___rarg(x_19);
-lean::dec(x_19);
-return x_22;
+x_19 = l_lean_parser_ident__univs_parser_lean_parser_has__tokens;
+x_20 = l_lean_parser_list_cons_tokens___rarg(x_19, x_7);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_17, x_20);
+lean::dec(x_20);
+lean::dec(x_17);
+x_24 = l_lean_parser_tokens___rarg(x_21);
+lean::dec(x_21);
+return x_24;
 }
 }
 obj* _init_l_lean_parser_term_explicit_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; 
 x_0 = lean::mk_string("@");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("@@");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::mk_nat_obj(0u);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_15, 0, x_13);
-lean::closure_set(x_15, 1, x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_15);
-lean::cnstr_set(x_16, 1, x_11);
-x_17 = l_lean_parser_term_explicit__modifier;
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident__univs_parser), 5, 0);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_19);
-lean::cnstr_set(x_20, 1, x_11);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_18);
-lean::cnstr_set(x_21, 1, x_20);
-x_22 = l_lean_parser_term__parser__m_monad;
-x_23 = l_lean_parser_term__parser__m_monad__except;
-x_24 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_25 = l_lean_parser_term__parser__m_alternative;
-x_26 = l_lean_parser_term_explicit;
-x_27 = l_lean_parser_term_explicit_has__view;
-x_28 = l_lean_parser_combinators_node_view___rarg(x_22, x_23, x_24, x_25, x_26, x_21, x_27);
-lean::dec(x_21);
-return x_28;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("@@");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::mk_nat_obj(0u);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_17, 0, x_15);
+lean::closure_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_13);
+x_19 = l_lean_parser_term_explicit__modifier;
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_20, 0, x_19);
+lean::closure_set(x_20, 1, x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident__univs_parser), 5, 0);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_21);
+lean::cnstr_set(x_22, 1, x_13);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_20);
+lean::cnstr_set(x_23, 1, x_22);
+x_24 = l_lean_parser_term__parser__m_monad;
+x_25 = l_lean_parser_term__parser__m_monad__except;
+x_26 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_27 = l_lean_parser_term__parser__m_alternative;
+x_28 = l_lean_parser_term_explicit;
+x_29 = l_lean_parser_term_explicit_has__view;
+x_30 = l_lean_parser_combinators_node_view___rarg(x_24, x_25, x_26, x_27, x_28, x_23, x_29);
+lean::dec(x_23);
+return x_30;
 }
 }
 obj* _init_l_lean_parser_term_explicit_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
 x_0 = lean::mk_string("@");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("@@");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_10, 0, x_7);
-lean::closure_set(x_10, 1, x_4);
-lean::closure_set(x_10, 2, x_9);
-x_11 = lean::box(0);
-x_12 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_12, 0, x_10);
-lean::cnstr_set(x_12, 1, x_11);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_5);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::mk_nat_obj(0u);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_15, 0, x_13);
-lean::closure_set(x_15, 1, x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_15);
-lean::cnstr_set(x_16, 1, x_11);
-x_17 = l_lean_parser_term_explicit__modifier;
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_16);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident__univs_parser), 5, 0);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_19);
-lean::cnstr_set(x_20, 1, x_11);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_18);
-lean::cnstr_set(x_21, 1, x_20);
-return x_21;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("@@");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_12, 0, x_8);
+lean::closure_set(x_12, 1, x_5);
+lean::closure_set(x_12, 2, x_11);
+x_13 = lean::box(0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_12);
+lean::cnstr_set(x_14, 1, x_13);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_6);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::mk_nat_obj(0u);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_17, 0, x_15);
+lean::closure_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_17);
+lean::cnstr_set(x_18, 1, x_13);
+x_19 = l_lean_parser_term_explicit__modifier;
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_20, 0, x_19);
+lean::closure_set(x_20, 1, x_18);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident__univs_parser), 5, 0);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_21);
+lean::cnstr_set(x_22, 1, x_13);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_20);
+lean::cnstr_set(x_23, 1, x_22);
+return x_23;
 }
 }
 obj* l_lean_parser_term_explicit_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -30347,79 +30478,82 @@ return x_0;
 obj* _init_l_lean_parser_term_from_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_10; 
 x_0 = lean::mk_string("from ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
-lean::dec(x_5);
-lean::dec(x_2);
-x_9 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
 lean::dec(x_6);
-return x_9;
+lean::dec(x_2);
+x_10 = l_lean_parser_tokens___rarg(x_7);
+lean::dec(x_7);
+return x_10;
 }
 }
 obj* _init_l_lean_parser_term_from_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
 x_0 = lean::mk_string("from ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::box(0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_6);
-lean::cnstr_set(x_8, 1, x_7);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::box(0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
+lean::cnstr_set(x_9, 0, x_7);
 lean::cnstr_set(x_9, 1, x_8);
-x_10 = l_lean_parser_term__parser__m_monad;
-x_11 = l_lean_parser_term__parser__m_monad__except;
-x_12 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_13 = l_lean_parser_term__parser__m_alternative;
-x_14 = l_lean_parser_term_from;
-x_15 = l_lean_parser_term_from_has__view;
-x_16 = l_lean_parser_combinators_node_view___rarg(x_10, x_11, x_12, x_13, x_14, x_9, x_15);
-lean::dec(x_9);
-return x_16;
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+x_11 = l_lean_parser_term__parser__m_monad;
+x_12 = l_lean_parser_term__parser__m_monad__except;
+x_13 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_14 = l_lean_parser_term__parser__m_alternative;
+x_15 = l_lean_parser_term_from;
+x_16 = l_lean_parser_term_from_has__view;
+x_17 = l_lean_parser_combinators_node_view___rarg(x_11, x_12, x_13, x_14, x_15, x_10, x_16);
+lean::dec(x_10);
+return x_17;
 }
 }
 obj* _init_l_lean_parser_term_from_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
 x_0 = lean::mk_string("from ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::box(0);
-x_8 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_8, 0, x_6);
-lean::cnstr_set(x_8, 1, x_7);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::box(0);
 x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_5);
+lean::cnstr_set(x_9, 0, x_7);
 lean::cnstr_set(x_9, 1, x_8);
-return x_9;
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_6);
+lean::cnstr_set(x_10, 1, x_9);
+return x_10;
 }
 }
 obj* l_lean_parser_term_from_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -32745,239 +32879,248 @@ return x_0;
 obj* _init_l_lean_parser_term_let_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_21; obj* x_23; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_32; obj* x_34; obj* x_37; obj* x_40; obj* x_43; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_20; obj* x_22; obj* x_24; obj* x_26; obj* x_27; obj* x_29; obj* x_30; obj* x_32; obj* x_35; obj* x_37; obj* x_40; obj* x_43; obj* x_46; 
 x_0 = lean::mk_string("let ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens;
-x_5 = l_lean_parser_tokens___rarg(x_4);
-x_6 = l_lean_parser_term_opt__type_parser_lean_parser_has__tokens;
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_3);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_5, x_7);
-lean::dec(x_7);
-lean::dec(x_5);
-x_11 = l_lean_parser_list_cons_tokens___rarg(x_3, x_8);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_term_bracketed__binder_parser_lean_parser_has__tokens;
+x_6 = l_lean_parser_tokens___rarg(x_5);
+x_7 = l_lean_parser_term_opt__type_parser_lean_parser_has__tokens;
+x_8 = l_lean_parser_list_cons_tokens___rarg(x_7, x_4);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_6, x_8);
 lean::dec(x_8);
-x_13 = l_lean_parser_tokens___rarg(x_11);
-lean::dec(x_11);
-x_15 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_16 = l_lean_parser_list_cons_tokens___rarg(x_15, x_3);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_13, x_16);
-lean::dec(x_13);
-x_19 = l_lean_parser_tokens___rarg(x_17);
-lean::dec(x_17);
-x_21 = l_lean_parser_list_cons_tokens___rarg(x_19, x_3);
-lean::dec(x_19);
-x_23 = l_lean_parser_tokens___rarg(x_21);
-lean::dec(x_21);
-x_25 = lean::mk_string(" := ");
-x_26 = l_lean_parser_symbol_tokens___rarg(x_25, x_1);
-x_27 = lean::mk_string(" in ");
-x_28 = l_lean_parser_symbol_tokens___rarg(x_27, x_1);
-x_29 = l_lean_parser_list_cons_tokens___rarg(x_28, x_16);
-lean::dec(x_16);
-lean::dec(x_28);
-x_32 = l_lean_parser_list_cons_tokens___rarg(x_15, x_29);
-lean::dec(x_29);
-x_34 = l_lean_parser_list_cons_tokens___rarg(x_26, x_32);
-lean::dec(x_32);
+lean::dec(x_6);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_4, x_9);
+lean::dec(x_9);
+x_14 = l_lean_parser_tokens___rarg(x_12);
+lean::dec(x_12);
+x_16 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_17 = l_lean_parser_list_cons_tokens___rarg(x_16, x_4);
+x_18 = l_lean_parser_list_cons_tokens___rarg(x_14, x_17);
+lean::dec(x_14);
+x_20 = l_lean_parser_tokens___rarg(x_18);
+lean::dec(x_18);
+x_22 = l_lean_parser_list_cons_tokens___rarg(x_20, x_4);
+lean::dec(x_20);
+x_24 = l_lean_parser_tokens___rarg(x_22);
+lean::dec(x_22);
+x_26 = lean::mk_string(" := ");
+x_27 = l_lean_parser_symbol_tokens___rarg(x_26, x_1);
 lean::dec(x_26);
-x_37 = l_lean_parser_list_cons_tokens___rarg(x_23, x_34);
-lean::dec(x_34);
-lean::dec(x_23);
-x_40 = l_lean_parser_list_cons_tokens___rarg(x_2, x_37);
+x_29 = lean::mk_string(" in ");
+x_30 = l_lean_parser_symbol_tokens___rarg(x_29, x_1);
+lean::dec(x_29);
+x_32 = l_lean_parser_list_cons_tokens___rarg(x_30, x_17);
+lean::dec(x_17);
+lean::dec(x_30);
+x_35 = l_lean_parser_list_cons_tokens___rarg(x_16, x_32);
+lean::dec(x_32);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_27, x_35);
+lean::dec(x_35);
+lean::dec(x_27);
+x_40 = l_lean_parser_list_cons_tokens___rarg(x_24, x_37);
 lean::dec(x_37);
-lean::dec(x_2);
-x_43 = l_lean_parser_tokens___rarg(x_40);
+lean::dec(x_24);
+x_43 = l_lean_parser_list_cons_tokens___rarg(x_2, x_40);
 lean::dec(x_40);
-return x_43;
+lean::dec(x_2);
+x_46 = l_lean_parser_tokens___rarg(x_43);
+lean::dec(x_43);
+return x_46;
 }
 }
 obj* _init_l_lean_parser_term_let_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; 
 x_0 = lean::mk_string("let ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binder_parser), 5, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__1), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
-x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_9);
-lean::cnstr_set(x_10, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binder_parser), 5, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__1), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
 x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_7);
-lean::cnstr_set(x_11, 1, x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_12);
-lean::cnstr_set(x_13, 1, x_11);
-x_14 = l_lean_parser_term_let__lhs__id;
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_15, 0, x_14);
-lean::closure_set(x_15, 1, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_16, 0, x_4);
-lean::inc(x_16);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_16);
-lean::cnstr_set(x_18, 1, x_8);
-lean::inc(x_18);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_15);
-lean::cnstr_set(x_20, 1, x_18);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_21, 0, x_20);
-lean::closure_set(x_21, 1, x_4);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_8);
-x_23 = l_lean_parser_term_let__lhs;
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_24, 0, x_23);
-lean::closure_set(x_24, 1, x_22);
-x_25 = lean::mk_string(" := ");
-x_26 = l_string_trim(x_25);
-lean::inc(x_26);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_28, 0, x_26);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_29, 0, x_26);
-lean::closure_set(x_29, 1, x_4);
-lean::closure_set(x_29, 2, x_28);
-x_30 = lean::mk_string(" in ");
-x_31 = l_string_trim(x_30);
-lean::inc(x_31);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_33, 0, x_31);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_34, 0, x_31);
-lean::closure_set(x_34, 1, x_4);
-lean::closure_set(x_34, 2, x_33);
-x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_34);
-lean::cnstr_set(x_35, 1, x_18);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_16);
-lean::cnstr_set(x_36, 1, x_35);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_29);
-lean::cnstr_set(x_37, 1, x_36);
+lean::cnstr_set(x_11, 0, x_10);
+lean::cnstr_set(x_11, 1, x_9);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_8);
+lean::cnstr_set(x_12, 1, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_13);
+lean::cnstr_set(x_14, 1, x_12);
+x_15 = l_lean_parser_term_let__lhs__id;
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_16, 0, x_15);
+lean::closure_set(x_16, 1, x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_17, 0, x_5);
+lean::inc(x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_17);
+lean::cnstr_set(x_19, 1, x_9);
+lean::inc(x_19);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_16);
+lean::cnstr_set(x_21, 1, x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_22, 0, x_21);
+lean::closure_set(x_22, 1, x_5);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_9);
+x_24 = l_lean_parser_term_let__lhs;
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_23);
+x_26 = lean::mk_string(" := ");
+x_27 = l_string_trim(x_26);
+lean::dec(x_26);
+lean::inc(x_27);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_30, 0, x_27);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_31, 0, x_27);
+lean::closure_set(x_31, 1, x_5);
+lean::closure_set(x_31, 2, x_30);
+x_32 = lean::mk_string(" in ");
+x_33 = l_string_trim(x_32);
+lean::dec(x_32);
+lean::inc(x_33);
+x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_36, 0, x_33);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_37, 0, x_33);
+lean::closure_set(x_37, 1, x_5);
+lean::closure_set(x_37, 2, x_36);
 x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_24);
-lean::cnstr_set(x_38, 1, x_37);
+lean::cnstr_set(x_38, 0, x_37);
+lean::cnstr_set(x_38, 1, x_19);
 x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_5);
+lean::cnstr_set(x_39, 0, x_17);
 lean::cnstr_set(x_39, 1, x_38);
-x_40 = l_lean_parser_term__parser__m_monad;
-x_41 = l_lean_parser_term__parser__m_monad__except;
-x_42 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_43 = l_lean_parser_term__parser__m_alternative;
-x_44 = l_lean_parser_term_let;
-x_45 = l_lean_parser_term_let_has__view;
-x_46 = l_lean_parser_combinators_node_view___rarg(x_40, x_41, x_42, x_43, x_44, x_39, x_45);
-lean::dec(x_39);
-return x_46;
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_31);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_25);
+lean::cnstr_set(x_41, 1, x_40);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_6);
+lean::cnstr_set(x_42, 1, x_41);
+x_43 = l_lean_parser_term__parser__m_monad;
+x_44 = l_lean_parser_term__parser__m_monad__except;
+x_45 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_46 = l_lean_parser_term__parser__m_alternative;
+x_47 = l_lean_parser_term_let;
+x_48 = l_lean_parser_term_let_has__view;
+x_49 = l_lean_parser_combinators_node_view___rarg(x_43, x_44, x_45, x_46, x_47, x_42, x_48);
+lean::dec(x_42);
+return x_49;
 }
 }
 obj* _init_l_lean_parser_term_let_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; 
 x_0 = lean::mk_string("let ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binder_parser), 5, 0);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__1), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
-x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_9);
-lean::cnstr_set(x_10, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_bracketed__binder_parser), 5, 0);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_many___at_lean_parser_command_notation__spec_parser_lean_parser_has__tokens___spec__1), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
+x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
 x_11 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_11, 0, x_7);
-lean::cnstr_set(x_11, 1, x_10);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_12);
-lean::cnstr_set(x_13, 1, x_11);
-x_14 = l_lean_parser_term_let__lhs__id;
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_15, 0, x_14);
-lean::closure_set(x_15, 1, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_16, 0, x_4);
-lean::inc(x_16);
-x_18 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_18, 0, x_16);
-lean::cnstr_set(x_18, 1, x_8);
-lean::inc(x_18);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_15);
-lean::cnstr_set(x_20, 1, x_18);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_21, 0, x_20);
-lean::closure_set(x_21, 1, x_4);
-x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_21);
-lean::cnstr_set(x_22, 1, x_8);
-x_23 = l_lean_parser_term_let__lhs;
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_24, 0, x_23);
-lean::closure_set(x_24, 1, x_22);
-x_25 = lean::mk_string(" := ");
-x_26 = l_string_trim(x_25);
-lean::inc(x_26);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_28, 0, x_26);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_29, 0, x_26);
-lean::closure_set(x_29, 1, x_4);
-lean::closure_set(x_29, 2, x_28);
-x_30 = lean::mk_string(" in ");
-x_31 = l_string_trim(x_30);
-lean::inc(x_31);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_33, 0, x_31);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_34, 0, x_31);
-lean::closure_set(x_34, 1, x_4);
-lean::closure_set(x_34, 2, x_33);
-x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_34);
-lean::cnstr_set(x_35, 1, x_18);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_16);
-lean::cnstr_set(x_36, 1, x_35);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_29);
-lean::cnstr_set(x_37, 1, x_36);
+lean::cnstr_set(x_11, 0, x_10);
+lean::cnstr_set(x_11, 1, x_9);
+x_12 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_12, 0, x_8);
+lean::cnstr_set(x_12, 1, x_11);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_14 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_14, 0, x_13);
+lean::cnstr_set(x_14, 1, x_12);
+x_15 = l_lean_parser_term_let__lhs__id;
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_16, 0, x_15);
+lean::closure_set(x_16, 1, x_14);
+x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_17, 0, x_5);
+lean::inc(x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_17);
+lean::cnstr_set(x_19, 1, x_9);
+lean::inc(x_19);
+x_21 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_21, 0, x_16);
+lean::cnstr_set(x_21, 1, x_19);
+x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_22, 0, x_21);
+lean::closure_set(x_22, 1, x_5);
+x_23 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_23, 0, x_22);
+lean::cnstr_set(x_23, 1, x_9);
+x_24 = l_lean_parser_term_let__lhs;
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_25, 0, x_24);
+lean::closure_set(x_25, 1, x_23);
+x_26 = lean::mk_string(" := ");
+x_27 = l_string_trim(x_26);
+lean::dec(x_26);
+lean::inc(x_27);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_30, 0, x_27);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_31, 0, x_27);
+lean::closure_set(x_31, 1, x_5);
+lean::closure_set(x_31, 2, x_30);
+x_32 = lean::mk_string(" in ");
+x_33 = l_string_trim(x_32);
+lean::dec(x_32);
+lean::inc(x_33);
+x_36 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_36, 0, x_33);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_37, 0, x_33);
+lean::closure_set(x_37, 1, x_5);
+lean::closure_set(x_37, 2, x_36);
 x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_24);
-lean::cnstr_set(x_38, 1, x_37);
+lean::cnstr_set(x_38, 0, x_37);
+lean::cnstr_set(x_38, 1, x_19);
 x_39 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_39, 0, x_5);
+lean::cnstr_set(x_39, 0, x_17);
 lean::cnstr_set(x_39, 1, x_38);
-return x_39;
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_31);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_25);
+lean::cnstr_set(x_41, 1, x_40);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_6);
+lean::cnstr_set(x_42, 1, x_41);
+return x_42;
 }
 }
 obj* l_lean_parser_term_let_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -33427,22 +33570,23 @@ return x_0;
 obj* _init_l_lean_parser_term_opt__ident_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_6; obj* x_8; obj* x_10; obj* x_12; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_5; obj* x_7; obj* x_9; obj* x_11; obj* x_13; 
 x_0 = lean::box(0);
 x_1 = lean::mk_string(" : ");
 x_2 = lean::mk_nat_obj(0u);
 x_3 = l_lean_parser_symbol_tokens___rarg(x_1, x_2);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_3, x_0);
+lean::dec(x_1);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_3, x_0);
 lean::dec(x_3);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_0, x_4);
-lean::dec(x_4);
-x_8 = l_lean_parser_tokens___rarg(x_6);
-lean::dec(x_6);
-x_10 = l_lean_parser_tokens___rarg(x_8);
-lean::dec(x_8);
-x_12 = l_lean_parser_tokens___rarg(x_10);
-lean::dec(x_10);
-return x_12;
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_0, x_5);
+lean::dec(x_5);
+x_9 = l_lean_parser_tokens___rarg(x_7);
+lean::dec(x_7);
+x_11 = l_lean_parser_tokens___rarg(x_9);
+lean::dec(x_9);
+x_13 = l_lean_parser_tokens___rarg(x_11);
+lean::dec(x_11);
+return x_13;
 }
 }
 obj* l_lean_parser_term_opt__ident_parser_lean_parser_has__view___lambda__1(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5) {
@@ -33475,72 +33619,74 @@ return x_14;
 obj* _init_l_lean_parser_term_opt__ident_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_22; obj* x_24; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_25; 
 x_0 = lean::mk_string(" : ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_8);
-lean::cnstr_set(x_9, 1, x_7);
-x_10 = l_lean_parser_term_opt__ident;
-lean::inc(x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_12, 0, x_10);
-lean::closure_set(x_12, 1, x_9);
-lean::inc(x_9);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser_lean_parser_has__view___lambda__1), 6, 1);
-lean::closure_set(x_14, 0, x_9);
-x_15 = l_lean_parser_term__parser__m_monad;
-x_16 = l_lean_parser_term__parser__m_monad__except;
-x_17 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_18 = l_lean_parser_term__parser__m_alternative;
-x_19 = l_lean_parser_term_opt__ident_has__view;
-x_20 = l_lean_parser_combinators_node_view___rarg(x_15, x_16, x_17, x_18, x_10, x_9, x_19);
-lean::dec(x_9);
-x_22 = l_lean_parser_combinators_try_view___rarg(x_17, x_18, x_12, x_20);
-lean::dec(x_12);
-x_24 = l_lean_parser_combinators_optional_view___rarg(x_15, x_16, x_17, x_18, x_14, x_22);
-lean::dec(x_14);
-return x_24;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_9);
+lean::cnstr_set(x_10, 1, x_8);
+x_11 = l_lean_parser_term_opt__ident;
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_13, 0, x_11);
+lean::closure_set(x_13, 1, x_10);
+lean::inc(x_10);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser_lean_parser_has__view___lambda__1), 6, 1);
+lean::closure_set(x_15, 0, x_10);
+x_16 = l_lean_parser_term__parser__m_monad;
+x_17 = l_lean_parser_term__parser__m_monad__except;
+x_18 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_19 = l_lean_parser_term__parser__m_alternative;
+x_20 = l_lean_parser_term_opt__ident_has__view;
+x_21 = l_lean_parser_combinators_node_view___rarg(x_16, x_17, x_18, x_19, x_11, x_10, x_20);
+lean::dec(x_10);
+x_23 = l_lean_parser_combinators_try_view___rarg(x_18, x_19, x_13, x_21);
+lean::dec(x_13);
+x_25 = l_lean_parser_combinators_optional_view___rarg(x_16, x_17, x_18, x_19, x_15, x_23);
+lean::dec(x_15);
+return x_25;
 }
 }
 obj* _init_l_lean_parser_term_opt__ident_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string(" : ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_8);
-lean::cnstr_set(x_9, 1, x_7);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser_lean_parser_has__view___lambda__1), 6, 1);
-lean::closure_set(x_10, 0, x_9);
-return x_10;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_10 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_10, 0, x_9);
+lean::cnstr_set(x_10, 1, x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser_lean_parser_has__view___lambda__1), 6, 1);
+lean::closure_set(x_11, 0, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_term_opt__ident_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -35578,251 +35724,260 @@ return x_0;
 obj* _init_l_lean_parser_term_have_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_20; obj* x_22; obj* x_25; obj* x_27; obj* x_29; obj* x_31; obj* x_34; obj* x_37; obj* x_39; obj* x_40; obj* x_42; obj* x_45; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_12; obj* x_14; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_21; obj* x_23; obj* x_25; obj* x_28; obj* x_30; obj* x_32; obj* x_34; obj* x_37; obj* x_40; obj* x_42; obj* x_43; obj* x_45; obj* x_48; 
 x_0 = lean::mk_string("have ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(" := ");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_5);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_4, x_7);
+lean::dec(x_0);
+x_4 = lean::mk_string(" := ");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_10 = l_lean_parser_tokens___rarg(x_8);
-lean::dec(x_8);
-x_12 = lean::mk_string(", ");
-x_13 = l_lean_parser_symbol_tokens___rarg(x_12, x_1);
-x_14 = l_lean_parser_term_from_parser_lean_parser_has__tokens;
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_14, x_5);
-x_16 = l_lean_parser_list_cons_tokens___rarg(x_13, x_15);
-lean::dec(x_15);
-x_18 = l_lean_parser_tokens___rarg(x_16);
-lean::dec(x_16);
-x_20 = l_lean_parser_list_cons_tokens___rarg(x_18, x_5);
-lean::dec(x_18);
-x_22 = l_lean_parser_list_cons_tokens___rarg(x_10, x_20);
-lean::dec(x_20);
+x_7 = lean::box(0);
+x_8 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_8, x_7);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_5, x_9);
+lean::dec(x_5);
+x_12 = l_lean_parser_tokens___rarg(x_10);
 lean::dec(x_10);
-x_25 = l_lean_parser_tokens___rarg(x_22);
-lean::dec(x_22);
-x_27 = l_lean_parser_list_cons_tokens___rarg(x_25, x_5);
+x_14 = lean::mk_string(", ");
+x_15 = l_lean_parser_symbol_tokens___rarg(x_14, x_1);
+lean::dec(x_14);
+x_17 = l_lean_parser_term_from_parser_lean_parser_has__tokens;
+x_18 = l_lean_parser_list_cons_tokens___rarg(x_17, x_7);
+x_19 = l_lean_parser_list_cons_tokens___rarg(x_15, x_18);
+lean::dec(x_18);
+x_21 = l_lean_parser_tokens___rarg(x_19);
+lean::dec(x_19);
+x_23 = l_lean_parser_list_cons_tokens___rarg(x_21, x_7);
+lean::dec(x_21);
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_12, x_23);
+lean::dec(x_23);
+lean::dec(x_12);
+x_28 = l_lean_parser_tokens___rarg(x_25);
 lean::dec(x_25);
-x_29 = l_lean_parser_tokens___rarg(x_27);
-lean::dec(x_27);
-x_31 = l_lean_parser_list_cons_tokens___rarg(x_13, x_7);
-lean::dec(x_7);
-lean::dec(x_13);
-x_34 = l_lean_parser_list_cons_tokens___rarg(x_29, x_31);
-lean::dec(x_31);
-lean::dec(x_29);
-x_37 = l_lean_parser_list_cons_tokens___rarg(x_6, x_34);
+x_30 = l_lean_parser_list_cons_tokens___rarg(x_28, x_7);
+lean::dec(x_28);
+x_32 = l_lean_parser_tokens___rarg(x_30);
+lean::dec(x_30);
+x_34 = l_lean_parser_list_cons_tokens___rarg(x_15, x_9);
+lean::dec(x_9);
+lean::dec(x_15);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_32, x_34);
 lean::dec(x_34);
-x_39 = l_lean_parser_term_opt__ident_parser_lean_parser_has__tokens;
-x_40 = l_lean_parser_list_cons_tokens___rarg(x_39, x_37);
+lean::dec(x_32);
+x_40 = l_lean_parser_list_cons_tokens___rarg(x_8, x_37);
 lean::dec(x_37);
-x_42 = l_lean_parser_list_cons_tokens___rarg(x_2, x_40);
+x_42 = l_lean_parser_term_opt__ident_parser_lean_parser_has__tokens;
+x_43 = l_lean_parser_list_cons_tokens___rarg(x_42, x_40);
 lean::dec(x_40);
+x_45 = l_lean_parser_list_cons_tokens___rarg(x_2, x_43);
+lean::dec(x_43);
 lean::dec(x_2);
-x_45 = l_lean_parser_tokens___rarg(x_42);
-lean::dec(x_42);
-return x_45;
+x_48 = l_lean_parser_tokens___rarg(x_45);
+lean::dec(x_45);
+return x_48;
 }
 }
 obj* _init_l_lean_parser_term_have_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; 
 x_0 = lean::mk_string("have ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_string(" := ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::box(0);
-lean::inc(x_6);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_6);
-lean::cnstr_set(x_14, 1, x_12);
-lean::inc(x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::mk_string(" := ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::box(0);
+lean::inc(x_7);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_11);
+lean::cnstr_set(x_16, 0, x_7);
 lean::cnstr_set(x_16, 1, x_14);
-x_17 = l_lean_parser_term_have__term;
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_16);
-x_19 = lean::mk_string(", ");
-x_20 = l_string_trim(x_19);
-lean::inc(x_20);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_22, 0, x_20);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_23, 0, x_20);
-lean::closure_set(x_23, 1, x_4);
-lean::closure_set(x_23, 2, x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_from_parser), 5, 0);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_12);
-lean::inc(x_23);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_23);
-lean::cnstr_set(x_27, 1, x_25);
-x_28 = l_lean_parser_term_have__from;
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_29, 0, x_28);
-lean::closure_set(x_29, 1, x_27);
+lean::inc(x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_13);
+lean::cnstr_set(x_18, 1, x_16);
+x_19 = l_lean_parser_term_have__term;
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_20, 0, x_19);
+lean::closure_set(x_20, 1, x_18);
+x_21 = lean::mk_string(", ");
+x_22 = l_string_trim(x_21);
+lean::dec(x_21);
+lean::inc(x_22);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_25, 0, x_22);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_26, 0, x_22);
+lean::closure_set(x_26, 1, x_5);
+lean::closure_set(x_26, 2, x_25);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_from_parser), 5, 0);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_14);
+lean::inc(x_26);
 x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_29);
-lean::cnstr_set(x_30, 1, x_12);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_18);
-lean::cnstr_set(x_31, 1, x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::cnstr_set(x_30, 0, x_26);
+lean::cnstr_set(x_30, 1, x_28);
+x_31 = l_lean_parser_term_have__from;
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_32, 0, x_31);
-lean::closure_set(x_32, 1, x_4);
+lean::closure_set(x_32, 1, x_30);
 x_33 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_33, 0, x_32);
-lean::cnstr_set(x_33, 1, x_12);
-x_34 = l_lean_parser_term_have__proof;
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::cnstr_set(x_33, 1, x_14);
+x_34 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_34, 0, x_20);
+lean::cnstr_set(x_34, 1, x_33);
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
 lean::closure_set(x_35, 0, x_34);
-lean::closure_set(x_35, 1, x_33);
+lean::closure_set(x_35, 1, x_5);
 x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_23);
+lean::cnstr_set(x_36, 0, x_35);
 lean::cnstr_set(x_36, 1, x_14);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_35);
-lean::cnstr_set(x_37, 1, x_36);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_6);
-lean::cnstr_set(x_38, 1, x_37);
-x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser), 5, 0);
+x_37 = l_lean_parser_term_have__proof;
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_38, 0, x_37);
+lean::closure_set(x_38, 1, x_36);
+x_39 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_39, 0, x_26);
+lean::cnstr_set(x_39, 1, x_16);
 x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_39);
-lean::cnstr_set(x_40, 1, x_38);
+lean::cnstr_set(x_40, 0, x_38);
+lean::cnstr_set(x_40, 1, x_39);
 x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_5);
+lean::cnstr_set(x_41, 0, x_7);
 lean::cnstr_set(x_41, 1, x_40);
-x_42 = l_lean_parser_term__parser__m_monad;
-x_43 = l_lean_parser_term__parser__m_monad__except;
-x_44 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_45 = l_lean_parser_term__parser__m_alternative;
-x_46 = l_lean_parser_term_have;
-x_47 = l_lean_parser_term_have_has__view;
-x_48 = l_lean_parser_combinators_node_view___rarg(x_42, x_43, x_44, x_45, x_46, x_41, x_47);
-lean::dec(x_41);
-return x_48;
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser), 5, 0);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_42);
+lean::cnstr_set(x_43, 1, x_41);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_6);
+lean::cnstr_set(x_44, 1, x_43);
+x_45 = l_lean_parser_term__parser__m_monad;
+x_46 = l_lean_parser_term__parser__m_monad__except;
+x_47 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_48 = l_lean_parser_term__parser__m_alternative;
+x_49 = l_lean_parser_term_have;
+x_50 = l_lean_parser_term_have_has__view;
+x_51 = l_lean_parser_combinators_node_view___rarg(x_45, x_46, x_47, x_48, x_49, x_44, x_50);
+lean::dec(x_44);
+return x_51;
 }
 }
 obj* _init_l_lean_parser_term_have_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; 
 x_0 = lean::mk_string("have ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_string(" := ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::box(0);
-lean::inc(x_6);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_6);
-lean::cnstr_set(x_14, 1, x_12);
-lean::inc(x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::mk_string(" := ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::box(0);
+lean::inc(x_7);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_11);
+lean::cnstr_set(x_16, 0, x_7);
 lean::cnstr_set(x_16, 1, x_14);
-x_17 = l_lean_parser_term_have__term;
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_18, 0, x_17);
-lean::closure_set(x_18, 1, x_16);
-x_19 = lean::mk_string(", ");
-x_20 = l_string_trim(x_19);
-lean::inc(x_20);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_22, 0, x_20);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_23, 0, x_20);
-lean::closure_set(x_23, 1, x_4);
-lean::closure_set(x_23, 2, x_22);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_from_parser), 5, 0);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_12);
-lean::inc(x_23);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_23);
-lean::cnstr_set(x_27, 1, x_25);
-x_28 = l_lean_parser_term_have__from;
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_29, 0, x_28);
-lean::closure_set(x_29, 1, x_27);
+lean::inc(x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_13);
+lean::cnstr_set(x_18, 1, x_16);
+x_19 = l_lean_parser_term_have__term;
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_20, 0, x_19);
+lean::closure_set(x_20, 1, x_18);
+x_21 = lean::mk_string(", ");
+x_22 = l_string_trim(x_21);
+lean::dec(x_21);
+lean::inc(x_22);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_25, 0, x_22);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_26, 0, x_22);
+lean::closure_set(x_26, 1, x_5);
+lean::closure_set(x_26, 2, x_25);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_from_parser), 5, 0);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_14);
+lean::inc(x_26);
 x_30 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_30, 0, x_29);
-lean::cnstr_set(x_30, 1, x_12);
-x_31 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_31, 0, x_18);
-lean::cnstr_set(x_31, 1, x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::cnstr_set(x_30, 0, x_26);
+lean::cnstr_set(x_30, 1, x_28);
+x_31 = l_lean_parser_term_have__from;
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
 lean::closure_set(x_32, 0, x_31);
-lean::closure_set(x_32, 1, x_4);
+lean::closure_set(x_32, 1, x_30);
 x_33 = lean::alloc_cnstr(1, 2, 0);
 lean::cnstr_set(x_33, 0, x_32);
-lean::cnstr_set(x_33, 1, x_12);
-x_34 = l_lean_parser_term_have__proof;
-x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::cnstr_set(x_33, 1, x_14);
+x_34 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_34, 0, x_20);
+lean::cnstr_set(x_34, 1, x_33);
+x_35 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
 lean::closure_set(x_35, 0, x_34);
-lean::closure_set(x_35, 1, x_33);
+lean::closure_set(x_35, 1, x_5);
 x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_23);
+lean::cnstr_set(x_36, 0, x_35);
 lean::cnstr_set(x_36, 1, x_14);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_35);
-lean::cnstr_set(x_37, 1, x_36);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_6);
-lean::cnstr_set(x_38, 1, x_37);
-x_39 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser), 5, 0);
+x_37 = l_lean_parser_term_have__proof;
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_38, 0, x_37);
+lean::closure_set(x_38, 1, x_36);
+x_39 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_39, 0, x_26);
+lean::cnstr_set(x_39, 1, x_16);
 x_40 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_40, 0, x_39);
-lean::cnstr_set(x_40, 1, x_38);
+lean::cnstr_set(x_40, 0, x_38);
+lean::cnstr_set(x_40, 1, x_39);
 x_41 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_41, 0, x_5);
+lean::cnstr_set(x_41, 0, x_7);
 lean::cnstr_set(x_41, 1, x_40);
-return x_41;
+x_42 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser), 5, 0);
+x_43 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_43, 0, x_42);
+lean::cnstr_set(x_43, 1, x_41);
+x_44 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_44, 0, x_6);
+lean::cnstr_set(x_44, 1, x_43);
+return x_44;
 }
 }
 obj* l_lean_parser_term_have_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -36466,119 +36621,125 @@ return x_0;
 obj* _init_l_lean_parser_term_show_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_14; obj* x_17; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_16; obj* x_19; 
 x_0 = lean::mk_string("show ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(", ");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::box(0);
-x_6 = l_lean_parser_term_from_parser_lean_parser_has__tokens;
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_5);
-x_8 = l_lean_parser_list_cons_tokens___rarg(x_4, x_7);
-lean::dec(x_7);
+lean::dec(x_0);
+x_4 = lean::mk_string(", ");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_11 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_11, x_8);
-lean::dec(x_8);
-x_14 = l_lean_parser_list_cons_tokens___rarg(x_2, x_12);
-lean::dec(x_12);
-lean::dec(x_2);
-x_17 = l_lean_parser_tokens___rarg(x_14);
+x_7 = lean::box(0);
+x_8 = l_lean_parser_term_from_parser_lean_parser_has__tokens;
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_8, x_7);
+x_10 = l_lean_parser_list_cons_tokens___rarg(x_5, x_9);
+lean::dec(x_9);
+lean::dec(x_5);
+x_13 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_13, x_10);
+lean::dec(x_10);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_2, x_14);
 lean::dec(x_14);
-return x_17;
+lean::dec(x_2);
+x_19 = l_lean_parser_tokens___rarg(x_16);
+lean::dec(x_16);
+return x_19;
 }
 }
 obj* _init_l_lean_parser_term_show_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; 
 x_0 = lean::mk_string("show ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_string(", ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::box(0);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_from_parser), 5, 0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_13);
-lean::cnstr_set(x_14, 1, x_12);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_11);
-lean::cnstr_set(x_15, 1, x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::mk_string(", ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::box(0);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_from_parser), 5, 0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_6);
-lean::cnstr_set(x_16, 1, x_15);
+lean::cnstr_set(x_16, 0, x_15);
+lean::cnstr_set(x_16, 1, x_14);
 x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_5);
+lean::cnstr_set(x_17, 0, x_13);
 lean::cnstr_set(x_17, 1, x_16);
-x_18 = l_lean_parser_term__parser__m_monad;
-x_19 = l_lean_parser_term__parser__m_monad__except;
-x_20 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_21 = l_lean_parser_term__parser__m_alternative;
-x_22 = l_lean_parser_term_show;
-x_23 = l_lean_parser_term_show_has__view;
-x_24 = l_lean_parser_combinators_node_view___rarg(x_18, x_19, x_20, x_21, x_22, x_17, x_23);
-lean::dec(x_17);
-return x_24;
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_7);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_6);
+lean::cnstr_set(x_19, 1, x_18);
+x_20 = l_lean_parser_term__parser__m_monad;
+x_21 = l_lean_parser_term__parser__m_monad__except;
+x_22 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_23 = l_lean_parser_term__parser__m_alternative;
+x_24 = l_lean_parser_term_show;
+x_25 = l_lean_parser_term_show_has__view;
+x_26 = l_lean_parser_combinators_node_view___rarg(x_20, x_21, x_22, x_23, x_24, x_19, x_25);
+lean::dec(x_19);
+return x_26;
 }
 }
 obj* _init_l_lean_parser_term_show_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; 
 x_0 = lean::mk_string("show ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_string(", ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::box(0);
-x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_from_parser), 5, 0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_13);
-lean::cnstr_set(x_14, 1, x_12);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_11);
-lean::cnstr_set(x_15, 1, x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::mk_string(", ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::box(0);
+x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_from_parser), 5, 0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_6);
-lean::cnstr_set(x_16, 1, x_15);
+lean::cnstr_set(x_16, 0, x_15);
+lean::cnstr_set(x_16, 1, x_14);
 x_17 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_17, 0, x_5);
+lean::cnstr_set(x_17, 0, x_13);
 lean::cnstr_set(x_17, 1, x_16);
-return x_17;
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_7);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_19, 0, x_6);
+lean::cnstr_set(x_19, 1, x_18);
+return x_19;
 }
 }
 obj* l_lean_parser_term_show_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -39039,270 +39200,285 @@ return x_0;
 obj* _init_l_lean_parser_term_match_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_20; obj* x_22; obj* x_24; obj* x_27; obj* x_29; obj* x_32; obj* x_35; obj* x_36; obj* x_38; obj* x_41; obj* x_44; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_20; obj* x_21; obj* x_22; obj* x_25; obj* x_27; obj* x_29; obj* x_32; obj* x_34; obj* x_37; obj* x_40; obj* x_41; obj* x_43; obj* x_46; obj* x_49; 
 x_0 = lean::mk_string("match ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(", ");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_6 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_5, x_4);
+lean::dec(x_0);
+x_4 = lean::mk_string(", ");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_8 = lean::mk_string(" with ");
-x_9 = l_lean_parser_symbol_tokens___rarg(x_8, x_1);
-x_10 = lean::mk_string(" | ");
+x_7 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_8 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_7, x_5);
+lean::dec(x_5);
+x_10 = lean::mk_string(" with ");
 x_11 = l_lean_parser_symbol_tokens___rarg(x_10, x_1);
-x_12 = l_lean_parser_tokens___rarg(x_11);
-x_13 = lean::mk_string(":=");
+lean::dec(x_10);
+x_13 = lean::mk_string(" | ");
 x_14 = l_lean_parser_symbol_tokens___rarg(x_13, x_1);
-x_15 = lean::box(0);
-x_16 = l_lean_parser_list_cons_tokens___rarg(x_5, x_15);
-x_17 = l_lean_parser_list_cons_tokens___rarg(x_14, x_16);
-lean::dec(x_16);
-lean::dec(x_14);
-x_20 = l_lean_parser_list_cons_tokens___rarg(x_6, x_17);
+lean::dec(x_13);
+x_16 = l_lean_parser_tokens___rarg(x_14);
+x_17 = lean::mk_string(":=");
+x_18 = l_lean_parser_symbol_tokens___rarg(x_17, x_1);
 lean::dec(x_17);
-x_22 = l_lean_parser_tokens___rarg(x_20);
-lean::dec(x_20);
-x_24 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_22, x_11);
-lean::dec(x_11);
+x_20 = lean::box(0);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_7, x_20);
+x_22 = l_lean_parser_list_cons_tokens___rarg(x_18, x_21);
+lean::dec(x_21);
+lean::dec(x_18);
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_8, x_22);
 lean::dec(x_22);
-x_27 = l_lean_parser_list_cons_tokens___rarg(x_24, x_15);
-lean::dec(x_24);
-x_29 = l_lean_parser_list_cons_tokens___rarg(x_12, x_27);
+x_27 = l_lean_parser_tokens___rarg(x_25);
+lean::dec(x_25);
+x_29 = l_lean_parser_combinators_sep__by1_tokens___rarg(x_27, x_14);
+lean::dec(x_14);
 lean::dec(x_27);
-lean::dec(x_12);
-x_32 = l_lean_parser_list_cons_tokens___rarg(x_9, x_29);
+x_32 = l_lean_parser_list_cons_tokens___rarg(x_29, x_20);
 lean::dec(x_29);
-lean::dec(x_9);
-x_35 = l_lean_parser_term_opt__type_parser_lean_parser_has__tokens;
-x_36 = l_lean_parser_list_cons_tokens___rarg(x_35, x_32);
+x_34 = l_lean_parser_list_cons_tokens___rarg(x_16, x_32);
 lean::dec(x_32);
-x_38 = l_lean_parser_list_cons_tokens___rarg(x_6, x_36);
-lean::dec(x_36);
-lean::dec(x_6);
-x_41 = l_lean_parser_list_cons_tokens___rarg(x_2, x_38);
-lean::dec(x_38);
-lean::dec(x_2);
-x_44 = l_lean_parser_tokens___rarg(x_41);
+lean::dec(x_16);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_11, x_34);
+lean::dec(x_34);
+lean::dec(x_11);
+x_40 = l_lean_parser_term_opt__type_parser_lean_parser_has__tokens;
+x_41 = l_lean_parser_list_cons_tokens___rarg(x_40, x_37);
+lean::dec(x_37);
+x_43 = l_lean_parser_list_cons_tokens___rarg(x_8, x_41);
 lean::dec(x_41);
-return x_44;
+lean::dec(x_8);
+x_46 = l_lean_parser_list_cons_tokens___rarg(x_2, x_43);
+lean::dec(x_43);
+lean::dec(x_2);
+x_49 = l_lean_parser_tokens___rarg(x_46);
+lean::dec(x_46);
+return x_49;
 }
 }
 obj* _init_l_lean_parser_term_match_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; uint8 x_12; obj* x_13; obj* x_16; obj* x_17; obj* x_18; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_25; obj* x_26; obj* x_28; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; uint8 x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; 
 x_0 = lean::mk_string("match ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_string(", ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = 0;
-x_13 = lean::box(x_12);
-lean::inc(x_13);
-lean::inc(x_6);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_term_match_has__view_x_27___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_6);
-lean::closure_set(x_16, 1, x_11);
-lean::closure_set(x_16, 2, x_13);
-x_17 = lean::mk_string(" with ");
-x_18 = l_string_trim(x_17);
-lean::inc(x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_20, 0, x_18);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_21, 0, x_18);
-lean::closure_set(x_21, 1, x_4);
-lean::closure_set(x_21, 2, x_20);
-x_22 = lean::mk_string(" | ");
-x_23 = l_string_trim(x_22);
-lean::inc(x_23);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_25, 0, x_23);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_26, 0, x_23);
-lean::closure_set(x_26, 1, x_4);
-lean::closure_set(x_26, 2, x_25);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::mk_string(", ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = 0;
+x_15 = lean::box(x_14);
+lean::inc(x_15);
+lean::inc(x_7);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_term_match_has__view_x_27___spec__1___boxed), 8, 3);
+lean::closure_set(x_18, 0, x_7);
+lean::closure_set(x_18, 1, x_13);
+lean::closure_set(x_18, 2, x_15);
+x_19 = lean::mk_string(" with ");
+x_20 = l_string_trim(x_19);
+lean::dec(x_19);
+lean::inc(x_20);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_23, 0, x_20);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_24, 0, x_20);
+lean::closure_set(x_24, 1, x_5);
+lean::closure_set(x_24, 2, x_23);
+x_25 = lean::mk_string(" | ");
+x_26 = l_string_trim(x_25);
+lean::dec(x_25);
 lean::inc(x_26);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_28, 0, x_26);
-x_29 = lean::mk_string(":=");
-x_30 = l_string_trim(x_29);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_29, 0, x_26);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_30, 0, x_26);
+lean::closure_set(x_30, 1, x_5);
+lean::closure_set(x_30, 2, x_29);
 lean::inc(x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
 lean::closure_set(x_32, 0, x_30);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_33, 0, x_30);
-lean::closure_set(x_33, 1, x_4);
-lean::closure_set(x_33, 2, x_32);
-x_34 = lean::box(0);
-x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_6);
-lean::cnstr_set(x_35, 1, x_34);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_33);
-lean::cnstr_set(x_36, 1, x_35);
-lean::inc(x_16);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_16);
-lean::cnstr_set(x_38, 1, x_36);
-x_39 = l_lean_parser_term_match__equation;
-x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_40, 0, x_39);
-lean::closure_set(x_40, 1, x_38);
-x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_term_match_has__view_x_27___spec__1___boxed), 8, 3);
-lean::closure_set(x_41, 0, x_40);
-lean::closure_set(x_41, 1, x_26);
-lean::closure_set(x_41, 2, x_13);
-x_42 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_42, 0, x_41);
-lean::cnstr_set(x_42, 1, x_34);
+x_33 = lean::mk_string(":=");
+x_34 = l_string_trim(x_33);
+lean::dec(x_33);
+lean::inc(x_34);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_37, 0, x_34);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_38, 0, x_34);
+lean::closure_set(x_38, 1, x_5);
+lean::closure_set(x_38, 2, x_37);
+x_39 = lean::box(0);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_7);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_38);
+lean::cnstr_set(x_41, 1, x_40);
+lean::inc(x_18);
 x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_28);
-lean::cnstr_set(x_43, 1, x_42);
-x_44 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_44, 0, x_21);
-lean::cnstr_set(x_44, 1, x_43);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
-x_46 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_46, 0, x_45);
-lean::cnstr_set(x_46, 1, x_44);
+lean::cnstr_set(x_43, 0, x_18);
+lean::cnstr_set(x_43, 1, x_41);
+x_44 = l_lean_parser_term_match__equation;
+x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_45, 0, x_44);
+lean::closure_set(x_45, 1, x_43);
+x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_term_match_has__view_x_27___spec__1___boxed), 8, 3);
+lean::closure_set(x_46, 0, x_45);
+lean::closure_set(x_46, 1, x_30);
+lean::closure_set(x_46, 2, x_15);
 x_47 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_47, 0, x_16);
-lean::cnstr_set(x_47, 1, x_46);
+lean::cnstr_set(x_47, 0, x_46);
+lean::cnstr_set(x_47, 1, x_39);
 x_48 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_48, 0, x_5);
+lean::cnstr_set(x_48, 0, x_32);
 lean::cnstr_set(x_48, 1, x_47);
-x_49 = l_lean_parser_term__parser__m_monad;
-x_50 = l_lean_parser_term__parser__m_monad__except;
-x_51 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_52 = l_lean_parser_term__parser__m_alternative;
-x_53 = l_lean_parser_term_match;
-x_54 = l_lean_parser_term_match_has__view;
-x_55 = l_lean_parser_combinators_node_view___rarg(x_49, x_50, x_51, x_52, x_53, x_48, x_54);
-lean::dec(x_48);
-return x_55;
+x_49 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_49, 0, x_24);
+lean::cnstr_set(x_49, 1, x_48);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
+x_51 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_51, 0, x_50);
+lean::cnstr_set(x_51, 1, x_49);
+x_52 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_52, 0, x_18);
+lean::cnstr_set(x_52, 1, x_51);
+x_53 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_53, 0, x_6);
+lean::cnstr_set(x_53, 1, x_52);
+x_54 = l_lean_parser_term__parser__m_monad;
+x_55 = l_lean_parser_term__parser__m_monad__except;
+x_56 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_57 = l_lean_parser_term__parser__m_alternative;
+x_58 = l_lean_parser_term_match;
+x_59 = l_lean_parser_term_match_has__view;
+x_60 = l_lean_parser_combinators_node_view___rarg(x_54, x_55, x_56, x_57, x_58, x_53, x_59);
+lean::dec(x_53);
+return x_60;
 }
 }
 obj* _init_l_lean_parser_term_match_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; uint8 x_12; obj* x_13; obj* x_16; obj* x_17; obj* x_18; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_25; obj* x_26; obj* x_28; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; uint8 x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_29; obj* x_30; obj* x_32; obj* x_33; obj* x_34; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; 
 x_0 = lean::mk_string("match ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_string(", ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = 0;
-x_13 = lean::box(x_12);
-lean::inc(x_13);
-lean::inc(x_6);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_term_match_has__view_x_27___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_6);
-lean::closure_set(x_16, 1, x_11);
-lean::closure_set(x_16, 2, x_13);
-x_17 = lean::mk_string(" with ");
-x_18 = l_string_trim(x_17);
-lean::inc(x_18);
-x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_20, 0, x_18);
-x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_21, 0, x_18);
-lean::closure_set(x_21, 1, x_4);
-lean::closure_set(x_21, 2, x_20);
-x_22 = lean::mk_string(" | ");
-x_23 = l_string_trim(x_22);
-lean::inc(x_23);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_25, 0, x_23);
-x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_26, 0, x_23);
-lean::closure_set(x_26, 1, x_4);
-lean::closure_set(x_26, 2, x_25);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::mk_string(", ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = 0;
+x_15 = lean::box(x_14);
+lean::inc(x_15);
+lean::inc(x_7);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_term_match_has__view_x_27___spec__1___boxed), 8, 3);
+lean::closure_set(x_18, 0, x_7);
+lean::closure_set(x_18, 1, x_13);
+lean::closure_set(x_18, 2, x_15);
+x_19 = lean::mk_string(" with ");
+x_20 = l_string_trim(x_19);
+lean::dec(x_19);
+lean::inc(x_20);
+x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_23, 0, x_20);
+x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_24, 0, x_20);
+lean::closure_set(x_24, 1, x_5);
+lean::closure_set(x_24, 2, x_23);
+x_25 = lean::mk_string(" | ");
+x_26 = l_string_trim(x_25);
+lean::dec(x_25);
 lean::inc(x_26);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_28, 0, x_26);
-x_29 = lean::mk_string(":=");
-x_30 = l_string_trim(x_29);
+x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_29, 0, x_26);
+x_30 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_30, 0, x_26);
+lean::closure_set(x_30, 1, x_5);
+lean::closure_set(x_30, 2, x_29);
 lean::inc(x_30);
-x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
 lean::closure_set(x_32, 0, x_30);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_33, 0, x_30);
-lean::closure_set(x_33, 1, x_4);
-lean::closure_set(x_33, 2, x_32);
-x_34 = lean::box(0);
-x_35 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_35, 0, x_6);
-lean::cnstr_set(x_35, 1, x_34);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_33);
-lean::cnstr_set(x_36, 1, x_35);
-lean::inc(x_16);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_16);
-lean::cnstr_set(x_38, 1, x_36);
-x_39 = l_lean_parser_term_match__equation;
-x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_40, 0, x_39);
-lean::closure_set(x_40, 1, x_38);
-x_41 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_term_match_has__view_x_27___spec__1___boxed), 8, 3);
-lean::closure_set(x_41, 0, x_40);
-lean::closure_set(x_41, 1, x_26);
-lean::closure_set(x_41, 2, x_13);
-x_42 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_42, 0, x_41);
-lean::cnstr_set(x_42, 1, x_34);
+x_33 = lean::mk_string(":=");
+x_34 = l_string_trim(x_33);
+lean::dec(x_33);
+lean::inc(x_34);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_37, 0, x_34);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_38, 0, x_34);
+lean::closure_set(x_38, 1, x_5);
+lean::closure_set(x_38, 2, x_37);
+x_39 = lean::box(0);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_7);
+lean::cnstr_set(x_40, 1, x_39);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_38);
+lean::cnstr_set(x_41, 1, x_40);
+lean::inc(x_18);
 x_43 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_43, 0, x_28);
-lean::cnstr_set(x_43, 1, x_42);
-x_44 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_44, 0, x_21);
-lean::cnstr_set(x_44, 1, x_43);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
-x_46 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_46, 0, x_45);
-lean::cnstr_set(x_46, 1, x_44);
+lean::cnstr_set(x_43, 0, x_18);
+lean::cnstr_set(x_43, 1, x_41);
+x_44 = l_lean_parser_term_match__equation;
+x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_45, 0, x_44);
+lean::closure_set(x_45, 1, x_43);
+x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by1___at_lean_parser_term_match_has__view_x_27___spec__1___boxed), 8, 3);
+lean::closure_set(x_46, 0, x_45);
+lean::closure_set(x_46, 1, x_30);
+lean::closure_set(x_46, 2, x_15);
 x_47 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_47, 0, x_16);
-lean::cnstr_set(x_47, 1, x_46);
+lean::cnstr_set(x_47, 0, x_46);
+lean::cnstr_set(x_47, 1, x_39);
 x_48 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_48, 0, x_5);
+lean::cnstr_set(x_48, 0, x_32);
 lean::cnstr_set(x_48, 1, x_47);
-return x_48;
+x_49 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_49, 0, x_24);
+lean::cnstr_set(x_49, 1, x_48);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
+x_51 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_51, 0, x_50);
+lean::cnstr_set(x_51, 1, x_49);
+x_52 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_52, 0, x_18);
+lean::cnstr_set(x_52, 1, x_51);
+x_53 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_53, 0, x_6);
+lean::cnstr_set(x_53, 1, x_52);
+return x_53;
 }
 }
 obj* l_lean_parser_term_match_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -40470,168 +40646,177 @@ return x_0;
 obj* _init_l_lean_parser_term_if_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_15; obj* x_18; obj* x_20; obj* x_21; obj* x_23; obj* x_26; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_16; obj* x_18; obj* x_21; obj* x_23; obj* x_24; obj* x_26; obj* x_29; 
 x_0 = lean::mk_string("if ");
 x_1 = lean::mk_nat_obj(0u);
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(" then ");
-x_4 = l_lean_parser_symbol_tokens___rarg(x_3, x_1);
-x_5 = lean::mk_string(" else ");
-x_6 = l_lean_parser_symbol_tokens___rarg(x_5, x_1);
-x_7 = lean::box(0);
-x_8 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_8, x_7);
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_6, x_9);
-lean::dec(x_9);
-lean::dec(x_6);
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_8, x_10);
-lean::dec(x_10);
-x_15 = l_lean_parser_list_cons_tokens___rarg(x_4, x_13);
-lean::dec(x_13);
+lean::dec(x_0);
+x_4 = lean::mk_string(" then ");
+x_5 = l_lean_parser_symbol_tokens___rarg(x_4, x_1);
 lean::dec(x_4);
-x_18 = l_lean_parser_list_cons_tokens___rarg(x_8, x_15);
-lean::dec(x_15);
-x_20 = l_lean_parser_term_opt__ident_parser_lean_parser_has__tokens;
-x_21 = l_lean_parser_list_cons_tokens___rarg(x_20, x_18);
+x_7 = lean::mk_string(" else ");
+x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_1);
+lean::dec(x_7);
+x_10 = lean::box(0);
+x_11 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_11, x_10);
+x_13 = l_lean_parser_list_cons_tokens___rarg(x_8, x_12);
+lean::dec(x_12);
+lean::dec(x_8);
+x_16 = l_lean_parser_list_cons_tokens___rarg(x_11, x_13);
+lean::dec(x_13);
+x_18 = l_lean_parser_list_cons_tokens___rarg(x_5, x_16);
+lean::dec(x_16);
+lean::dec(x_5);
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_11, x_18);
 lean::dec(x_18);
-x_23 = l_lean_parser_list_cons_tokens___rarg(x_2, x_21);
+x_23 = l_lean_parser_term_opt__ident_parser_lean_parser_has__tokens;
+x_24 = l_lean_parser_list_cons_tokens___rarg(x_23, x_21);
 lean::dec(x_21);
+x_26 = l_lean_parser_list_cons_tokens___rarg(x_2, x_24);
+lean::dec(x_24);
 lean::dec(x_2);
-x_26 = l_lean_parser_tokens___rarg(x_23);
-lean::dec(x_23);
-return x_26;
+x_29 = l_lean_parser_tokens___rarg(x_26);
+lean::dec(x_26);
+return x_29;
 }
 }
 obj* _init_l_lean_parser_term_if_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_22; obj* x_23; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; obj* x_37; 
 x_0 = lean::mk_string("if ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_string(" then ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::mk_string(" else ");
-x_13 = l_string_trim(x_12);
-lean::inc(x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_15, 0, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_13);
-lean::closure_set(x_16, 1, x_4);
-lean::closure_set(x_16, 2, x_15);
-x_17 = lean::box(0);
-lean::inc(x_6);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_6);
-lean::cnstr_set(x_19, 1, x_17);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_16);
-lean::cnstr_set(x_20, 1, x_19);
-lean::inc(x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::mk_string(" then ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::mk_string(" else ");
+x_15 = l_string_trim(x_14);
+lean::dec(x_14);
+lean::inc(x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_18, 0, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_19, 0, x_15);
+lean::closure_set(x_19, 1, x_5);
+lean::closure_set(x_19, 2, x_18);
+x_20 = lean::box(0);
+lean::inc(x_7);
 x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_6);
+lean::cnstr_set(x_22, 0, x_7);
 lean::cnstr_set(x_22, 1, x_20);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_11);
+lean::cnstr_set(x_23, 0, x_19);
 lean::cnstr_set(x_23, 1, x_22);
-x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_6);
-lean::cnstr_set(x_24, 1, x_23);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser), 5, 0);
+lean::inc(x_7);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_7);
+lean::cnstr_set(x_25, 1, x_23);
 x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_25);
-lean::cnstr_set(x_26, 1, x_24);
+lean::cnstr_set(x_26, 0, x_13);
+lean::cnstr_set(x_26, 1, x_25);
 x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_5);
+lean::cnstr_set(x_27, 0, x_7);
 lean::cnstr_set(x_27, 1, x_26);
-x_28 = l_lean_parser_term__parser__m_monad;
-x_29 = l_lean_parser_term__parser__m_monad__except;
-x_30 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_31 = l_lean_parser_term__parser__m_alternative;
-x_32 = l_lean_parser_term_if;
-x_33 = l_lean_parser_term_if_has__view;
-x_34 = l_lean_parser_combinators_node_view___rarg(x_28, x_29, x_30, x_31, x_32, x_27, x_33);
-lean::dec(x_27);
-return x_34;
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser), 5, 0);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_28);
+lean::cnstr_set(x_29, 1, x_27);
+x_30 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_30, 0, x_6);
+lean::cnstr_set(x_30, 1, x_29);
+x_31 = l_lean_parser_term__parser__m_monad;
+x_32 = l_lean_parser_term__parser__m_monad__except;
+x_33 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_34 = l_lean_parser_term__parser__m_alternative;
+x_35 = l_lean_parser_term_if;
+x_36 = l_lean_parser_term_if_has__view;
+x_37 = l_lean_parser_combinators_node_view___rarg(x_31, x_32, x_33, x_34, x_35, x_30, x_36);
+lean::dec(x_30);
+return x_37;
 }
 }
 obj* _init_l_lean_parser_term_if_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_15; obj* x_16; obj* x_17; obj* x_19; obj* x_20; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_18; obj* x_19; obj* x_20; obj* x_22; obj* x_23; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; 
 x_0 = lean::mk_string("if ");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = lean::mk_nat_obj(0u);
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_6, 0, x_4);
-x_7 = lean::mk_string(" then ");
-x_8 = l_string_trim(x_7);
-lean::inc(x_8);
-x_10 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_10, 0, x_8);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_8);
-lean::closure_set(x_11, 1, x_4);
-lean::closure_set(x_11, 2, x_10);
-x_12 = lean::mk_string(" else ");
-x_13 = l_string_trim(x_12);
-lean::inc(x_13);
-x_15 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_15, 0, x_13);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_16, 0, x_13);
-lean::closure_set(x_16, 1, x_4);
-lean::closure_set(x_16, 2, x_15);
-x_17 = lean::box(0);
-lean::inc(x_6);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_6);
-lean::cnstr_set(x_19, 1, x_17);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_16);
-lean::cnstr_set(x_20, 1, x_19);
-lean::inc(x_6);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = lean::mk_nat_obj(0u);
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_7, 0, x_5);
+x_8 = lean::mk_string(" then ");
+x_9 = l_string_trim(x_8);
+lean::dec(x_8);
+lean::inc(x_9);
+x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_12, 0, x_9);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_9);
+lean::closure_set(x_13, 1, x_5);
+lean::closure_set(x_13, 2, x_12);
+x_14 = lean::mk_string(" else ");
+x_15 = l_string_trim(x_14);
+lean::dec(x_14);
+lean::inc(x_15);
+x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_18, 0, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_19, 0, x_15);
+lean::closure_set(x_19, 1, x_5);
+lean::closure_set(x_19, 2, x_18);
+x_20 = lean::box(0);
+lean::inc(x_7);
 x_22 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_22, 0, x_6);
+lean::cnstr_set(x_22, 0, x_7);
 lean::cnstr_set(x_22, 1, x_20);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_11);
+lean::cnstr_set(x_23, 0, x_19);
 lean::cnstr_set(x_23, 1, x_22);
-x_24 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_24, 0, x_6);
-lean::cnstr_set(x_24, 1, x_23);
-x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser), 5, 0);
+lean::inc(x_7);
+x_25 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_25, 0, x_7);
+lean::cnstr_set(x_25, 1, x_23);
 x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_25);
-lean::cnstr_set(x_26, 1, x_24);
+lean::cnstr_set(x_26, 0, x_13);
+lean::cnstr_set(x_26, 1, x_25);
 x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_5);
+lean::cnstr_set(x_27, 0, x_7);
 lean::cnstr_set(x_27, 1, x_26);
-return x_27;
+x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__ident_parser), 5, 0);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_28);
+lean::cnstr_set(x_29, 1, x_27);
+x_30 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_30, 0, x_6);
+lean::cnstr_set(x_30, 1, x_29);
+return x_30;
 }
 }
 obj* l_lean_parser_term_if_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -44489,92 +44674,99 @@ return x_0;
 obj* _init_l_lean_parser_term_struct__inst_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_13; obj* x_15; obj* x_17; obj* x_18; obj* x_19; obj* x_21; obj* x_22; obj* x_24; obj* x_26; obj* x_28; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_36; obj* x_38; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_45; obj* x_48; obj* x_50; obj* x_52; obj* x_55; obj* x_57; obj* x_59; obj* x_61; obj* x_62; obj* x_63; obj* x_66; obj* x_67; obj* x_68; obj* x_70; obj* x_73; obj* x_76; obj* x_79; obj* x_82; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_11; obj* x_13; obj* x_15; obj* x_17; obj* x_19; obj* x_20; obj* x_22; obj* x_24; obj* x_25; obj* x_27; obj* x_29; obj* x_31; obj* x_33; obj* x_34; obj* x_36; obj* x_37; obj* x_40; obj* x_42; obj* x_44; obj* x_45; obj* x_47; obj* x_48; obj* x_50; obj* x_53; obj* x_55; obj* x_57; obj* x_60; obj* x_62; obj* x_64; obj* x_66; obj* x_67; obj* x_69; obj* x_72; obj* x_73; obj* x_75; obj* x_77; obj* x_80; obj* x_83; obj* x_86; obj* x_89; 
 x_0 = lean::mk_string("{");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = lean::mk_string(" . ");
-x_5 = lean::mk_nat_obj(0u);
-x_6 = l_lean_parser_symbol_tokens___rarg(x_4, x_5);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_6, x_3);
-lean::dec(x_6);
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_3, x_7);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = lean::mk_string(" . ");
+x_6 = lean::mk_nat_obj(0u);
+x_7 = l_lean_parser_symbol_tokens___rarg(x_5, x_6);
+lean::dec(x_5);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_7, x_4);
 lean::dec(x_7);
-x_11 = l_lean_parser_tokens___rarg(x_9);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_4, x_9);
 lean::dec(x_9);
 x_13 = l_lean_parser_tokens___rarg(x_11);
 lean::dec(x_11);
 x_15 = l_lean_parser_tokens___rarg(x_13);
 lean::dec(x_13);
-x_17 = lean::mk_string(" with ");
-x_18 = l_lean_parser_symbol_tokens___rarg(x_17, x_5);
-x_19 = l_lean_parser_list_cons_tokens___rarg(x_18, x_3);
-lean::dec(x_18);
-x_21 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_22 = l_lean_parser_list_cons_tokens___rarg(x_21, x_19);
-lean::dec(x_19);
-x_24 = l_lean_parser_tokens___rarg(x_22);
-lean::dec(x_22);
-x_26 = l_lean_parser_tokens___rarg(x_24);
-lean::dec(x_24);
-x_28 = l_lean_parser_tokens___rarg(x_26);
-lean::dec(x_26);
-x_30 = lean::mk_string(" := ");
-x_31 = l_lean_parser_symbol_tokens___rarg(x_30, x_5);
-x_32 = l_lean_parser_list_cons_tokens___rarg(x_21, x_3);
-x_33 = l_lean_parser_list_cons_tokens___rarg(x_31, x_32);
-lean::dec(x_32);
-lean::dec(x_31);
-x_36 = l_lean_parser_list_cons_tokens___rarg(x_3, x_33);
-lean::dec(x_33);
-x_38 = l_lean_parser_tokens___rarg(x_36);
-lean::dec(x_36);
-x_40 = lean::mk_string("..");
-x_41 = l_lean_parser_symbol_tokens___rarg(x_40, x_5);
-x_42 = l_lean_parser_tokens___rarg(x_21);
-x_43 = l_lean_parser_list_cons_tokens___rarg(x_42, x_3);
-lean::dec(x_42);
-x_45 = l_lean_parser_list_cons_tokens___rarg(x_41, x_43);
-lean::dec(x_43);
-lean::dec(x_41);
-x_48 = l_lean_parser_tokens___rarg(x_45);
-lean::dec(x_45);
-x_50 = l_lean_parser_list_cons_tokens___rarg(x_48, x_3);
-lean::dec(x_48);
-x_52 = l_lean_parser_list_cons_tokens___rarg(x_38, x_50);
-lean::dec(x_50);
-lean::dec(x_38);
-x_55 = l_lean_parser_tokens___rarg(x_52);
-lean::dec(x_52);
-x_57 = l_lean_parser_list_cons_tokens___rarg(x_55, x_3);
-lean::dec(x_55);
-x_59 = l_lean_parser_tokens___rarg(x_57);
-lean::dec(x_57);
-x_61 = lean::mk_string(", ");
-x_62 = l_lean_parser_symbol_tokens___rarg(x_61, x_5);
-x_63 = l_lean_parser_combinators_sep__by_tokens___rarg(x_59, x_62);
-lean::dec(x_62);
-lean::dec(x_59);
-x_66 = lean::mk_string("}");
-x_67 = l_lean_parser_symbol_tokens___rarg(x_66, x_5);
-x_68 = l_lean_parser_list_cons_tokens___rarg(x_67, x_3);
-lean::dec(x_67);
-x_70 = l_lean_parser_list_cons_tokens___rarg(x_63, x_68);
-lean::dec(x_68);
-lean::dec(x_63);
-x_73 = l_lean_parser_list_cons_tokens___rarg(x_28, x_70);
-lean::dec(x_70);
-lean::dec(x_28);
-x_76 = l_lean_parser_list_cons_tokens___rarg(x_15, x_73);
-lean::dec(x_73);
+x_17 = l_lean_parser_tokens___rarg(x_15);
 lean::dec(x_15);
-x_79 = l_lean_parser_list_cons_tokens___rarg(x_2, x_76);
-lean::dec(x_76);
+x_19 = lean::mk_string(" with ");
+x_20 = l_lean_parser_symbol_tokens___rarg(x_19, x_6);
+lean::dec(x_19);
+x_22 = l_lean_parser_list_cons_tokens___rarg(x_20, x_4);
+lean::dec(x_20);
+x_24 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_24, x_22);
+lean::dec(x_22);
+x_27 = l_lean_parser_tokens___rarg(x_25);
+lean::dec(x_25);
+x_29 = l_lean_parser_tokens___rarg(x_27);
+lean::dec(x_27);
+x_31 = l_lean_parser_tokens___rarg(x_29);
+lean::dec(x_29);
+x_33 = lean::mk_string(" := ");
+x_34 = l_lean_parser_symbol_tokens___rarg(x_33, x_6);
+lean::dec(x_33);
+x_36 = l_lean_parser_list_cons_tokens___rarg(x_24, x_4);
+x_37 = l_lean_parser_list_cons_tokens___rarg(x_34, x_36);
+lean::dec(x_36);
+lean::dec(x_34);
+x_40 = l_lean_parser_list_cons_tokens___rarg(x_4, x_37);
+lean::dec(x_37);
+x_42 = l_lean_parser_tokens___rarg(x_40);
+lean::dec(x_40);
+x_44 = lean::mk_string("..");
+x_45 = l_lean_parser_symbol_tokens___rarg(x_44, x_6);
+lean::dec(x_44);
+x_47 = l_lean_parser_tokens___rarg(x_24);
+x_48 = l_lean_parser_list_cons_tokens___rarg(x_47, x_4);
+lean::dec(x_47);
+x_50 = l_lean_parser_list_cons_tokens___rarg(x_45, x_48);
+lean::dec(x_48);
+lean::dec(x_45);
+x_53 = l_lean_parser_tokens___rarg(x_50);
+lean::dec(x_50);
+x_55 = l_lean_parser_list_cons_tokens___rarg(x_53, x_4);
+lean::dec(x_53);
+x_57 = l_lean_parser_list_cons_tokens___rarg(x_42, x_55);
+lean::dec(x_55);
+lean::dec(x_42);
+x_60 = l_lean_parser_tokens___rarg(x_57);
+lean::dec(x_57);
+x_62 = l_lean_parser_list_cons_tokens___rarg(x_60, x_4);
+lean::dec(x_60);
+x_64 = l_lean_parser_tokens___rarg(x_62);
+lean::dec(x_62);
+x_66 = lean::mk_string(", ");
+x_67 = l_lean_parser_symbol_tokens___rarg(x_66, x_6);
+lean::dec(x_66);
+x_69 = l_lean_parser_combinators_sep__by_tokens___rarg(x_64, x_67);
+lean::dec(x_67);
+lean::dec(x_64);
+x_72 = lean::mk_string("}");
+x_73 = l_lean_parser_symbol_tokens___rarg(x_72, x_6);
+lean::dec(x_72);
+x_75 = l_lean_parser_list_cons_tokens___rarg(x_73, x_4);
+lean::dec(x_73);
+x_77 = l_lean_parser_list_cons_tokens___rarg(x_69, x_75);
+lean::dec(x_75);
+lean::dec(x_69);
+x_80 = l_lean_parser_list_cons_tokens___rarg(x_31, x_77);
+lean::dec(x_77);
+lean::dec(x_31);
+x_83 = l_lean_parser_list_cons_tokens___rarg(x_17, x_80);
+lean::dec(x_80);
+lean::dec(x_17);
+x_86 = l_lean_parser_list_cons_tokens___rarg(x_2, x_83);
+lean::dec(x_83);
 lean::dec(x_2);
-x_82 = l_lean_parser_tokens___rarg(x_79);
-lean::dec(x_79);
-return x_82;
+x_89 = l_lean_parser_tokens___rarg(x_86);
+lean::dec(x_86);
+return x_89;
 }
 }
 obj* l_lean_parser_term_struct__inst_parser_lean_parser_has__view___lambda__1(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5) {
@@ -44634,331 +44826,345 @@ return x_14;
 obj* _init_l_lean_parser_term_struct__inst_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_33; obj* x_34; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_60; obj* x_61; uint8 x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_68; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_37; obj* x_38; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_66; obj* x_67; uint8 x_68; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; obj* x_82; obj* x_83; obj* x_84; obj* x_85; obj* x_86; obj* x_87; obj* x_88; 
 x_0 = lean::mk_string("{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(" . ");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::mk_nat_obj(0u);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_7);
-lean::closure_set(x_11, 1, x_10);
-lean::closure_set(x_11, 2, x_9);
-x_12 = lean::box(0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_11);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-lean::inc(x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_14);
-lean::cnstr_set(x_16, 1, x_13);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_struct__inst_parser_lean_parser_has__view___lambda__1), 6, 1);
-lean::closure_set(x_17, 0, x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_18, 0, x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_19, 0, x_10);
-x_20 = lean::mk_string(" with ");
-x_21 = l_string_trim(x_20);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(" . ");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::mk_nat_obj(0u);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_8);
+lean::closure_set(x_13, 1, x_12);
+lean::closure_set(x_13, 2, x_11);
+x_14 = lean::box(0);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_13);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+lean::inc(x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_16);
+lean::cnstr_set(x_18, 1, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_struct__inst_parser_lean_parser_has__view___lambda__1), 6, 1);
+lean::closure_set(x_19, 0, x_18);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_20, 0, x_19);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_21, 0, x_12);
+x_22 = lean::mk_string(" with ");
+x_23 = l_string_trim(x_22);
+lean::dec(x_22);
+lean::inc(x_23);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_26, 0, x_23);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_27, 0, x_23);
+lean::closure_set(x_27, 1, x_12);
+lean::closure_set(x_27, 2, x_26);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_14);
 lean::inc(x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_23, 0, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_24, 0, x_21);
-lean::closure_set(x_24, 1, x_10);
-lean::closure_set(x_24, 2, x_23);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_12);
-lean::inc(x_19);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_19);
-lean::cnstr_set(x_27, 1, x_25);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_struct__inst_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_28, 0, x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_29, 0, x_28);
-x_30 = lean::mk_string(" := ");
-x_31 = l_string_trim(x_30);
-lean::inc(x_31);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_33, 0, x_31);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_34, 0, x_31);
-lean::closure_set(x_34, 1, x_10);
-lean::closure_set(x_34, 2, x_33);
-lean::inc(x_19);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_19);
-lean::cnstr_set(x_36, 1, x_12);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_34);
-lean::cnstr_set(x_37, 1, x_36);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_14);
-lean::cnstr_set(x_38, 1, x_37);
-x_39 = l_lean_parser_term_struct__inst__field;
-x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_40, 0, x_39);
-lean::closure_set(x_40, 1, x_38);
-x_41 = lean::mk_string("..");
-x_42 = l_string_trim(x_41);
-lean::inc(x_42);
-x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_44, 0, x_42);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_45, 0, x_42);
-lean::closure_set(x_45, 1, x_10);
-lean::closure_set(x_45, 2, x_44);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_46, 0, x_19);
-x_47 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_47, 0, x_46);
-lean::cnstr_set(x_47, 1, x_12);
-x_48 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_48, 0, x_45);
-lean::cnstr_set(x_48, 1, x_47);
-x_49 = l_lean_parser_term_struct__inst__source;
-x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_50, 0, x_49);
-lean::closure_set(x_50, 1, x_48);
-x_51 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_51, 0, x_50);
-lean::cnstr_set(x_51, 1, x_12);
+x_30 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_30, 0, x_21);
+lean::cnstr_set(x_30, 1, x_28);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_struct__inst_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_31, 0, x_30);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_32, 0, x_31);
+x_33 = lean::mk_string(" := ");
+x_34 = l_string_trim(x_33);
+lean::dec(x_33);
+lean::inc(x_34);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_37, 0, x_34);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_38, 0, x_34);
+lean::closure_set(x_38, 1, x_12);
+lean::closure_set(x_38, 2, x_37);
+lean::inc(x_21);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_21);
+lean::cnstr_set(x_40, 1, x_14);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_38);
+lean::cnstr_set(x_41, 1, x_40);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_16);
+lean::cnstr_set(x_42, 1, x_41);
+x_43 = l_lean_parser_term_struct__inst__field;
+x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_44, 0, x_43);
+lean::closure_set(x_44, 1, x_42);
+x_45 = lean::mk_string("..");
+x_46 = l_string_trim(x_45);
+lean::dec(x_45);
+lean::inc(x_46);
+x_49 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_49, 0, x_46);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_50, 0, x_46);
+lean::closure_set(x_50, 1, x_12);
+lean::closure_set(x_50, 2, x_49);
+x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_51, 0, x_21);
 x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_40);
-lean::cnstr_set(x_52, 1, x_51);
-x_53 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_53, 0, x_52);
-lean::closure_set(x_53, 1, x_10);
-x_54 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_54, 0, x_53);
-lean::cnstr_set(x_54, 1, x_12);
-x_55 = l_lean_parser_term_struct__inst__item;
-x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_56, 0, x_55);
-lean::closure_set(x_56, 1, x_54);
-x_57 = lean::mk_string(", ");
-x_58 = l_string_trim(x_57);
-lean::inc(x_58);
-x_60 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_60, 0, x_58);
-x_61 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_61, 0, x_58);
-lean::closure_set(x_61, 1, x_10);
-lean::closure_set(x_61, 2, x_60);
-x_62 = 1;
-x_63 = lean::box(x_62);
-x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_64, 0, x_56);
-lean::closure_set(x_64, 1, x_61);
-lean::closure_set(x_64, 2, x_63);
-x_65 = lean::mk_string("}");
-x_66 = l_string_trim(x_65);
-lean::inc(x_66);
-x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_68, 0, x_66);
-x_69 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_69, 0, x_66);
-lean::closure_set(x_69, 1, x_10);
-lean::closure_set(x_69, 2, x_68);
-x_70 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_70, 0, x_69);
-lean::cnstr_set(x_70, 1, x_12);
-x_71 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_71, 0, x_64);
-lean::cnstr_set(x_71, 1, x_70);
-x_72 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_72, 0, x_29);
-lean::cnstr_set(x_72, 1, x_71);
-x_73 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_73, 0, x_18);
-lean::cnstr_set(x_73, 1, x_72);
-x_74 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_74, 0, x_5);
-lean::cnstr_set(x_74, 1, x_73);
-x_75 = l_lean_parser_term__parser__m_monad;
-x_76 = l_lean_parser_term__parser__m_monad__except;
-x_77 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_78 = l_lean_parser_term__parser__m_alternative;
-x_79 = l_lean_parser_term_struct__inst;
-x_80 = l_lean_parser_term_struct__inst_has__view;
-x_81 = l_lean_parser_combinators_node_view___rarg(x_75, x_76, x_77, x_78, x_79, x_74, x_80);
-lean::dec(x_74);
-return x_81;
+lean::cnstr_set(x_52, 0, x_51);
+lean::cnstr_set(x_52, 1, x_14);
+x_53 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_53, 0, x_50);
+lean::cnstr_set(x_53, 1, x_52);
+x_54 = l_lean_parser_term_struct__inst__source;
+x_55 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_55, 0, x_54);
+lean::closure_set(x_55, 1, x_53);
+x_56 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_56, 0, x_55);
+lean::cnstr_set(x_56, 1, x_14);
+x_57 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_57, 0, x_44);
+lean::cnstr_set(x_57, 1, x_56);
+x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_58, 0, x_57);
+lean::closure_set(x_58, 1, x_12);
+x_59 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_59, 0, x_58);
+lean::cnstr_set(x_59, 1, x_14);
+x_60 = l_lean_parser_term_struct__inst__item;
+x_61 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_61, 0, x_60);
+lean::closure_set(x_61, 1, x_59);
+x_62 = lean::mk_string(", ");
+x_63 = l_string_trim(x_62);
+lean::dec(x_62);
+lean::inc(x_63);
+x_66 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_66, 0, x_63);
+x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_67, 0, x_63);
+lean::closure_set(x_67, 1, x_12);
+lean::closure_set(x_67, 2, x_66);
+x_68 = 1;
+x_69 = lean::box(x_68);
+x_70 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_70, 0, x_61);
+lean::closure_set(x_70, 1, x_67);
+lean::closure_set(x_70, 2, x_69);
+x_71 = lean::mk_string("}");
+x_72 = l_string_trim(x_71);
+lean::dec(x_71);
+lean::inc(x_72);
+x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_75, 0, x_72);
+x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_76, 0, x_72);
+lean::closure_set(x_76, 1, x_12);
+lean::closure_set(x_76, 2, x_75);
+x_77 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_77, 0, x_76);
+lean::cnstr_set(x_77, 1, x_14);
+x_78 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_78, 0, x_70);
+lean::cnstr_set(x_78, 1, x_77);
+x_79 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_79, 0, x_32);
+lean::cnstr_set(x_79, 1, x_78);
+x_80 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_80, 0, x_20);
+lean::cnstr_set(x_80, 1, x_79);
+x_81 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_81, 0, x_6);
+lean::cnstr_set(x_81, 1, x_80);
+x_82 = l_lean_parser_term__parser__m_monad;
+x_83 = l_lean_parser_term__parser__m_monad__except;
+x_84 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_85 = l_lean_parser_term__parser__m_alternative;
+x_86 = l_lean_parser_term_struct__inst;
+x_87 = l_lean_parser_term_struct__inst_has__view;
+x_88 = l_lean_parser_combinators_node_view___rarg(x_82, x_83, x_84, x_85, x_86, x_81, x_87);
+lean::dec(x_81);
+return x_88;
 }
 }
 obj* _init_l_lean_parser_term_struct__inst_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_23; obj* x_24; obj* x_25; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_33; obj* x_34; obj* x_36; obj* x_37; obj* x_38; obj* x_39; obj* x_40; obj* x_41; obj* x_42; obj* x_44; obj* x_45; obj* x_46; obj* x_47; obj* x_48; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_60; obj* x_61; uint8 x_62; obj* x_63; obj* x_64; obj* x_65; obj* x_66; obj* x_68; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_73; obj* x_74; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_26; obj* x_27; obj* x_28; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_37; obj* x_38; obj* x_40; obj* x_41; obj* x_42; obj* x_43; obj* x_44; obj* x_45; obj* x_46; obj* x_49; obj* x_50; obj* x_51; obj* x_52; obj* x_53; obj* x_54; obj* x_55; obj* x_56; obj* x_57; obj* x_58; obj* x_59; obj* x_60; obj* x_61; obj* x_62; obj* x_63; obj* x_66; obj* x_67; uint8 x_68; obj* x_69; obj* x_70; obj* x_71; obj* x_72; obj* x_75; obj* x_76; obj* x_77; obj* x_78; obj* x_79; obj* x_80; obj* x_81; 
 x_0 = lean::mk_string("{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string(" . ");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::mk_nat_obj(0u);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_7);
-lean::closure_set(x_11, 1, x_10);
-lean::closure_set(x_11, 2, x_9);
-x_12 = lean::box(0);
-x_13 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_13, 0, x_11);
-lean::cnstr_set(x_13, 1, x_12);
-x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-lean::inc(x_14);
-x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_14);
-lean::cnstr_set(x_16, 1, x_13);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_struct__inst_parser_lean_parser_has__view___lambda__1), 6, 1);
-lean::closure_set(x_17, 0, x_16);
-x_18 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_18, 0, x_17);
-x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_19, 0, x_10);
-x_20 = lean::mk_string(" with ");
-x_21 = l_string_trim(x_20);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string(" . ");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::mk_nat_obj(0u);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_8);
+lean::closure_set(x_13, 1, x_12);
+lean::closure_set(x_13, 2, x_11);
+x_14 = lean::box(0);
+x_15 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_15, 0, x_13);
+lean::cnstr_set(x_15, 1, x_14);
+x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+lean::inc(x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_16);
+lean::cnstr_set(x_18, 1, x_15);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_struct__inst_parser_lean_parser_has__view___lambda__1), 6, 1);
+lean::closure_set(x_19, 0, x_18);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_20, 0, x_19);
+x_21 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_21, 0, x_12);
+x_22 = lean::mk_string(" with ");
+x_23 = l_string_trim(x_22);
+lean::dec(x_22);
+lean::inc(x_23);
+x_26 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_26, 0, x_23);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_27, 0, x_23);
+lean::closure_set(x_27, 1, x_12);
+lean::closure_set(x_27, 2, x_26);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_14);
 lean::inc(x_21);
-x_23 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_23, 0, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_24, 0, x_21);
-lean::closure_set(x_24, 1, x_10);
-lean::closure_set(x_24, 2, x_23);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_12);
-lean::inc(x_19);
-x_27 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_27, 0, x_19);
-lean::cnstr_set(x_27, 1, x_25);
-x_28 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_struct__inst_parser_lean_parser_has__view___lambda__2), 6, 1);
-lean::closure_set(x_28, 0, x_27);
-x_29 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_29, 0, x_28);
-x_30 = lean::mk_string(" := ");
-x_31 = l_string_trim(x_30);
-lean::inc(x_31);
-x_33 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_33, 0, x_31);
-x_34 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_34, 0, x_31);
-lean::closure_set(x_34, 1, x_10);
-lean::closure_set(x_34, 2, x_33);
-lean::inc(x_19);
-x_36 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_36, 0, x_19);
-lean::cnstr_set(x_36, 1, x_12);
-x_37 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_37, 0, x_34);
-lean::cnstr_set(x_37, 1, x_36);
-x_38 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_38, 0, x_14);
-lean::cnstr_set(x_38, 1, x_37);
-x_39 = l_lean_parser_term_struct__inst__field;
-x_40 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_40, 0, x_39);
-lean::closure_set(x_40, 1, x_38);
-x_41 = lean::mk_string("..");
-x_42 = l_string_trim(x_41);
-lean::inc(x_42);
-x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_44, 0, x_42);
-x_45 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_45, 0, x_42);
-lean::closure_set(x_45, 1, x_10);
-lean::closure_set(x_45, 2, x_44);
-x_46 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
-lean::closure_set(x_46, 0, x_19);
-x_47 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_47, 0, x_46);
-lean::cnstr_set(x_47, 1, x_12);
-x_48 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_48, 0, x_45);
-lean::cnstr_set(x_48, 1, x_47);
-x_49 = l_lean_parser_term_struct__inst__source;
-x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_50, 0, x_49);
-lean::closure_set(x_50, 1, x_48);
-x_51 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_51, 0, x_50);
-lean::cnstr_set(x_51, 1, x_12);
+x_30 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_30, 0, x_21);
+lean::cnstr_set(x_30, 1, x_28);
+x_31 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_struct__inst_parser_lean_parser_has__view___lambda__2), 6, 1);
+lean::closure_set(x_31, 0, x_30);
+x_32 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_32, 0, x_31);
+x_33 = lean::mk_string(" := ");
+x_34 = l_string_trim(x_33);
+lean::dec(x_33);
+lean::inc(x_34);
+x_37 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_37, 0, x_34);
+x_38 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_38, 0, x_34);
+lean::closure_set(x_38, 1, x_12);
+lean::closure_set(x_38, 2, x_37);
+lean::inc(x_21);
+x_40 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_40, 0, x_21);
+lean::cnstr_set(x_40, 1, x_14);
+x_41 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_41, 0, x_38);
+lean::cnstr_set(x_41, 1, x_40);
+x_42 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_42, 0, x_16);
+lean::cnstr_set(x_42, 1, x_41);
+x_43 = l_lean_parser_term_struct__inst__field;
+x_44 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_44, 0, x_43);
+lean::closure_set(x_44, 1, x_42);
+x_45 = lean::mk_string("..");
+x_46 = l_string_trim(x_45);
+lean::dec(x_45);
+lean::inc(x_46);
+x_49 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_49, 0, x_46);
+x_50 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_50, 0, x_46);
+lean::closure_set(x_50, 1, x_12);
+lean::closure_set(x_50, 2, x_49);
+x_51 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_optional___at_lean_parser_command_notation__spec_symbol__quote_parser_lean_parser_has__tokens___spec__7), 6, 1);
+lean::closure_set(x_51, 0, x_21);
 x_52 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_52, 0, x_40);
-lean::cnstr_set(x_52, 1, x_51);
-x_53 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
-lean::closure_set(x_53, 0, x_52);
-lean::closure_set(x_53, 1, x_10);
-x_54 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_54, 0, x_53);
-lean::cnstr_set(x_54, 1, x_12);
-x_55 = l_lean_parser_term_struct__inst__item;
-x_56 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
-lean::closure_set(x_56, 0, x_55);
-lean::closure_set(x_56, 1, x_54);
-x_57 = lean::mk_string(", ");
-x_58 = l_string_trim(x_57);
-lean::inc(x_58);
-x_60 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_60, 0, x_58);
-x_61 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_61, 0, x_58);
-lean::closure_set(x_61, 1, x_10);
-lean::closure_set(x_61, 2, x_60);
-x_62 = 1;
-x_63 = lean::box(x_62);
-x_64 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_64, 0, x_56);
-lean::closure_set(x_64, 1, x_61);
-lean::closure_set(x_64, 2, x_63);
-x_65 = lean::mk_string("}");
-x_66 = l_string_trim(x_65);
-lean::inc(x_66);
-x_68 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_68, 0, x_66);
-x_69 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_69, 0, x_66);
-lean::closure_set(x_69, 1, x_10);
-lean::closure_set(x_69, 2, x_68);
-x_70 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_70, 0, x_69);
-lean::cnstr_set(x_70, 1, x_12);
-x_71 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_71, 0, x_64);
-lean::cnstr_set(x_71, 1, x_70);
-x_72 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_72, 0, x_29);
-lean::cnstr_set(x_72, 1, x_71);
-x_73 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_73, 0, x_18);
-lean::cnstr_set(x_73, 1, x_72);
-x_74 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_74, 0, x_5);
-lean::cnstr_set(x_74, 1, x_73);
-return x_74;
+lean::cnstr_set(x_52, 0, x_51);
+lean::cnstr_set(x_52, 1, x_14);
+x_53 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_53, 0, x_50);
+lean::cnstr_set(x_53, 1, x_52);
+x_54 = l_lean_parser_term_struct__inst__source;
+x_55 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_55, 0, x_54);
+lean::closure_set(x_55, 1, x_53);
+x_56 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_56, 0, x_55);
+lean::cnstr_set(x_56, 1, x_14);
+x_57 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_57, 0, x_44);
+lean::cnstr_set(x_57, 1, x_56);
+x_58 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_choice__aux___main___at_lean_parser_command_notation__spec_precedence__lit_parser_lean_parser_has__tokens___spec__3), 7, 2);
+lean::closure_set(x_58, 0, x_57);
+lean::closure_set(x_58, 1, x_12);
+x_59 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_59, 0, x_58);
+lean::cnstr_set(x_59, 1, x_14);
+x_60 = l_lean_parser_term_struct__inst__item;
+x_61 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_node___at_lean_parser_command_notation__spec_precedence__lit_parser___spec__1), 7, 2);
+lean::closure_set(x_61, 0, x_60);
+lean::closure_set(x_61, 1, x_59);
+x_62 = lean::mk_string(", ");
+x_63 = l_string_trim(x_62);
+lean::dec(x_62);
+lean::inc(x_63);
+x_66 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_66, 0, x_63);
+x_67 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_67, 0, x_63);
+lean::closure_set(x_67, 1, x_12);
+lean::closure_set(x_67, 2, x_66);
+x_68 = 1;
+x_69 = lean::box(x_68);
+x_70 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_combinators_sep__by___at_lean_parser_term_paren_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_70, 0, x_61);
+lean::closure_set(x_70, 1, x_67);
+lean::closure_set(x_70, 2, x_69);
+x_71 = lean::mk_string("}");
+x_72 = l_string_trim(x_71);
+lean::dec(x_71);
+lean::inc(x_72);
+x_75 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_75, 0, x_72);
+x_76 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_76, 0, x_72);
+lean::closure_set(x_76, 1, x_12);
+lean::closure_set(x_76, 2, x_75);
+x_77 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_77, 0, x_76);
+lean::cnstr_set(x_77, 1, x_14);
+x_78 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_78, 0, x_70);
+lean::cnstr_set(x_78, 1, x_77);
+x_79 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_79, 0, x_32);
+lean::cnstr_set(x_79, 1, x_78);
+x_80 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_80, 0, x_20);
+lean::cnstr_set(x_80, 1, x_79);
+x_81 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_81, 0, x_6);
+lean::cnstr_set(x_81, 1, x_80);
+return x_81;
 }
 }
 obj* l_lean_parser_term_struct__inst_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -46180,161 +46386,170 @@ return x_0;
 obj* _init_l_lean_parser_term_subtype_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_14; obj* x_17; obj* x_18; obj* x_20; obj* x_22; obj* x_25; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_12; obj* x_14; obj* x_15; obj* x_17; obj* x_20; obj* x_21; obj* x_23; obj* x_25; obj* x_28; 
 x_0 = lean::mk_string("{");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = lean::mk_string("//");
-x_5 = lean::mk_nat_obj(0u);
-x_6 = l_lean_parser_symbol_tokens___rarg(x_4, x_5);
-x_7 = lean::mk_string("}");
-x_8 = l_lean_parser_symbol_tokens___rarg(x_7, x_5);
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_8, x_3);
-lean::dec(x_8);
-x_11 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_11, x_9);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = lean::mk_string("//");
+x_6 = lean::mk_nat_obj(0u);
+x_7 = l_lean_parser_symbol_tokens___rarg(x_5, x_6);
+lean::dec(x_5);
+x_9 = lean::mk_string("}");
+x_10 = l_lean_parser_symbol_tokens___rarg(x_9, x_6);
 lean::dec(x_9);
-x_14 = l_lean_parser_list_cons_tokens___rarg(x_6, x_12);
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_10, x_4);
+lean::dec(x_10);
+x_14 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_15 = l_lean_parser_list_cons_tokens___rarg(x_14, x_12);
 lean::dec(x_12);
-lean::dec(x_6);
-x_17 = l_lean_parser_term_opt__type_parser_lean_parser_has__tokens;
-x_18 = l_lean_parser_list_cons_tokens___rarg(x_17, x_14);
-lean::dec(x_14);
-x_20 = l_lean_parser_list_cons_tokens___rarg(x_3, x_18);
-lean::dec(x_18);
-x_22 = l_lean_parser_list_cons_tokens___rarg(x_2, x_20);
-lean::dec(x_20);
+x_17 = l_lean_parser_list_cons_tokens___rarg(x_7, x_15);
+lean::dec(x_15);
+lean::dec(x_7);
+x_20 = l_lean_parser_term_opt__type_parser_lean_parser_has__tokens;
+x_21 = l_lean_parser_list_cons_tokens___rarg(x_20, x_17);
+lean::dec(x_17);
+x_23 = l_lean_parser_list_cons_tokens___rarg(x_4, x_21);
+lean::dec(x_21);
+x_25 = l_lean_parser_list_cons_tokens___rarg(x_2, x_23);
+lean::dec(x_23);
 lean::dec(x_2);
-x_25 = l_lean_parser_tokens___rarg(x_22);
-lean::dec(x_22);
-return x_25;
+x_28 = l_lean_parser_tokens___rarg(x_25);
+lean::dec(x_25);
+return x_28;
 }
 }
 obj* _init_l_lean_parser_term_subtype_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; obj* x_30; obj* x_31; obj* x_32; obj* x_33; obj* x_34; obj* x_35; obj* x_36; 
 x_0 = lean::mk_string("{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("//");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::mk_nat_obj(0u);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_7);
-lean::closure_set(x_11, 1, x_10);
-lean::closure_set(x_11, 2, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_12, 0, x_10);
-x_13 = lean::mk_string("}");
-x_14 = l_string_trim(x_13);
-lean::inc(x_14);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_16, 0, x_14);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_17, 0, x_14);
-lean::closure_set(x_17, 1, x_10);
-lean::closure_set(x_17, 2, x_16);
-x_18 = lean::box(0);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_17);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_12);
-lean::cnstr_set(x_20, 1, x_19);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_11);
-lean::cnstr_set(x_21, 1, x_20);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("//");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::mk_nat_obj(0u);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_8);
+lean::closure_set(x_13, 1, x_12);
+lean::closure_set(x_13, 2, x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_14, 0, x_12);
+x_15 = lean::mk_string("}");
+x_16 = l_string_trim(x_15);
+lean::dec(x_15);
+lean::inc(x_16);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_19, 0, x_16);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_20, 0, x_16);
+lean::closure_set(x_20, 1, x_12);
+lean::closure_set(x_20, 2, x_19);
+x_21 = lean::box(0);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_20);
+lean::cnstr_set(x_22, 1, x_21);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_22);
-lean::cnstr_set(x_23, 1, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_23);
+lean::cnstr_set(x_23, 0, x_14);
+lean::cnstr_set(x_23, 1, x_22);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_13);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
 x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_5);
-lean::cnstr_set(x_26, 1, x_25);
-x_27 = l_lean_parser_term__parser__m_monad;
-x_28 = l_lean_parser_term__parser__m_monad__except;
-x_29 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_30 = l_lean_parser_term__parser__m_alternative;
-x_31 = l_lean_parser_term_subtype;
-x_32 = l_lean_parser_term_subtype_has__view;
-x_33 = l_lean_parser_combinators_node_view___rarg(x_27, x_28, x_29, x_30, x_31, x_26, x_32);
-lean::dec(x_26);
-return x_33;
+lean::cnstr_set(x_26, 0, x_25);
+lean::cnstr_set(x_26, 1, x_24);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_26);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_6);
+lean::cnstr_set(x_29, 1, x_28);
+x_30 = l_lean_parser_term__parser__m_monad;
+x_31 = l_lean_parser_term__parser__m_monad__except;
+x_32 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_33 = l_lean_parser_term__parser__m_alternative;
+x_34 = l_lean_parser_term_subtype;
+x_35 = l_lean_parser_term_subtype_has__view;
+x_36 = l_lean_parser_combinators_node_view___rarg(x_30, x_31, x_32, x_33, x_34, x_29, x_35);
+lean::dec(x_29);
+return x_36;
 }
 }
 obj* _init_l_lean_parser_term_subtype_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; obj* x_26; obj* x_27; obj* x_28; obj* x_29; 
 x_0 = lean::mk_string("{");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_string("//");
-x_7 = l_string_trim(x_6);
-lean::inc(x_7);
-x_9 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_9, 0, x_7);
-x_10 = lean::mk_nat_obj(0u);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_11, 0, x_7);
-lean::closure_set(x_11, 1, x_10);
-lean::closure_set(x_11, 2, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_12, 0, x_10);
-x_13 = lean::mk_string("}");
-x_14 = l_string_trim(x_13);
-lean::inc(x_14);
-x_16 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_16, 0, x_14);
-x_17 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_17, 0, x_14);
-lean::closure_set(x_17, 1, x_10);
-lean::closure_set(x_17, 2, x_16);
-x_18 = lean::box(0);
-x_19 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_19, 0, x_17);
-lean::cnstr_set(x_19, 1, x_18);
-x_20 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_20, 0, x_12);
-lean::cnstr_set(x_20, 1, x_19);
-x_21 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_21, 0, x_11);
-lean::cnstr_set(x_21, 1, x_20);
-x_22 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_string("//");
+x_8 = l_string_trim(x_7);
+lean::dec(x_7);
+lean::inc(x_8);
+x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_11, 0, x_8);
+x_12 = lean::mk_nat_obj(0u);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_13, 0, x_8);
+lean::closure_set(x_13, 1, x_12);
+lean::closure_set(x_13, 2, x_11);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_14, 0, x_12);
+x_15 = lean::mk_string("}");
+x_16 = l_string_trim(x_15);
+lean::dec(x_15);
+lean::inc(x_16);
+x_19 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_19, 0, x_16);
+x_20 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_20, 0, x_16);
+lean::closure_set(x_20, 1, x_12);
+lean::closure_set(x_20, 2, x_19);
+x_21 = lean::box(0);
+x_22 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_22, 0, x_20);
+lean::cnstr_set(x_22, 1, x_21);
 x_23 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_23, 0, x_22);
-lean::cnstr_set(x_23, 1, x_21);
-x_24 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
-x_25 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_25, 0, x_24);
-lean::cnstr_set(x_25, 1, x_23);
+lean::cnstr_set(x_23, 0, x_14);
+lean::cnstr_set(x_23, 1, x_22);
+x_24 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_24, 0, x_13);
+lean::cnstr_set(x_24, 1, x_23);
+x_25 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_opt__type_parser), 5, 0);
 x_26 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_26, 0, x_5);
-lean::cnstr_set(x_26, 1, x_25);
-return x_26;
+lean::cnstr_set(x_26, 0, x_25);
+lean::cnstr_set(x_26, 1, x_24);
+x_27 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_ident_parser___at_lean_parser_command_notation__spec_fold__action_parser_lean_parser_has__tokens___spec__4___boxed), 1, 0);
+x_28 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_28, 0, x_27);
+lean::cnstr_set(x_28, 1, x_26);
+x_29 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_29, 0, x_6);
+lean::cnstr_set(x_29, 1, x_28);
+return x_29;
 }
 }
 obj* l_lean_parser_term_subtype_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -46975,111 +47190,117 @@ return x_0;
 obj* _init_l_lean_parser_term_inaccessible_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_10; obj* x_12; obj* x_15; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_14; obj* x_17; 
 x_0 = lean::mk_string(".(");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::mk_string(")");
-x_4 = lean::mk_nat_obj(0u);
-x_5 = l_lean_parser_symbol_tokens___rarg(x_3, x_4);
-x_6 = lean::box(0);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_5, x_6);
-lean::dec(x_5);
-x_9 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_10 = l_lean_parser_list_cons_tokens___rarg(x_9, x_7);
-lean::dec(x_7);
-x_12 = l_lean_parser_list_cons_tokens___rarg(x_2, x_10);
-lean::dec(x_10);
-lean::dec(x_2);
-x_15 = l_lean_parser_tokens___rarg(x_12);
+lean::dec(x_0);
+x_4 = lean::mk_string(")");
+x_5 = lean::mk_nat_obj(0u);
+x_6 = l_lean_parser_symbol_tokens___rarg(x_4, x_5);
+lean::dec(x_4);
+x_8 = lean::box(0);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_6, x_8);
+lean::dec(x_6);
+x_11 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_12 = l_lean_parser_list_cons_tokens___rarg(x_11, x_9);
+lean::dec(x_9);
+x_14 = l_lean_parser_list_cons_tokens___rarg(x_2, x_12);
 lean::dec(x_12);
-return x_15;
+lean::dec(x_2);
+x_17 = l_lean_parser_tokens___rarg(x_14);
+lean::dec(x_14);
+return x_17;
 }
 }
 obj* _init_l_lean_parser_term_inaccessible_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; obj* x_19; obj* x_20; obj* x_21; obj* x_22; obj* x_23; obj* x_24; obj* x_25; 
 x_0 = lean::mk_string(".(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_nat_obj(0u);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string(")");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_6);
-lean::closure_set(x_12, 2, x_11);
-x_13 = lean::box(0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_12);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_7);
-lean::cnstr_set(x_15, 1, x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_nat_obj(0u);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string(")");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_7);
+lean::closure_set(x_14, 2, x_13);
+x_15 = lean::box(0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_5);
+lean::cnstr_set(x_16, 0, x_14);
 lean::cnstr_set(x_16, 1, x_15);
-x_17 = l_lean_parser_term__parser__m_monad;
-x_18 = l_lean_parser_term__parser__m_monad__except;
-x_19 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_20 = l_lean_parser_term__parser__m_alternative;
-x_21 = l_lean_parser_term_inaccessible;
-x_22 = l_lean_parser_term_inaccessible_has__view;
-x_23 = l_lean_parser_combinators_node_view___rarg(x_17, x_18, x_19, x_20, x_21, x_16, x_22);
-lean::dec(x_16);
-return x_23;
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_8);
+lean::cnstr_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_6);
+lean::cnstr_set(x_18, 1, x_17);
+x_19 = l_lean_parser_term__parser__m_monad;
+x_20 = l_lean_parser_term__parser__m_monad__except;
+x_21 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_22 = l_lean_parser_term__parser__m_alternative;
+x_23 = l_lean_parser_term_inaccessible;
+x_24 = l_lean_parser_term_inaccessible_has__view;
+x_25 = l_lean_parser_combinators_node_view___rarg(x_19, x_20, x_21, x_22, x_23, x_18, x_24);
+lean::dec(x_18);
+return x_25;
 }
 }
 obj* _init_l_lean_parser_term_inaccessible_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; 
 x_0 = lean::mk_string(".(");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::mk_nat_obj(0u);
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::mk_string(")");
-x_9 = l_string_trim(x_8);
-lean::inc(x_9);
-x_11 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_11, 0, x_9);
-x_12 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_12, 0, x_9);
-lean::closure_set(x_12, 1, x_6);
-lean::closure_set(x_12, 2, x_11);
-x_13 = lean::box(0);
-x_14 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_14, 0, x_12);
-lean::cnstr_set(x_14, 1, x_13);
-x_15 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_15, 0, x_7);
-lean::cnstr_set(x_15, 1, x_14);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::mk_nat_obj(0u);
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::mk_string(")");
+x_10 = l_string_trim(x_9);
+lean::dec(x_9);
+lean::inc(x_10);
+x_13 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_13, 0, x_10);
+x_14 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_14, 0, x_10);
+lean::closure_set(x_14, 1, x_7);
+lean::closure_set(x_14, 2, x_13);
+x_15 = lean::box(0);
 x_16 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_16, 0, x_5);
+lean::cnstr_set(x_16, 0, x_14);
 lean::cnstr_set(x_16, 1, x_15);
-return x_16;
+x_17 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_17, 0, x_8);
+lean::cnstr_set(x_17, 1, x_16);
+x_18 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_18, 0, x_6);
+lean::cnstr_set(x_18, 1, x_17);
+return x_18;
 }
 }
 obj* l_lean_parser_term_inaccessible_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -47188,66 +47409,69 @@ return x_0;
 obj* _init_l_lean_parser_term_anonymous__inaccessible_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_6; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; 
 x_0 = lean::mk_string("._");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_2, x_3);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_2, x_4);
 lean::dec(x_2);
-x_6 = l_lean_parser_tokens___rarg(x_4);
-lean::dec(x_4);
-return x_6;
+x_7 = l_lean_parser_tokens___rarg(x_5);
+lean::dec(x_5);
+return x_7;
 }
 }
 obj* _init_l_lean_parser_term_anonymous__inaccessible_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; 
 x_0 = lean::mk_string("._");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-x_8 = l_lean_parser_term__parser__m_monad;
-x_9 = l_lean_parser_term__parser__m_monad__except;
-x_10 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_11 = l_lean_parser_term__parser__m_alternative;
-x_12 = l_lean_parser_term_anonymous__inaccessible;
-x_13 = l_lean_parser_term_anonymous__inaccessible_has__view;
-x_14 = l_lean_parser_combinators_node_view___rarg(x_8, x_9, x_10, x_11, x_12, x_7, x_13);
-lean::dec(x_7);
-return x_14;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+x_9 = l_lean_parser_term__parser__m_monad;
+x_10 = l_lean_parser_term__parser__m_monad__except;
+x_11 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_12 = l_lean_parser_term__parser__m_alternative;
+x_13 = l_lean_parser_term_anonymous__inaccessible;
+x_14 = l_lean_parser_term_anonymous__inaccessible_has__view;
+x_15 = l_lean_parser_combinators_node_view___rarg(x_9, x_10, x_11, x_12, x_13, x_8, x_14);
+lean::dec(x_8);
+return x_15;
 }
 }
 obj* _init_l_lean_parser_term_anonymous__inaccessible_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; 
 x_0 = lean::mk_string("._");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-return x_7;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+return x_8;
 }
 }
 obj* l_lean_parser_term_anonymous__inaccessible_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -47356,66 +47580,69 @@ return x_0;
 obj* _init_l_lean_parser_term_sorry_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_6; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_7; 
 x_0 = lean::mk_string("sorry");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_list_cons_tokens___rarg(x_2, x_3);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_list_cons_tokens___rarg(x_2, x_4);
 lean::dec(x_2);
-x_6 = l_lean_parser_tokens___rarg(x_4);
-lean::dec(x_4);
-return x_6;
+x_7 = l_lean_parser_tokens___rarg(x_5);
+lean::dec(x_5);
+return x_7;
 }
 }
 obj* _init_l_lean_parser_term_sorry_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; 
 x_0 = lean::mk_string("sorry");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-x_8 = l_lean_parser_term__parser__m_monad;
-x_9 = l_lean_parser_term__parser__m_monad__except;
-x_10 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_11 = l_lean_parser_term__parser__m_alternative;
-x_12 = l_lean_parser_term_sorry;
-x_13 = l_lean_parser_term_sorry_has__view;
-x_14 = l_lean_parser_combinators_node_view___rarg(x_8, x_9, x_10, x_11, x_12, x_7, x_13);
-lean::dec(x_7);
-return x_14;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+x_9 = l_lean_parser_term__parser__m_monad;
+x_10 = l_lean_parser_term__parser__m_monad__except;
+x_11 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_12 = l_lean_parser_term__parser__m_alternative;
+x_13 = l_lean_parser_term_sorry;
+x_14 = l_lean_parser_term_sorry_has__view;
+x_15 = l_lean_parser_combinators_node_view___rarg(x_9, x_10, x_11, x_12, x_13, x_8, x_14);
+lean::dec(x_8);
+return x_15;
 }
 }
 obj* _init_l_lean_parser_term_sorry_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; 
 x_0 = lean::mk_string("sorry");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = lean::box(0);
-x_7 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_7, 0, x_5);
-lean::cnstr_set(x_7, 1, x_6);
-return x_7;
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = lean::box(0);
+x_8 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_8, 0, x_6);
+lean::cnstr_set(x_8, 1, x_7);
+return x_8;
 }
 }
 obj* l_lean_parser_term_sorry_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -47692,81 +47919,84 @@ return x_0;
 obj* _init_l_lean_parser_term_borrowed_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_9; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_10; 
 x_0 = lean::mk_string("@&");
 x_1 = l_lean_parser_max__prec;
 x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
-x_3 = lean::box(0);
-x_4 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_5 = l_lean_parser_list_cons_tokens___rarg(x_4, x_3);
-x_6 = l_lean_parser_list_cons_tokens___rarg(x_2, x_5);
-lean::dec(x_5);
-lean::dec(x_2);
-x_9 = l_lean_parser_tokens___rarg(x_6);
+lean::dec(x_0);
+x_4 = lean::box(0);
+x_5 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_6 = l_lean_parser_list_cons_tokens___rarg(x_5, x_4);
+x_7 = l_lean_parser_list_cons_tokens___rarg(x_2, x_6);
 lean::dec(x_6);
-return x_9;
+lean::dec(x_2);
+x_10 = l_lean_parser_tokens___rarg(x_7);
+lean::dec(x_7);
+return x_10;
 }
 }
 obj* _init_l_lean_parser_term_borrowed_parser_lean_parser_has__view() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; obj* x_12; obj* x_13; obj* x_14; obj* x_15; obj* x_16; obj* x_17; obj* x_18; 
 x_0 = lean::mk_string("@&");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = l_lean_parser_term_borrow__prec;
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = l_lean_parser_term_borrow__prec;
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-x_11 = l_lean_parser_term__parser__m_monad;
-x_12 = l_lean_parser_term__parser__m_monad__except;
-x_13 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
-x_14 = l_lean_parser_term__parser__m_alternative;
-x_15 = l_lean_parser_term_borrowed;
-x_16 = l_lean_parser_term_borrowed_has__view;
-x_17 = l_lean_parser_combinators_node_view___rarg(x_11, x_12, x_13, x_14, x_15, x_10, x_16);
-lean::dec(x_10);
-return x_17;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+x_12 = l_lean_parser_term__parser__m_monad;
+x_13 = l_lean_parser_term__parser__m_monad__except;
+x_14 = l_lean_parser_term__parser__m_lean_parser_monad__parsec;
+x_15 = l_lean_parser_term__parser__m_alternative;
+x_16 = l_lean_parser_term_borrowed;
+x_17 = l_lean_parser_term_borrowed_has__view;
+x_18 = l_lean_parser_combinators_node_view___rarg(x_12, x_13, x_14, x_15, x_16, x_11, x_17);
+lean::dec(x_11);
+return x_18;
 }
 }
 obj* _init_l_lean_parser_term_borrowed_parser___closed__1() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; 
+obj* x_0; obj* x_1; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_10; obj* x_11; 
 x_0 = lean::mk_string("@&");
 x_1 = l_string_trim(x_0);
+lean::dec(x_0);
 lean::inc(x_1);
-x_3 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
-lean::closure_set(x_3, 0, x_1);
-x_4 = l_lean_parser_max__prec;
-x_5 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
-lean::closure_set(x_5, 0, x_1);
-lean::closure_set(x_5, 1, x_4);
-lean::closure_set(x_5, 2, x_3);
-x_6 = l_lean_parser_term_borrow__prec;
-x_7 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
-lean::closure_set(x_7, 0, x_6);
-x_8 = lean::box(0);
-x_9 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_9, 0, x_7);
-lean::cnstr_set(x_9, 1, x_8);
+x_4 = lean::alloc_closure(reinterpret_cast<void*>(l_dlist_singleton___rarg), 2, 1);
+lean::closure_set(x_4, 0, x_1);
+x_5 = l_lean_parser_max__prec;
+x_6 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol__core___at_lean_parser_command_notation__spec_precedence__term_parser_lean_parser_has__tokens___spec__1___boxed), 8, 3);
+lean::closure_set(x_6, 0, x_1);
+lean::closure_set(x_6, 1, x_5);
+lean::closure_set(x_6, 2, x_4);
+x_7 = l_lean_parser_term_borrow__prec;
+x_8 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_term_parser), 6, 1);
+lean::closure_set(x_8, 0, x_7);
+x_9 = lean::box(0);
 x_10 = lean::alloc_cnstr(1, 2, 0);
-lean::cnstr_set(x_10, 0, x_5);
+lean::cnstr_set(x_10, 0, x_8);
 lean::cnstr_set(x_10, 1, x_9);
-return x_10;
+x_11 = lean::alloc_cnstr(1, 2, 0);
+lean::cnstr_set(x_11, 0, x_6);
+lean::cnstr_set(x_11, 1, x_10);
+return x_11;
 }
 }
 obj* l_lean_parser_term_borrowed_parser(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4) {
@@ -49977,25 +50207,27 @@ return x_21;
 obj* _init_l_lean_parser_term_arrow_parser_lean_parser_has__tokens() {
 _start:
 {
-obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_4; obj* x_5; obj* x_6; obj* x_7; obj* x_9; obj* x_12; obj* x_13; obj* x_15; 
+obj* x_0; obj* x_1; obj* x_2; obj* x_3; obj* x_6; obj* x_7; obj* x_8; obj* x_9; obj* x_11; obj* x_14; obj* x_15; obj* x_17; 
 x_0 = lean::mk_string("\xe2\x86\x92");
 x_1 = lean::mk_string("->");
 x_2 = lean::mk_nat_obj(25u);
 x_3 = l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg(x_0, x_1, x_2);
-x_4 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
-x_5 = l_lean_parser_tokens___rarg(x_4);
-x_6 = lean::box(0);
-x_7 = l_lean_parser_list_cons_tokens___rarg(x_5, x_6);
-lean::dec(x_5);
-x_9 = l_lean_parser_list_cons_tokens___rarg(x_3, x_7);
+lean::dec(x_1);
+lean::dec(x_0);
+x_6 = l_lean_parser_term_parser_lean_parser_has__tokens___closed__1;
+x_7 = l_lean_parser_tokens___rarg(x_6);
+x_8 = lean::box(0);
+x_9 = l_lean_parser_list_cons_tokens___rarg(x_7, x_8);
 lean::dec(x_7);
-lean::dec(x_3);
-x_12 = l_lean_parser_term_lean_parser_has__tokens;
-x_13 = l_lean_parser_list_cons_tokens___rarg(x_12, x_9);
+x_11 = l_lean_parser_list_cons_tokens___rarg(x_3, x_9);
 lean::dec(x_9);
-x_15 = l_lean_parser_tokens___rarg(x_13);
-lean::dec(x_13);
-return x_15;
+lean::dec(x_3);
+x_14 = l_lean_parser_term_lean_parser_has__tokens;
+x_15 = l_lean_parser_list_cons_tokens___rarg(x_14, x_11);
+lean::dec(x_11);
+x_17 = l_lean_parser_tokens___rarg(x_15);
+lean::dec(x_15);
+return x_17;
 }
 }
 obj* l_lean_parser_unicode__symbol___at_lean_parser_term_arrow_parser_lean_parser_has__tokens___spec__1___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3, obj* x_4, obj* x_5, obj* x_6, obj* x_7, obj* x_8) {
@@ -50003,6 +50235,8 @@ _start:
 {
 obj* x_9; 
 x_9 = l_lean_parser_unicode__symbol___at_lean_parser_term_arrow_parser_lean_parser_has__tokens___spec__1(x_0, x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean::dec(x_0);
+lean::dec(x_1);
 lean::dec(x_3);
 lean::dec(x_4);
 lean::dec(x_6);
diff --git a/src/boot/init/lean/parser/token.cpp b/src/boot/init/lean/parser/token.cpp
index 74bb214727..f720c1ca99 100644
--- a/src/boot/init/lean/parser/token.cpp
+++ b/src/boot/init/lean/parser/token.cpp
@@ -169,6 +169,7 @@ obj* l_lean_parser_string__lit_x_27___closed__1;
 obj* l_lean_parser_symbol_view__default___boxed(obj*);
 obj* l_lean_parser_detail__ident__suffix_has__view_x_27;
 obj* l_lean_parser_monad__parsec_whitespace___at___private_init_lean_parser_token_2__whitespace__aux___main___spec__1(obj*, obj*, obj*);
+obj* l_lean_parser_unicode__symbol___rarg___boxed(obj*, obj*, obj*, obj*);
 obj* l_list_reverse___rarg(obj*);
 obj* l_lean_parser_detail__ident__part_parser_lean_parser_has__view___lambda__1___boxed(obj*, obj*, obj*, obj*, obj*, obj*);
 obj* l_lean_parser_monad__parsec_take__while__cont___at_lean_parser_detail__ident__part_parser___spec__4___boxed(obj*, obj*, obj*, obj*);
@@ -427,6 +428,7 @@ obj* l_lean_parser_token__cont(obj*, obj*, obj*, obj*, obj*);
 obj* l_lean_parser_parsec__t_lookahead___at_lean_parser_peek__token___spec__1(obj*, obj*, obj*);
 obj* l_lean_parser_string__lit_has__view_x_27___lambda__2(obj*);
 obj* l_lean_parser_monad__parsec_take__while___at_lean_parser_detail__ident__part_parser_lean_parser_has__view___spec__8(obj*);
+obj* l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg___boxed(obj*, obj*, obj*);
 obj* l_lean_parser_detail__ident_parser(obj*, obj*, obj*);
 obj* l___private_init_lean_parser_parsec_4__take__while__aux___main___at___private_init_lean_parser_token_4__ident_x_27___spec__7(obj*, obj*, obj*);
 obj* l_lean_parser_monad__parsec_take__while___at_lean_parser_detail__ident__part_parser___spec__8___rarg(obj*, obj*);
@@ -715,6 +717,7 @@ obj* l_lean_parser_detail__ident__part_parser___closed__1;
 obj* l_lean_parser_monad__parsec_take__while___at_lean_parser_detail__ident__part_parser_lean_parser_has__tokens___spec__27(obj*);
 obj* l_lean_parser_number_x_27___lambda__3(obj*, obj*, obj*, obj*);
 obj* l_lean_parser_monad__parsec_take__while__cont___at_lean_parser_parse__oct__lit___spec__2___boxed(obj*, obj*, obj*, obj*, obj*);
+obj* l_lean_parser_symbol_tokens___rarg___boxed(obj*, obj*);
 obj* l_lean_parser_detail__ident__part_parser_lean_parser_has__view;
 obj* l_lean_parser_detail__ident__part_has__view_x_27___lambda__2___closed__2;
 obj* l_lean_parser_parse__bin__lit(obj*, obj*, obj*);
@@ -23325,6 +23328,7 @@ _start:
 {
 obj* x_3; 
 x_3 = l_lean_parser_symbol___rarg(x_0, x_1, x_2);
+lean::dec(x_1);
 lean::dec(x_2);
 return x_3;
 }
@@ -23359,7 +23363,16 @@ obj* l_lean_parser_symbol_tokens(obj* x_0, obj* x_1) {
 _start:
 {
 obj* x_2; 
-x_2 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol_tokens___rarg), 2, 0);
+x_2 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_symbol_tokens___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+obj* l_lean_parser_symbol_tokens___rarg___boxed(obj* x_0, obj* x_1) {
+_start:
+{
+obj* x_2; 
+x_2 = l_lean_parser_symbol_tokens___rarg(x_0, x_1);
+lean::dec(x_0);
 return x_2;
 }
 }
@@ -27057,7 +27070,7 @@ obj* l_lean_parser_unicode__symbol_lean_parser_has__tokens(obj* x_0, obj* x_1) {
 _start:
 {
 obj* x_2; 
-x_2 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg), 3, 0);
+x_2 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg___boxed), 3, 0);
 return x_2;
 }
 }
@@ -27070,6 +27083,16 @@ lean::dec(x_1);
 return x_6;
 }
 }
+obj* l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg___boxed(obj* x_0, obj* x_1, obj* x_2) {
+_start:
+{
+obj* x_3; 
+x_3 = l_lean_parser_unicode__symbol_lean_parser_has__tokens___rarg(x_0, x_1, x_2);
+lean::dec(x_0);
+lean::dec(x_1);
+return x_3;
+}
+}
 obj* l_lean_parser_unicode__symbol_lean_parser_has__tokens___boxed(obj* x_0, obj* x_1) {
 _start:
 {
@@ -27136,6 +27159,8 @@ _start:
 obj* x_4; 
 x_4 = l_lean_parser_unicode__symbol_lean_parser_has__view___rarg(x_0, x_1, x_2, x_3);
 lean::dec(x_0);
+lean::dec(x_1);
+lean::dec(x_2);
 return x_4;
 }
 }
@@ -27186,10 +27211,20 @@ obj* l_lean_parser_unicode__symbol(obj* x_0) {
 _start:
 {
 obj* x_1; 
-x_1 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_unicode__symbol___rarg), 4, 0);
+x_1 = lean::alloc_closure(reinterpret_cast<void*>(l_lean_parser_unicode__symbol___rarg___boxed), 4, 0);
 return x_1;
 }
 }
+obj* l_lean_parser_unicode__symbol___rarg___boxed(obj* x_0, obj* x_1, obj* x_2, obj* x_3) {
+_start:
+{
+obj* x_4; 
+x_4 = l_lean_parser_unicode__symbol___rarg(x_0, x_1, x_2, x_3);
+lean::dec(x_1);
+lean::dec(x_2);
+return x_4;
+}
+}
 obj* l_lean_parser_unicode__symbol___boxed(obj* x_0) {
 _start:
 {
diff --git a/src/runtime/object.cpp b/src/runtime/object.cpp
index d8d3c59c22..5c125535d3 100644
--- a/src/runtime/object.cpp
+++ b/src/runtime/object.cpp
@@ -1619,6 +1619,46 @@ obj_res string_utf8_extract(b_obj_arg s, usize b, usize e) {
     return r;
 }
 
+usize string_utf8_prev(b_obj_arg s, usize i) {
+    usize sz = string_size(s) - 1;
+    if (i == 0 || i > sz) return 0;
+    i--;
+    char const * str = string_cstr(s);
+    while (!is_utf8_first_byte(str[i])) {
+        lean_assert(i > 0);
+        i--;
+    }
+    return i;
+}
+
+static unsigned get_utf8_char_size_at(std::string const & s, usize i) {
+    if (auto sz = get_utf8_first_byte_opt(s[i])) {
+        return *sz;
+    } else {
+        return 1;
+    }
+}
+
+obj_res string_utf8_set(obj_arg s, usize i, uint32 c) {
+    usize sz = string_size(s) - 1;
+    if (i >= sz) return s;
+    char * str = w_string_cstr(s);
+    if (is_exclusive(s)) {
+        if (static_cast<unsigned char>(str[i]) < 128 && c < 128) {
+            str[i] = c;
+            return s;
+        }
+    }
+    if (!is_utf8_first_byte(str[i])) return s;
+    /* TODO(Leo): improve performance of other special cases.
+       Example: is_exclusive(s) and new and old characters have the same size; etc. */
+    std::string tmp;
+    push_unicode_scalar(tmp, c);
+    std::string new_s = string_to_std(s);
+    new_s.replace(i, get_utf8_char_size_at(new_s, i), tmp);
+    return mk_string(new_s);
+}
+
 /* `pos` is in bytes, and `remaining` is in characters */
 static obj_res mk_iterator(obj_arg s, size_t pos, size_t remaining) {
     obj_res r = alloc_cnstr(0, 1, sizeof(size_t)*2);
@@ -1638,14 +1678,6 @@ static void it_set_remaining(u_obj_arg it, size_t r) { cnstr_set_scalar<size_t>(
 static uint32 mk_default_char() { return 65; }
 static bool is_unshared_it_string(b_obj_arg it) { return is_exclusive(it) && !is_shared(cnstr_get(it, 0)); }
 
-static unsigned get_utf8_char_size_at(std::string const & s, unsigned i) {
-    if (auto sz = get_utf8_first_byte_opt(s[i])) {
-        return *sz;
-    } else {
-        return 1;
-    }
-}
-
 obj_res string_mk_iterator(obj_arg s) {
     return mk_iterator(s, 0, string_len(s));
 }
diff --git a/src/runtime/object.h b/src/runtime/object.h
index 867e018755..d00f7f8f95 100644
--- a/src/runtime/object.h
+++ b/src/runtime/object.h
@@ -1166,6 +1166,8 @@ obj_res string_data(obj_arg s);
 inline usize string_utf8_byte_size(b_obj_arg s) { return string_size(s) - 1; }
 uint32 string_utf8_get(b_obj_arg s, usize i);
 usize string_utf8_next(b_obj_arg s, usize i);
+usize string_utf8_prev(b_obj_arg s, usize i);
+obj_res string_utf8_set(obj_arg s, usize i, uint32 c);
 inline uint8 string_utf8_at_end(b_obj_arg s, usize i) { return i >= string_size(s) - 1; }
 obj_res string_utf8_extract(b_obj_arg s, usize b, usize e);
 obj_res string_mk_iterator(obj_arg s);
diff --git a/tests/compiler/str.lean b/tests/compiler/str.lean
index 26c6efae67..189a637eff 100644
--- a/tests/compiler/str.lean
+++ b/tests/compiler/str.lean
@@ -9,12 +9,13 @@ def main : io uint32 :=
 let s₁ := "hello α_world_β" in
 let b  := string.utf8_begin in
 let e  := s₁.utf8_byte_size in
-io.println' (s₁.utf8_extract b e) *>
-io.println' (s₁.utf8_extract (b+2) e) *>
-io.println' (s₁.utf8_extract (b+2) (e-1)) *>
-io.println' (s₁.utf8_extract (b+2) (e-2)) *>
-io.println' (s₁.utf8_extract (b+7) e) *>
-io.println' (s₁.utf8_extract (b+8) e) *>
+io.println' (s₁.extract b e) *>
+io.println' (s₁.extract (b+2) e) *>
+io.println' (s₁.extract (b+2) (e-1)) *>
+io.println' (s₁.extract (b+2) (e-2)) *>
+io.println' (s₁.extract (b+7) e) *>
+io.println' (s₁.extract (b+8) e) *>
 io.println' (to_string e) *>
+io.println' (repr "   aaa   ".trim) *>
 show_chars s₁.utf8_byte_size.to_nat s₁ 0  *>
 pure 0
diff --git a/tests/compiler/str.lean.expected.out b/tests/compiler/str.lean.expected.out
index f02fe3977e..cce88cb562 100644
--- a/tests/compiler/str.lean.expected.out
+++ b/tests/compiler/str.lean.expected.out
@@ -5,6 +5,7 @@ llo α_world_
 
 _world_β
 17
+"aaa"
 >> h
 >> e
 >> l