diff --git a/stage0/src/Lean/Elab/BuiltinNotation.lean b/stage0/src/Lean/Elab/BuiltinNotation.lean
index cd20e4e40d..050e6b41df 100644
--- a/stage0/src/Lean/Elab/BuiltinNotation.lean
+++ b/stage0/src/Lean/Elab/BuiltinNotation.lean
@@ -318,4 +318,8 @@ private def elabCDot (stx : Syntax) (expectedType? : Option Expr) : TermElabM Ex
   discard <| mkInstMVar stWorld
   mkAppM `StateRefT' #[ω, σ, m]
 
+@[builtinTermElab noindex] def elabNoindex : TermElab := fun stx expectedType? => do
+  let e ← elabTerm stx[1] expectedType?
+  return DiscrTree.mkNoindexAnnotation e
+
 end Lean.Elab.Term
diff --git a/stage0/src/Lean/Meta/DiscrTree.lean b/stage0/src/Lean/Meta/DiscrTree.lean
index 0ee6c2741d..bcb2341812 100644
--- a/stage0/src/Lean/Meta/DiscrTree.lean
+++ b/stage0/src/Lean/Meta/DiscrTree.lean
@@ -175,33 +175,43 @@ private partial def whnfEta (e : Expr) : MetaM Expr := do
 private def shouldAddAsStar (constName : Name) : Bool :=
   constName == `Nat.zero || constName == `Nat.succ
 
+def mkNoindexAnnotation (e : Expr) : Expr :=
+  mkAnnotation `noindex e
+
+def hasNoindexAnnotation (e : Expr) : Bool :=
+  annotation? `noindex e |>.isSome
+
 private def pushArgs (todo : Array Expr) (e : Expr) : MetaM (Key × Array Expr) := do
-  let e ← whnfEta e
-  let fn := e.getAppFn
-  let push (k : Key) (nargs : Nat) : MetaM (Key × Array Expr) := do
-    let info ← getFunInfoNArgs fn nargs
-    let todo ← pushArgsAux info.paramInfo (nargs-1) e todo
-    pure (k, todo)
-  match fn with
-  | Expr.lit v _       => pure (Key.lit v, todo)
-  | Expr.const c _ _   =>
-    if shouldAddAsStar c then
-      pure (Key.star, todo)
-    else
+  if hasNoindexAnnotation e then
+    return (Key.star, todo)
+  else
+    let e ← whnfEta e
+    let fn := e.getAppFn
+    let push (k : Key) (nargs : Nat) : MetaM (Key × Array Expr) := do
+      let info ← getFunInfoNArgs fn nargs
+      let todo ← pushArgsAux info.paramInfo (nargs-1) e todo
+      return (k, todo)
+    match fn with
+    | Expr.lit v _       => return (Key.lit v, todo)
+    | Expr.const c _ _   =>
+      if shouldAddAsStar c then
+        return (Key.star, todo)
+      else
+        let nargs := e.getAppNumArgs
+        push (Key.const c nargs) nargs
+    | Expr.fvar fvarId _ =>
       let nargs := e.getAppNumArgs
-      push (Key.const c nargs) nargs
-  | Expr.fvar fvarId _ =>
-    let nargs := e.getAppNumArgs
-    push (Key.fvar fvarId nargs) nargs
-  | Expr.mvar mvarId _ =>
-    if mvarId == tmpMVarId then
-      -- We use `tmp to mark implicit arguments and proofs
-      pure (Key.star, todo)
-    else if (← isReadOnlyOrSyntheticOpaqueExprMVar mvarId) then
-      pure (Key.other, todo)
-    else
-      pure (Key.star, todo)
-  | _ => pure (Key.other, todo)
+      push (Key.fvar fvarId nargs) nargs
+    | Expr.mvar mvarId _ =>
+      if mvarId == tmpMVarId then
+        -- We use `tmp to mark implicit arguments and proofs
+        return (Key.star, todo)
+      else if (← isReadOnlyOrSyntheticOpaqueExprMVar mvarId) then
+        return (Key.other, todo)
+      else
+        return (Key.star, todo)
+    | _ =>
+      return (Key.other, todo)
 
 partial def mkPathAux (todo : Array Expr) (keys : Array Key) : MetaM (Array Key) := do
   if todo.isEmpty then
diff --git a/stage0/stdlib/Lean/Elab/BuiltinNotation.c b/stage0/stdlib/Lean/Elab/BuiltinNotation.c
index 96bc138f45..71d4f6576e 100644
--- a/stage0/stdlib/Lean/Elab/BuiltinNotation.c
+++ b/stage0/stdlib/Lean/Elab/BuiltinNotation.c
@@ -92,6 +92,7 @@ lean_object* l_Lean_Meta_mkDecide___at_Lean_Elab_Term_elabNativeDecide___spec__1
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabNativeDecide___rarg___closed__1;
 extern lean_object* l_myMacro____x40_Init_Data_ToString_Macro___hyg_23____closed__7;
+lean_object* l___regBuiltin_Lean_Elab_Term_elabNoindex(lean_object*);
 lean_object* l_Lean_Elab_Term_elabNativeRefl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_instReprBool___closed__1;
 lean_object* l_Lean_Elab_Term_expandHave___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -141,6 +142,7 @@ lean_object* l_Lean_Elab_Term_elabNativeRefl___closed__2;
 lean_object* l___private_Lean_Meta_AppBuilder_0__Lean_Meta_mkEqReflImp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_tupleTail___elambda__1___closed__2;
 lean_object* l___private_Lean_Elab_BuiltinNotation_0__Lean_Elab_Term_elabParserMacroAux___closed__35;
+extern lean_object* l_Lean_Parser_Term_noindex___elambda__1___closed__2;
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getMainModule___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabAnonymousCtor___closed__6;
@@ -169,8 +171,10 @@ lean_object* l___private_Lean_Elab_BuiltinNotation_0__Lean_Elab_Term_getPropToDe
 lean_object* l_Lean_Elab_Term_mkPairs_loop___closed__4;
 lean_object* l_Lean_Elab_Term_elabParen___closed__2;
 lean_object* l___private_Lean_Elab_BuiltinNotation_0__Lean_Elab_Term_elabParserMacroAux___closed__7;
+lean_object* l_Lean_Meta_DiscrTree_mkNoindexAnnotation(lean_object*);
 lean_object* l___private_Lean_Elab_BuiltinNotation_0__Lean_Elab_Term_elabClosedTerm___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabParen___closed__1;
+lean_object* l___regBuiltin_Lean_Elab_Term_elabNoindex___closed__1;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_BuiltinNotation_0__Lean_Elab_Term_expandCDot___spec__2(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_mkDecideProof___rarg___lambda__1___closed__2;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabTParserMacro(lean_object*);
@@ -193,6 +197,7 @@ extern lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__6
 lean_object* l_Lean_Elab_Term_tryPostponeIfNoneOrMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabPanic_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_BuiltinNotation_0__Lean_Elab_Term_elabParserMacroAux___closed__20;
+lean_object* l_Lean_Elab_Term_elabNoindex___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_emptyC___elambda__1___closed__2;
 lean_object* l___private_Lean_Elab_BuiltinNotation_0__Lean_Elab_Term_elabTParserMacroAux___closed__3;
 lean_object* l___private_Lean_Elab_BuiltinNotation_0__Lean_Elab_Term_elabParserMacroAux___closed__10;
@@ -262,6 +267,7 @@ lean_object* l_Lean_Elab_Term_elabTParserMacro___closed__1;
 lean_object* l___regBuiltin_Lean_Elab_Term_expandSuffices(lean_object*);
 lean_object* l_Lean_Elab_Term_elabNativeRefl___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabDecide(lean_object*);
+lean_object* l_Lean_Elab_Term_elabNoindex(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabPanic___closed__5;
 lean_object* l_Lean_Meta_mkEqRefl___at_Lean_Elab_Term_elabNativeRefl___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabSubst_match__2(lean_object*);
@@ -15136,6 +15142,93 @@ x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
+lean_object* l_Lean_Elab_Term_elabNoindex(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; lean_object* x_11; uint8_t x_12; lean_object* x_13; 
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = l_Lean_Syntax_getArg(x_1, x_10);
+x_12 = 1;
+x_13 = l_Lean_Elab_Term_elabTerm(x_11, x_2, x_12, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_13) == 0)
+{
+uint8_t x_14; 
+x_14 = !lean_is_exclusive(x_13);
+if (x_14 == 0)
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_ctor_get(x_13, 0);
+x_16 = l_Lean_Meta_DiscrTree_mkNoindexAnnotation(x_15);
+lean_ctor_set(x_13, 0, x_16);
+return x_13;
+}
+else
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_17 = lean_ctor_get(x_13, 0);
+x_18 = lean_ctor_get(x_13, 1);
+lean_inc(x_18);
+lean_inc(x_17);
+lean_dec(x_13);
+x_19 = l_Lean_Meta_DiscrTree_mkNoindexAnnotation(x_17);
+x_20 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_18);
+return x_20;
+}
+}
+else
+{
+uint8_t x_21; 
+x_21 = !lean_is_exclusive(x_13);
+if (x_21 == 0)
+{
+return x_13;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = lean_ctor_get(x_13, 0);
+x_23 = lean_ctor_get(x_13, 1);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_dec(x_13);
+x_24 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_24, 0, x_22);
+lean_ctor_set(x_24, 1, x_23);
+return x_24;
+}
+}
+}
+}
+lean_object* l_Lean_Elab_Term_elabNoindex___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l_Lean_Elab_Term_elabNoindex(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_1);
+return x_10;
+}
+}
+static lean_object* _init_l___regBuiltin_Lean_Elab_Term_elabNoindex___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabNoindex___boxed), 9, 0);
+return x_1;
+}
+}
+lean_object* l___regBuiltin_Lean_Elab_Term_elabNoindex(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_2 = l_Lean_Elab_Term_termElabAttribute;
+x_3 = l_Lean_Parser_Term_noindex___elambda__1___closed__2;
+x_4 = l___regBuiltin_Lean_Elab_Term_elabNoindex___closed__1;
+x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
+return x_5;
+}
+}
 lean_object* initialize_Init(lean_object*);
 lean_object* initialize_Init_Data_ToString(lean_object*);
 lean_object* initialize_Lean_Compiler_BorrowedAnnotation(lean_object*);
@@ -15566,6 +15659,11 @@ lean_mark_persistent(l___regBuiltin_Lean_Elab_Term_elabStateRefT___closed__1);
 res = l___regBuiltin_Lean_Elab_Term_elabStateRefT(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l___regBuiltin_Lean_Elab_Term_elabNoindex___closed__1 = _init_l___regBuiltin_Lean_Elab_Term_elabNoindex___closed__1();
+lean_mark_persistent(l___regBuiltin_Lean_Elab_Term_elabNoindex___closed__1);
+res = l___regBuiltin_Lean_Elab_Term_elabNoindex(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Lean/Meta/DiscrTree.c b/stage0/stdlib/Lean/Meta/DiscrTree.c
index 5800481d76..8a7d96c09d 100644
--- a/stage0/stdlib/Lean/Meta/DiscrTree.c
+++ b/stage0/stdlib/Lean/Meta/DiscrTree.c
@@ -74,9 +74,11 @@ lean_object* l_Lean_Meta_DiscrTree_getMatch(lean_object*);
 lean_object* l_Std_PersistentHashMap_foldlMAux___at_Lean_Meta_DiscrTree_getUnify___spec__11(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_ctorIdx_match__1(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_format___closed__2;
+uint8_t l_Lean_Meta_DiscrTree_hasNoindexAnnotation(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__6___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_format_match__1(lean_object*);
+lean_object* l_Lean_annotation_x3f(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__7___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getMatch___spec__7___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_getMatch_process_match__2(lean_object*);
@@ -126,6 +128,7 @@ lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_getUnify___spec__4___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_DiscrTree_getUnify___spec__8___rarg(lean_object*, size_t, lean_object*);
+lean_object* l_Lean_Meta_DiscrTree_mkNoindexAnnotation(lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Meta_DiscrTree_getUnify_process___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_map___at_Lean_Meta_DiscrTree_Trie_format___spec__2(lean_object*);
 lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_DiscrTree_insertCore___spec__10___rarg(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -175,6 +178,7 @@ lean_object* l_Std_fmt___at_Lean_Meta_DiscrTree_format___spec__1___rarg(lean_obj
 lean_object* l_Lean_Meta_DiscrTree_getMatch_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getUnify_process___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_mkPathAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_mkAnnotation(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__6(lean_object*);
 lean_object* l_List_format___rarg(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_DiscrTree_insertCore___spec__1(lean_object*);
@@ -252,11 +256,13 @@ lean_object* l_Lean_Meta_DiscrTree_getUnify_process_match__4___rarg(lean_object*
 lean_object* l_Lean_Meta_DiscrTree_instToFormatDiscrTree(lean_object*);
 lean_object* l_Std_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Meta_DiscrTree_insertCore___spec__11___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_getUnify_process_match__2(lean_object*, lean_object*);
+lean_object* l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__2;
 lean_object* l_Lean_Meta_DiscrTree_mkPath___closed__1;
 lean_object* l_Std_PersistentHashMap_find_x3f___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_getStarResult___spec__1(lean_object*);
 size_t l_USize_land(size_t, size_t);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux_match__2(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_DiscrTree_getUnify___spec__6___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__1;
 lean_object* l_Lean_Meta_DiscrTree_Trie_format___rarg___closed__1;
 lean_object* l_Lean_Meta_DiscrTree_getUnify(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_getUnify_match__3(lean_object*);
@@ -347,6 +353,7 @@ lean_object* l_Array_binSearchAux___at_Lean_Meta_DiscrTree_getMatch_process___sp
 lean_object* l_Array_back___at_Lean_Meta_DiscrTree_mkPathAux___spec__1___boxed(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_arity___boxed(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_format_match__1(lean_object*);
+lean_object* l_Lean_Meta_DiscrTree_hasNoindexAnnotation___boxed(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Trie_format_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_Key_lt_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2529,6 +2536,64 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
+static lean_object* _init_l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("noindex");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+lean_object* l_Lean_Meta_DiscrTree_mkNoindexAnnotation(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__2;
+x_3 = l_Lean_mkAnnotation(x_2, x_1);
+return x_3;
+}
+}
+uint8_t l_Lean_Meta_DiscrTree_hasNoindexAnnotation(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__2;
+x_3 = l_Lean_annotation_x3f(x_2, x_1);
+if (lean_obj_tag(x_3) == 0)
+{
+uint8_t x_4; 
+x_4 = 0;
+return x_4;
+}
+else
+{
+uint8_t x_5; 
+lean_dec(x_3);
+x_5 = 1;
+return x_5;
+}
+}
+}
+lean_object* l_Lean_Meta_DiscrTree_hasNoindexAnnotation___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = l_Lean_Meta_DiscrTree_hasNoindexAnnotation(x_1);
+lean_dec(x_1);
+x_3 = lean_box(x_2);
+return x_3;
+}
+}
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
@@ -2619,915 +2684,937 @@ return x_2;
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgs(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
-lean_object* x_8; 
+uint8_t x_8; 
+x_8 = l_Lean_Meta_DiscrTree_hasNoindexAnnotation(x_2);
+if (x_8 == 0)
+{
+lean_object* x_9; 
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_8 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_whnfEta(x_2, x_3, x_4, x_5, x_6, x_7);
-if (lean_obj_tag(x_8) == 0)
+x_9 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_whnfEta(x_2, x_3, x_4, x_5, x_6, x_7);
+if (lean_obj_tag(x_9) == 0)
 {
-uint8_t x_9; 
-x_9 = !lean_is_exclusive(x_8);
-if (x_9 == 0)
+uint8_t x_10; 
+x_10 = !lean_is_exclusive(x_9);
+if (x_10 == 0)
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_10 = lean_ctor_get(x_8, 0);
-x_11 = lean_ctor_get(x_8, 1);
-x_12 = l_Lean_Expr_getAppFn(x_10);
-switch (lean_obj_tag(x_12)) {
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_11 = lean_ctor_get(x_9, 0);
+x_12 = lean_ctor_get(x_9, 1);
+x_13 = l_Lean_Expr_getAppFn(x_11);
+switch (lean_obj_tag(x_13)) {
 case 1:
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-lean_free_object(x_8);
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-x_14 = lean_unsigned_to_nat(0u);
-x_15 = l_Lean_Expr_getAppNumArgsAux(x_10, x_14);
-lean_inc(x_15);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_13);
-lean_ctor_set(x_16, 1, x_15);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+lean_free_object(x_9);
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_unsigned_to_nat(0u);
+x_16 = l_Lean_Expr_getAppNumArgsAux(x_11, x_15);
+lean_inc(x_16);
+x_17 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_17, 0, x_14);
+lean_ctor_set(x_17, 1, x_16);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_15);
-x_17 = l_Lean_Meta_getFunInfoNArgs(x_12, x_15, x_3, x_4, x_5, x_6, x_11);
-if (lean_obj_tag(x_17) == 0)
+lean_inc(x_16);
+x_18 = l_Lean_Meta_getFunInfoNArgs(x_13, x_16, x_3, x_4, x_5, x_6, x_12);
+if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_19 = lean_ctor_get(x_18, 0);
 lean_inc(x_19);
-lean_dec(x_17);
-x_20 = lean_ctor_get(x_18, 0);
+x_20 = lean_ctor_get(x_18, 1);
 lean_inc(x_20);
 lean_dec(x_18);
-x_21 = lean_unsigned_to_nat(1u);
-x_22 = lean_nat_sub(x_15, x_21);
-lean_dec(x_15);
-x_23 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_20, x_22, x_10, x_1, x_3, x_4, x_5, x_6, x_19);
-lean_dec(x_20);
-if (lean_obj_tag(x_23) == 0)
+x_21 = lean_ctor_get(x_19, 0);
+lean_inc(x_21);
+lean_dec(x_19);
+x_22 = lean_unsigned_to_nat(1u);
+x_23 = lean_nat_sub(x_16, x_22);
+lean_dec(x_16);
+x_24 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_21, x_23, x_11, x_1, x_3, x_4, x_5, x_6, x_20);
+lean_dec(x_21);
+if (lean_obj_tag(x_24) == 0)
 {
-uint8_t x_24; 
-x_24 = !lean_is_exclusive(x_23);
-if (x_24 == 0)
+uint8_t x_25; 
+x_25 = !lean_is_exclusive(x_24);
+if (x_25 == 0)
 {
-lean_object* x_25; lean_object* x_26; 
-x_25 = lean_ctor_get(x_23, 0);
-x_26 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_26, 0, x_16);
-lean_ctor_set(x_26, 1, x_25);
-lean_ctor_set(x_23, 0, x_26);
-return x_23;
+lean_object* x_26; lean_object* x_27; 
+x_26 = lean_ctor_get(x_24, 0);
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_17);
+lean_ctor_set(x_27, 1, x_26);
+lean_ctor_set(x_24, 0, x_27);
+return x_24;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_27 = lean_ctor_get(x_23, 0);
-x_28 = lean_ctor_get(x_23, 1);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_28 = lean_ctor_get(x_24, 0);
+x_29 = lean_ctor_get(x_24, 1);
+lean_inc(x_29);
 lean_inc(x_28);
-lean_inc(x_27);
-lean_dec(x_23);
-x_29 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_29, 0, x_16);
-lean_ctor_set(x_29, 1, x_27);
+lean_dec(x_24);
 x_30 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 0, x_17);
 lean_ctor_set(x_30, 1, x_28);
-return x_30;
+x_31 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_31, 0, x_30);
+lean_ctor_set(x_31, 1, x_29);
+return x_31;
 }
 }
 else
 {
-uint8_t x_31; 
-lean_dec(x_16);
-x_31 = !lean_is_exclusive(x_23);
-if (x_31 == 0)
+uint8_t x_32; 
+lean_dec(x_17);
+x_32 = !lean_is_exclusive(x_24);
+if (x_32 == 0)
 {
-return x_23;
+return x_24;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_23, 0);
-x_33 = lean_ctor_get(x_23, 1);
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_24, 0);
+x_34 = lean_ctor_get(x_24, 1);
+lean_inc(x_34);
 lean_inc(x_33);
-lean_inc(x_32);
-lean_dec(x_23);
-x_34 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_34, 0, x_32);
-lean_ctor_set(x_34, 1, x_33);
-return x_34;
+lean_dec(x_24);
+x_35 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_35, 0, x_33);
+lean_ctor_set(x_35, 1, x_34);
+return x_35;
 }
 }
 }
 else
 {
-uint8_t x_35; 
+uint8_t x_36; 
+lean_dec(x_17);
 lean_dec(x_16);
-lean_dec(x_15);
-lean_dec(x_10);
+lean_dec(x_11);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_35 = !lean_is_exclusive(x_17);
-if (x_35 == 0)
+x_36 = !lean_is_exclusive(x_18);
+if (x_36 == 0)
 {
-return x_17;
+return x_18;
 }
 else
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_36 = lean_ctor_get(x_17, 0);
-x_37 = lean_ctor_get(x_17, 1);
+lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_37 = lean_ctor_get(x_18, 0);
+x_38 = lean_ctor_get(x_18, 1);
+lean_inc(x_38);
 lean_inc(x_37);
-lean_inc(x_36);
-lean_dec(x_17);
-x_38 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_38, 0, x_36);
-lean_ctor_set(x_38, 1, x_37);
-return x_38;
+lean_dec(x_18);
+x_39 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_39, 0, x_37);
+lean_ctor_set(x_39, 1, x_38);
+return x_39;
 }
 }
 }
 case 2:
 {
-lean_object* x_39; lean_object* x_40; uint8_t x_41; 
-lean_dec(x_10);
-x_39 = lean_ctor_get(x_12, 0);
-lean_inc(x_39);
-lean_dec(x_12);
-x_40 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_tmpMVarId;
-x_41 = lean_name_eq(x_39, x_40);
-if (x_41 == 0)
+lean_object* x_40; lean_object* x_41; uint8_t x_42; 
+lean_dec(x_11);
+x_40 = lean_ctor_get(x_13, 0);
+lean_inc(x_40);
+lean_dec(x_13);
+x_41 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_tmpMVarId;
+x_42 = lean_name_eq(x_40, x_41);
+if (x_42 == 0)
 {
-lean_object* x_42; 
-lean_free_object(x_8);
-x_42 = l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar(x_39, x_3, x_4, x_5, x_6, x_11);
+lean_object* x_43; 
+lean_free_object(x_9);
+x_43 = l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar(x_40, x_3, x_4, x_5, x_6, x_12);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-if (lean_obj_tag(x_42) == 0)
+if (lean_obj_tag(x_43) == 0)
 {
-lean_object* x_43; uint8_t x_44; 
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-x_44 = lean_unbox(x_43);
-lean_dec(x_43);
-if (x_44 == 0)
-{
-uint8_t x_45; 
-x_45 = !lean_is_exclusive(x_42);
+lean_object* x_44; uint8_t x_45; 
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+x_45 = lean_unbox(x_44);
+lean_dec(x_44);
 if (x_45 == 0)
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_46 = lean_ctor_get(x_42, 0);
-lean_dec(x_46);
-x_47 = lean_box(3);
-x_48 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_48, 0, x_47);
-lean_ctor_set(x_48, 1, x_1);
-lean_ctor_set(x_42, 0, x_48);
-return x_42;
+uint8_t x_46; 
+x_46 = !lean_is_exclusive(x_43);
+if (x_46 == 0)
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_43, 0);
+lean_dec(x_47);
+x_48 = lean_box(3);
+x_49 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_1);
+lean_ctor_set(x_43, 0, x_49);
+return x_43;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-x_49 = lean_ctor_get(x_42, 1);
-lean_inc(x_49);
-lean_dec(x_42);
-x_50 = lean_box(3);
-x_51 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_1);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_50 = lean_ctor_get(x_43, 1);
+lean_inc(x_50);
+lean_dec(x_43);
+x_51 = lean_box(3);
 x_52 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_52, 0, x_51);
-lean_ctor_set(x_52, 1, x_49);
-return x_52;
+lean_ctor_set(x_52, 1, x_1);
+x_53 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_53, 0, x_52);
+lean_ctor_set(x_53, 1, x_50);
+return x_53;
 }
 }
 else
 {
-uint8_t x_53; 
-x_53 = !lean_is_exclusive(x_42);
-if (x_53 == 0)
+uint8_t x_54; 
+x_54 = !lean_is_exclusive(x_43);
+if (x_54 == 0)
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_54 = lean_ctor_get(x_42, 0);
-lean_dec(x_54);
-x_55 = lean_box(4);
-x_56 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_56, 0, x_55);
-lean_ctor_set(x_56, 1, x_1);
-lean_ctor_set(x_42, 0, x_56);
-return x_42;
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_55 = lean_ctor_get(x_43, 0);
+lean_dec(x_55);
+x_56 = lean_box(4);
+x_57 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_57, 1, x_1);
+lean_ctor_set(x_43, 0, x_57);
+return x_43;
 }
 else
 {
-lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_57 = lean_ctor_get(x_42, 1);
-lean_inc(x_57);
-lean_dec(x_42);
-x_58 = lean_box(4);
-x_59 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_59, 0, x_58);
-lean_ctor_set(x_59, 1, x_1);
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
+x_58 = lean_ctor_get(x_43, 1);
+lean_inc(x_58);
+lean_dec(x_43);
+x_59 = lean_box(4);
 x_60 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_60, 0, x_59);
-lean_ctor_set(x_60, 1, x_57);
-return x_60;
+lean_ctor_set(x_60, 1, x_1);
+x_61 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_61, 0, x_60);
+lean_ctor_set(x_61, 1, x_58);
+return x_61;
 }
 }
 }
 else
 {
-uint8_t x_61; 
+uint8_t x_62; 
 lean_dec(x_1);
-x_61 = !lean_is_exclusive(x_42);
-if (x_61 == 0)
+x_62 = !lean_is_exclusive(x_43);
+if (x_62 == 0)
 {
-return x_42;
+return x_43;
 }
 else
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_42, 0);
-x_63 = lean_ctor_get(x_42, 1);
+lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+x_63 = lean_ctor_get(x_43, 0);
+x_64 = lean_ctor_get(x_43, 1);
+lean_inc(x_64);
 lean_inc(x_63);
-lean_inc(x_62);
-lean_dec(x_42);
-x_64 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_64, 0, x_62);
-lean_ctor_set(x_64, 1, x_63);
-return x_64;
+lean_dec(x_43);
+x_65 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_65, 0, x_63);
+lean_ctor_set(x_65, 1, x_64);
+return x_65;
 }
 }
 }
 else
 {
-lean_object* x_65; lean_object* x_66; 
-lean_dec(x_39);
+lean_object* x_66; lean_object* x_67; 
+lean_dec(x_40);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_65 = lean_box(3);
-x_66 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_66, 0, x_65);
-lean_ctor_set(x_66, 1, x_1);
-lean_ctor_set(x_8, 0, x_66);
-return x_8;
+x_66 = lean_box(3);
+x_67 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_67, 0, x_66);
+lean_ctor_set(x_67, 1, x_1);
+lean_ctor_set(x_9, 0, x_67);
+return x_9;
 }
 }
 case 4:
 {
-lean_object* x_67; uint8_t x_68; 
-x_67 = lean_ctor_get(x_12, 0);
-lean_inc(x_67);
-x_68 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar(x_67);
-if (x_68 == 0)
+lean_object* x_68; uint8_t x_69; 
+x_68 = lean_ctor_get(x_13, 0);
+lean_inc(x_68);
+x_69 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar(x_68);
+if (x_69 == 0)
 {
-lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-lean_free_object(x_8);
-x_69 = lean_unsigned_to_nat(0u);
-x_70 = l_Lean_Expr_getAppNumArgsAux(x_10, x_69);
-lean_inc(x_70);
-x_71 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_71, 0, x_67);
-lean_ctor_set(x_71, 1, x_70);
+lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+lean_free_object(x_9);
+x_70 = lean_unsigned_to_nat(0u);
+x_71 = l_Lean_Expr_getAppNumArgsAux(x_11, x_70);
+lean_inc(x_71);
+x_72 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_72, 0, x_68);
+lean_ctor_set(x_72, 1, x_71);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_70);
-x_72 = l_Lean_Meta_getFunInfoNArgs(x_12, x_70, x_3, x_4, x_5, x_6, x_11);
-if (lean_obj_tag(x_72) == 0)
+lean_inc(x_71);
+x_73 = l_Lean_Meta_getFunInfoNArgs(x_13, x_71, x_3, x_4, x_5, x_6, x_12);
+if (lean_obj_tag(x_73) == 0)
 {
-lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_73 = lean_ctor_get(x_72, 0);
-lean_inc(x_73);
-x_74 = lean_ctor_get(x_72, 1);
+lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_74 = lean_ctor_get(x_73, 0);
 lean_inc(x_74);
-lean_dec(x_72);
-x_75 = lean_ctor_get(x_73, 0);
+x_75 = lean_ctor_get(x_73, 1);
 lean_inc(x_75);
 lean_dec(x_73);
-x_76 = lean_unsigned_to_nat(1u);
-x_77 = lean_nat_sub(x_70, x_76);
-lean_dec(x_70);
-x_78 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_75, x_77, x_10, x_1, x_3, x_4, x_5, x_6, x_74);
-lean_dec(x_75);
-if (lean_obj_tag(x_78) == 0)
+x_76 = lean_ctor_get(x_74, 0);
+lean_inc(x_76);
+lean_dec(x_74);
+x_77 = lean_unsigned_to_nat(1u);
+x_78 = lean_nat_sub(x_71, x_77);
+lean_dec(x_71);
+x_79 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_76, x_78, x_11, x_1, x_3, x_4, x_5, x_6, x_75);
+lean_dec(x_76);
+if (lean_obj_tag(x_79) == 0)
 {
-uint8_t x_79; 
-x_79 = !lean_is_exclusive(x_78);
-if (x_79 == 0)
+uint8_t x_80; 
+x_80 = !lean_is_exclusive(x_79);
+if (x_80 == 0)
 {
-lean_object* x_80; lean_object* x_81; 
-x_80 = lean_ctor_get(x_78, 0);
-x_81 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_81, 0, x_71);
-lean_ctor_set(x_81, 1, x_80);
-lean_ctor_set(x_78, 0, x_81);
-return x_78;
+lean_object* x_81; lean_object* x_82; 
+x_81 = lean_ctor_get(x_79, 0);
+x_82 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_82, 0, x_72);
+lean_ctor_set(x_82, 1, x_81);
+lean_ctor_set(x_79, 0, x_82);
+return x_79;
 }
 else
 {
-lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
-x_82 = lean_ctor_get(x_78, 0);
-x_83 = lean_ctor_get(x_78, 1);
+lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; 
+x_83 = lean_ctor_get(x_79, 0);
+x_84 = lean_ctor_get(x_79, 1);
+lean_inc(x_84);
 lean_inc(x_83);
-lean_inc(x_82);
-lean_dec(x_78);
-x_84 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_84, 0, x_71);
-lean_ctor_set(x_84, 1, x_82);
+lean_dec(x_79);
 x_85 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_85, 0, x_84);
+lean_ctor_set(x_85, 0, x_72);
 lean_ctor_set(x_85, 1, x_83);
-return x_85;
+x_86 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_86, 0, x_85);
+lean_ctor_set(x_86, 1, x_84);
+return x_86;
 }
 }
 else
 {
-uint8_t x_86; 
-lean_dec(x_71);
-x_86 = !lean_is_exclusive(x_78);
-if (x_86 == 0)
+uint8_t x_87; 
+lean_dec(x_72);
+x_87 = !lean_is_exclusive(x_79);
+if (x_87 == 0)
 {
-return x_78;
+return x_79;
 }
 else
 {
-lean_object* x_87; lean_object* x_88; lean_object* x_89; 
-x_87 = lean_ctor_get(x_78, 0);
-x_88 = lean_ctor_get(x_78, 1);
+lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+x_88 = lean_ctor_get(x_79, 0);
+x_89 = lean_ctor_get(x_79, 1);
+lean_inc(x_89);
 lean_inc(x_88);
-lean_inc(x_87);
-lean_dec(x_78);
-x_89 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_89, 0, x_87);
-lean_ctor_set(x_89, 1, x_88);
-return x_89;
+lean_dec(x_79);
+x_90 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_90, 0, x_88);
+lean_ctor_set(x_90, 1, x_89);
+return x_90;
 }
 }
 }
 else
 {
-uint8_t x_90; 
+uint8_t x_91; 
+lean_dec(x_72);
 lean_dec(x_71);
-lean_dec(x_70);
-lean_dec(x_10);
+lean_dec(x_11);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_90 = !lean_is_exclusive(x_72);
-if (x_90 == 0)
+x_91 = !lean_is_exclusive(x_73);
+if (x_91 == 0)
 {
-return x_72;
+return x_73;
 }
 else
 {
-lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-x_91 = lean_ctor_get(x_72, 0);
-x_92 = lean_ctor_get(x_72, 1);
+lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+x_92 = lean_ctor_get(x_73, 0);
+x_93 = lean_ctor_get(x_73, 1);
+lean_inc(x_93);
 lean_inc(x_92);
-lean_inc(x_91);
-lean_dec(x_72);
-x_93 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_93, 0, x_91);
-lean_ctor_set(x_93, 1, x_92);
-return x_93;
+lean_dec(x_73);
+x_94 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_94, 0, x_92);
+lean_ctor_set(x_94, 1, x_93);
+return x_94;
 }
 }
 }
 else
 {
-lean_object* x_94; lean_object* x_95; 
-lean_dec(x_67);
-lean_dec(x_12);
-lean_dec(x_10);
+lean_object* x_95; lean_object* x_96; 
+lean_dec(x_68);
+lean_dec(x_13);
+lean_dec(x_11);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_94 = lean_box(3);
-x_95 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_95, 0, x_94);
-lean_ctor_set(x_95, 1, x_1);
-lean_ctor_set(x_8, 0, x_95);
-return x_8;
+x_95 = lean_box(3);
+x_96 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_96, 0, x_95);
+lean_ctor_set(x_96, 1, x_1);
+lean_ctor_set(x_9, 0, x_96);
+return x_9;
 }
 }
 case 9:
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-lean_dec(x_10);
+lean_object* x_97; lean_object* x_98; lean_object* x_99; 
+lean_dec(x_11);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_96 = lean_ctor_get(x_12, 0);
-lean_inc(x_96);
-lean_dec(x_12);
-x_97 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_97, 0, x_96);
-x_98 = lean_alloc_ctor(0, 2, 0);
+x_97 = lean_ctor_get(x_13, 0);
+lean_inc(x_97);
+lean_dec(x_13);
+x_98 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_98, 0, x_97);
-lean_ctor_set(x_98, 1, x_1);
-lean_ctor_set(x_8, 0, x_98);
-return x_8;
+x_99 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_99, 0, x_98);
+lean_ctor_set(x_99, 1, x_1);
+lean_ctor_set(x_9, 0, x_99);
+return x_9;
 }
 default: 
 {
-lean_object* x_99; lean_object* x_100; 
-lean_dec(x_12);
-lean_dec(x_10);
+lean_object* x_100; lean_object* x_101; 
+lean_dec(x_13);
+lean_dec(x_11);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_99 = lean_box(4);
-x_100 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_100, 0, x_99);
-lean_ctor_set(x_100, 1, x_1);
-lean_ctor_set(x_8, 0, x_100);
-return x_8;
+x_100 = lean_box(4);
+x_101 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_101, 0, x_100);
+lean_ctor_set(x_101, 1, x_1);
+lean_ctor_set(x_9, 0, x_101);
+return x_9;
 }
 }
 }
 else
 {
-lean_object* x_101; lean_object* x_102; lean_object* x_103; 
-x_101 = lean_ctor_get(x_8, 0);
-x_102 = lean_ctor_get(x_8, 1);
+lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+x_102 = lean_ctor_get(x_9, 0);
+x_103 = lean_ctor_get(x_9, 1);
+lean_inc(x_103);
 lean_inc(x_102);
-lean_inc(x_101);
-lean_dec(x_8);
-x_103 = l_Lean_Expr_getAppFn(x_101);
-switch (lean_obj_tag(x_103)) {
+lean_dec(x_9);
+x_104 = l_Lean_Expr_getAppFn(x_102);
+switch (lean_obj_tag(x_104)) {
 case 1:
 {
-lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; 
-x_104 = lean_ctor_get(x_103, 0);
-lean_inc(x_104);
-x_105 = lean_unsigned_to_nat(0u);
-x_106 = l_Lean_Expr_getAppNumArgsAux(x_101, x_105);
-lean_inc(x_106);
-x_107 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_107, 0, x_104);
-lean_ctor_set(x_107, 1, x_106);
+lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+x_105 = lean_ctor_get(x_104, 0);
+lean_inc(x_105);
+x_106 = lean_unsigned_to_nat(0u);
+x_107 = l_Lean_Expr_getAppNumArgsAux(x_102, x_106);
+lean_inc(x_107);
+x_108 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_108, 0, x_105);
+lean_ctor_set(x_108, 1, x_107);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_106);
-x_108 = l_Lean_Meta_getFunInfoNArgs(x_103, x_106, x_3, x_4, x_5, x_6, x_102);
-if (lean_obj_tag(x_108) == 0)
+lean_inc(x_107);
+x_109 = l_Lean_Meta_getFunInfoNArgs(x_104, x_107, x_3, x_4, x_5, x_6, x_103);
+if (lean_obj_tag(x_109) == 0)
 {
-lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
-x_109 = lean_ctor_get(x_108, 0);
-lean_inc(x_109);
-x_110 = lean_ctor_get(x_108, 1);
+lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+x_110 = lean_ctor_get(x_109, 0);
 lean_inc(x_110);
-lean_dec(x_108);
-x_111 = lean_ctor_get(x_109, 0);
+x_111 = lean_ctor_get(x_109, 1);
 lean_inc(x_111);
 lean_dec(x_109);
-x_112 = lean_unsigned_to_nat(1u);
-x_113 = lean_nat_sub(x_106, x_112);
-lean_dec(x_106);
-x_114 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_111, x_113, x_101, x_1, x_3, x_4, x_5, x_6, x_110);
-lean_dec(x_111);
-if (lean_obj_tag(x_114) == 0)
+x_112 = lean_ctor_get(x_110, 0);
+lean_inc(x_112);
+lean_dec(x_110);
+x_113 = lean_unsigned_to_nat(1u);
+x_114 = lean_nat_sub(x_107, x_113);
+lean_dec(x_107);
+x_115 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_112, x_114, x_102, x_1, x_3, x_4, x_5, x_6, x_111);
+lean_dec(x_112);
+if (lean_obj_tag(x_115) == 0)
 {
-lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
-x_115 = lean_ctor_get(x_114, 0);
-lean_inc(x_115);
-x_116 = lean_ctor_get(x_114, 1);
+lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; 
+x_116 = lean_ctor_get(x_115, 0);
 lean_inc(x_116);
-if (lean_is_exclusive(x_114)) {
- lean_ctor_release(x_114, 0);
- lean_ctor_release(x_114, 1);
- x_117 = x_114;
+x_117 = lean_ctor_get(x_115, 1);
+lean_inc(x_117);
+if (lean_is_exclusive(x_115)) {
+ lean_ctor_release(x_115, 0);
+ lean_ctor_release(x_115, 1);
+ x_118 = x_115;
 } else {
- lean_dec_ref(x_114);
- x_117 = lean_box(0);
+ lean_dec_ref(x_115);
+ x_118 = lean_box(0);
 }
-x_118 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_118, 0, x_107);
-lean_ctor_set(x_118, 1, x_115);
-if (lean_is_scalar(x_117)) {
- x_119 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_119 = x_117;
-}
-lean_ctor_set(x_119, 0, x_118);
+x_119 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_119, 0, x_108);
 lean_ctor_set(x_119, 1, x_116);
-return x_119;
+if (lean_is_scalar(x_118)) {
+ x_120 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_120 = x_118;
+}
+lean_ctor_set(x_120, 0, x_119);
+lean_ctor_set(x_120, 1, x_117);
+return x_120;
 }
 else
 {
-lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; 
-lean_dec(x_107);
-x_120 = lean_ctor_get(x_114, 0);
-lean_inc(x_120);
-x_121 = lean_ctor_get(x_114, 1);
+lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; 
+lean_dec(x_108);
+x_121 = lean_ctor_get(x_115, 0);
 lean_inc(x_121);
-if (lean_is_exclusive(x_114)) {
- lean_ctor_release(x_114, 0);
- lean_ctor_release(x_114, 1);
- x_122 = x_114;
+x_122 = lean_ctor_get(x_115, 1);
+lean_inc(x_122);
+if (lean_is_exclusive(x_115)) {
+ lean_ctor_release(x_115, 0);
+ lean_ctor_release(x_115, 1);
+ x_123 = x_115;
 } else {
- lean_dec_ref(x_114);
- x_122 = lean_box(0);
+ lean_dec_ref(x_115);
+ x_123 = lean_box(0);
 }
-if (lean_is_scalar(x_122)) {
- x_123 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_123)) {
+ x_124 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_123 = x_122;
+ x_124 = x_123;
 }
-lean_ctor_set(x_123, 0, x_120);
-lean_ctor_set(x_123, 1, x_121);
-return x_123;
+lean_ctor_set(x_124, 0, x_121);
+lean_ctor_set(x_124, 1, x_122);
+return x_124;
 }
 }
 else
 {
-lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
+lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; 
+lean_dec(x_108);
 lean_dec(x_107);
-lean_dec(x_106);
-lean_dec(x_101);
+lean_dec(x_102);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_124 = lean_ctor_get(x_108, 0);
-lean_inc(x_124);
-x_125 = lean_ctor_get(x_108, 1);
+x_125 = lean_ctor_get(x_109, 0);
 lean_inc(x_125);
-if (lean_is_exclusive(x_108)) {
- lean_ctor_release(x_108, 0);
- lean_ctor_release(x_108, 1);
- x_126 = x_108;
+x_126 = lean_ctor_get(x_109, 1);
+lean_inc(x_126);
+if (lean_is_exclusive(x_109)) {
+ lean_ctor_release(x_109, 0);
+ lean_ctor_release(x_109, 1);
+ x_127 = x_109;
 } else {
- lean_dec_ref(x_108);
- x_126 = lean_box(0);
+ lean_dec_ref(x_109);
+ x_127 = lean_box(0);
 }
-if (lean_is_scalar(x_126)) {
- x_127 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_127)) {
+ x_128 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_127 = x_126;
+ x_128 = x_127;
 }
-lean_ctor_set(x_127, 0, x_124);
-lean_ctor_set(x_127, 1, x_125);
-return x_127;
+lean_ctor_set(x_128, 0, x_125);
+lean_ctor_set(x_128, 1, x_126);
+return x_128;
 }
 }
 case 2:
 {
-lean_object* x_128; lean_object* x_129; uint8_t x_130; 
-lean_dec(x_101);
-x_128 = lean_ctor_get(x_103, 0);
-lean_inc(x_128);
-lean_dec(x_103);
-x_129 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_tmpMVarId;
-x_130 = lean_name_eq(x_128, x_129);
-if (x_130 == 0)
+lean_object* x_129; lean_object* x_130; uint8_t x_131; 
+lean_dec(x_102);
+x_129 = lean_ctor_get(x_104, 0);
+lean_inc(x_129);
+lean_dec(x_104);
+x_130 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_tmpMVarId;
+x_131 = lean_name_eq(x_129, x_130);
+if (x_131 == 0)
 {
-lean_object* x_131; 
-x_131 = l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar(x_128, x_3, x_4, x_5, x_6, x_102);
+lean_object* x_132; 
+x_132 = l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar(x_129, x_3, x_4, x_5, x_6, x_103);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-if (lean_obj_tag(x_131) == 0)
+if (lean_obj_tag(x_132) == 0)
 {
-lean_object* x_132; uint8_t x_133; 
-x_132 = lean_ctor_get(x_131, 0);
-lean_inc(x_132);
-x_133 = lean_unbox(x_132);
-lean_dec(x_132);
-if (x_133 == 0)
+lean_object* x_133; uint8_t x_134; 
+x_133 = lean_ctor_get(x_132, 0);
+lean_inc(x_133);
+x_134 = lean_unbox(x_133);
+lean_dec(x_133);
+if (x_134 == 0)
 {
-lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
-x_134 = lean_ctor_get(x_131, 1);
-lean_inc(x_134);
-if (lean_is_exclusive(x_131)) {
- lean_ctor_release(x_131, 0);
- lean_ctor_release(x_131, 1);
- x_135 = x_131;
+lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; 
+x_135 = lean_ctor_get(x_132, 1);
+lean_inc(x_135);
+if (lean_is_exclusive(x_132)) {
+ lean_ctor_release(x_132, 0);
+ lean_ctor_release(x_132, 1);
+ x_136 = x_132;
 } else {
- lean_dec_ref(x_131);
- x_135 = lean_box(0);
-}
-x_136 = lean_box(3);
-x_137 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_137, 0, x_136);
-lean_ctor_set(x_137, 1, x_1);
-if (lean_is_scalar(x_135)) {
- x_138 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_138 = x_135;
+ lean_dec_ref(x_132);
+ x_136 = lean_box(0);
 }
+x_137 = lean_box(3);
+x_138 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_138, 0, x_137);
-lean_ctor_set(x_138, 1, x_134);
-return x_138;
+lean_ctor_set(x_138, 1, x_1);
+if (lean_is_scalar(x_136)) {
+ x_139 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_139 = x_136;
+}
+lean_ctor_set(x_139, 0, x_138);
+lean_ctor_set(x_139, 1, x_135);
+return x_139;
 }
 else
 {
-lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; 
-x_139 = lean_ctor_get(x_131, 1);
-lean_inc(x_139);
-if (lean_is_exclusive(x_131)) {
- lean_ctor_release(x_131, 0);
- lean_ctor_release(x_131, 1);
- x_140 = x_131;
+lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
+x_140 = lean_ctor_get(x_132, 1);
+lean_inc(x_140);
+if (lean_is_exclusive(x_132)) {
+ lean_ctor_release(x_132, 0);
+ lean_ctor_release(x_132, 1);
+ x_141 = x_132;
 } else {
- lean_dec_ref(x_131);
- x_140 = lean_box(0);
-}
-x_141 = lean_box(4);
-x_142 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_142, 0, x_141);
-lean_ctor_set(x_142, 1, x_1);
-if (lean_is_scalar(x_140)) {
- x_143 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_143 = x_140;
+ lean_dec_ref(x_132);
+ x_141 = lean_box(0);
 }
+x_142 = lean_box(4);
+x_143 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_143, 0, x_142);
-lean_ctor_set(x_143, 1, x_139);
-return x_143;
+lean_ctor_set(x_143, 1, x_1);
+if (lean_is_scalar(x_141)) {
+ x_144 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_144 = x_141;
+}
+lean_ctor_set(x_144, 0, x_143);
+lean_ctor_set(x_144, 1, x_140);
+return x_144;
 }
 }
 else
 {
-lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; 
 lean_dec(x_1);
-x_144 = lean_ctor_get(x_131, 0);
-lean_inc(x_144);
-x_145 = lean_ctor_get(x_131, 1);
+x_145 = lean_ctor_get(x_132, 0);
 lean_inc(x_145);
-if (lean_is_exclusive(x_131)) {
- lean_ctor_release(x_131, 0);
- lean_ctor_release(x_131, 1);
- x_146 = x_131;
+x_146 = lean_ctor_get(x_132, 1);
+lean_inc(x_146);
+if (lean_is_exclusive(x_132)) {
+ lean_ctor_release(x_132, 0);
+ lean_ctor_release(x_132, 1);
+ x_147 = x_132;
 } else {
- lean_dec_ref(x_131);
- x_146 = lean_box(0);
+ lean_dec_ref(x_132);
+ x_147 = lean_box(0);
 }
-if (lean_is_scalar(x_146)) {
- x_147 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_147)) {
+ x_148 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_147 = x_146;
+ x_148 = x_147;
 }
-lean_ctor_set(x_147, 0, x_144);
-lean_ctor_set(x_147, 1, x_145);
-return x_147;
+lean_ctor_set(x_148, 0, x_145);
+lean_ctor_set(x_148, 1, x_146);
+return x_148;
 }
 }
 else
 {
-lean_object* x_148; lean_object* x_149; lean_object* x_150; 
-lean_dec(x_128);
+lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+lean_dec(x_129);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_148 = lean_box(3);
-x_149 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_149, 0, x_148);
-lean_ctor_set(x_149, 1, x_1);
+x_149 = lean_box(3);
 x_150 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_150, 0, x_149);
-lean_ctor_set(x_150, 1, x_102);
-return x_150;
+lean_ctor_set(x_150, 1, x_1);
+x_151 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_151, 0, x_150);
+lean_ctor_set(x_151, 1, x_103);
+return x_151;
 }
 }
 case 4:
 {
-lean_object* x_151; uint8_t x_152; 
-x_151 = lean_ctor_get(x_103, 0);
-lean_inc(x_151);
-x_152 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar(x_151);
-if (x_152 == 0)
+lean_object* x_152; uint8_t x_153; 
+x_152 = lean_ctor_get(x_104, 0);
+lean_inc(x_152);
+x_153 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar(x_152);
+if (x_153 == 0)
 {
-lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; 
-x_153 = lean_unsigned_to_nat(0u);
-x_154 = l_Lean_Expr_getAppNumArgsAux(x_101, x_153);
-lean_inc(x_154);
-x_155 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_155, 0, x_151);
-lean_ctor_set(x_155, 1, x_154);
+lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; 
+x_154 = lean_unsigned_to_nat(0u);
+x_155 = l_Lean_Expr_getAppNumArgsAux(x_102, x_154);
+lean_inc(x_155);
+x_156 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_156, 0, x_152);
+lean_ctor_set(x_156, 1, x_155);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-lean_inc(x_154);
-x_156 = l_Lean_Meta_getFunInfoNArgs(x_103, x_154, x_3, x_4, x_5, x_6, x_102);
-if (lean_obj_tag(x_156) == 0)
+lean_inc(x_155);
+x_157 = l_Lean_Meta_getFunInfoNArgs(x_104, x_155, x_3, x_4, x_5, x_6, x_103);
+if (lean_obj_tag(x_157) == 0)
 {
-lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; 
-x_157 = lean_ctor_get(x_156, 0);
-lean_inc(x_157);
-x_158 = lean_ctor_get(x_156, 1);
+lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; 
+x_158 = lean_ctor_get(x_157, 0);
 lean_inc(x_158);
-lean_dec(x_156);
-x_159 = lean_ctor_get(x_157, 0);
+x_159 = lean_ctor_get(x_157, 1);
 lean_inc(x_159);
 lean_dec(x_157);
-x_160 = lean_unsigned_to_nat(1u);
-x_161 = lean_nat_sub(x_154, x_160);
-lean_dec(x_154);
-x_162 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_159, x_161, x_101, x_1, x_3, x_4, x_5, x_6, x_158);
-lean_dec(x_159);
-if (lean_obj_tag(x_162) == 0)
+x_160 = lean_ctor_get(x_158, 0);
+lean_inc(x_160);
+lean_dec(x_158);
+x_161 = lean_unsigned_to_nat(1u);
+x_162 = lean_nat_sub(x_155, x_161);
+lean_dec(x_155);
+x_163 = l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_pushArgsAux(x_160, x_162, x_102, x_1, x_3, x_4, x_5, x_6, x_159);
+lean_dec(x_160);
+if (lean_obj_tag(x_163) == 0)
 {
-lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; 
-x_163 = lean_ctor_get(x_162, 0);
-lean_inc(x_163);
-x_164 = lean_ctor_get(x_162, 1);
+lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; 
+x_164 = lean_ctor_get(x_163, 0);
 lean_inc(x_164);
-if (lean_is_exclusive(x_162)) {
- lean_ctor_release(x_162, 0);
- lean_ctor_release(x_162, 1);
- x_165 = x_162;
+x_165 = lean_ctor_get(x_163, 1);
+lean_inc(x_165);
+if (lean_is_exclusive(x_163)) {
+ lean_ctor_release(x_163, 0);
+ lean_ctor_release(x_163, 1);
+ x_166 = x_163;
 } else {
- lean_dec_ref(x_162);
- x_165 = lean_box(0);
+ lean_dec_ref(x_163);
+ x_166 = lean_box(0);
 }
-x_166 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_166, 0, x_155);
-lean_ctor_set(x_166, 1, x_163);
-if (lean_is_scalar(x_165)) {
- x_167 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_167 = x_165;
-}
-lean_ctor_set(x_167, 0, x_166);
+x_167 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_167, 0, x_156);
 lean_ctor_set(x_167, 1, x_164);
-return x_167;
+if (lean_is_scalar(x_166)) {
+ x_168 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_168 = x_166;
+}
+lean_ctor_set(x_168, 0, x_167);
+lean_ctor_set(x_168, 1, x_165);
+return x_168;
 }
 else
 {
-lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; 
-lean_dec(x_155);
-x_168 = lean_ctor_get(x_162, 0);
-lean_inc(x_168);
-x_169 = lean_ctor_get(x_162, 1);
+lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 
+lean_dec(x_156);
+x_169 = lean_ctor_get(x_163, 0);
 lean_inc(x_169);
-if (lean_is_exclusive(x_162)) {
- lean_ctor_release(x_162, 0);
- lean_ctor_release(x_162, 1);
- x_170 = x_162;
+x_170 = lean_ctor_get(x_163, 1);
+lean_inc(x_170);
+if (lean_is_exclusive(x_163)) {
+ lean_ctor_release(x_163, 0);
+ lean_ctor_release(x_163, 1);
+ x_171 = x_163;
 } else {
- lean_dec_ref(x_162);
- x_170 = lean_box(0);
+ lean_dec_ref(x_163);
+ x_171 = lean_box(0);
 }
-if (lean_is_scalar(x_170)) {
- x_171 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_171)) {
+ x_172 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_171 = x_170;
+ x_172 = x_171;
 }
-lean_ctor_set(x_171, 0, x_168);
-lean_ctor_set(x_171, 1, x_169);
-return x_171;
+lean_ctor_set(x_172, 0, x_169);
+lean_ctor_set(x_172, 1, x_170);
+return x_172;
 }
 }
 else
 {
-lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; 
+lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; 
+lean_dec(x_156);
 lean_dec(x_155);
-lean_dec(x_154);
-lean_dec(x_101);
+lean_dec(x_102);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_172 = lean_ctor_get(x_156, 0);
-lean_inc(x_172);
-x_173 = lean_ctor_get(x_156, 1);
+x_173 = lean_ctor_get(x_157, 0);
 lean_inc(x_173);
-if (lean_is_exclusive(x_156)) {
- lean_ctor_release(x_156, 0);
- lean_ctor_release(x_156, 1);
- x_174 = x_156;
+x_174 = lean_ctor_get(x_157, 1);
+lean_inc(x_174);
+if (lean_is_exclusive(x_157)) {
+ lean_ctor_release(x_157, 0);
+ lean_ctor_release(x_157, 1);
+ x_175 = x_157;
 } else {
- lean_dec_ref(x_156);
- x_174 = lean_box(0);
+ lean_dec_ref(x_157);
+ x_175 = lean_box(0);
 }
-if (lean_is_scalar(x_174)) {
- x_175 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_175)) {
+ x_176 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_175 = x_174;
+ x_176 = x_175;
 }
-lean_ctor_set(x_175, 0, x_172);
-lean_ctor_set(x_175, 1, x_173);
-return x_175;
+lean_ctor_set(x_176, 0, x_173);
+lean_ctor_set(x_176, 1, x_174);
+return x_176;
 }
 }
 else
 {
-lean_object* x_176; lean_object* x_177; lean_object* x_178; 
-lean_dec(x_151);
-lean_dec(x_103);
-lean_dec(x_101);
+lean_object* x_177; lean_object* x_178; lean_object* x_179; 
+lean_dec(x_152);
+lean_dec(x_104);
+lean_dec(x_102);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_176 = lean_box(3);
-x_177 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_177, 0, x_176);
-lean_ctor_set(x_177, 1, x_1);
+x_177 = lean_box(3);
 x_178 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_178, 0, x_177);
-lean_ctor_set(x_178, 1, x_102);
-return x_178;
+lean_ctor_set(x_178, 1, x_1);
+x_179 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_179, 0, x_178);
+lean_ctor_set(x_179, 1, x_103);
+return x_179;
 }
 }
 case 9:
 {
-lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; 
-lean_dec(x_101);
+lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; 
+lean_dec(x_102);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_179 = lean_ctor_get(x_103, 0);
-lean_inc(x_179);
-lean_dec(x_103);
-x_180 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_180, 0, x_179);
-x_181 = lean_alloc_ctor(0, 2, 0);
+x_180 = lean_ctor_get(x_104, 0);
+lean_inc(x_180);
+lean_dec(x_104);
+x_181 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_181, 0, x_180);
-lean_ctor_set(x_181, 1, x_1);
 x_182 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_182, 0, x_181);
-lean_ctor_set(x_182, 1, x_102);
-return x_182;
+lean_ctor_set(x_182, 1, x_1);
+x_183 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_183, 0, x_182);
+lean_ctor_set(x_183, 1, x_103);
+return x_183;
 }
 default: 
 {
-lean_object* x_183; lean_object* x_184; lean_object* x_185; 
-lean_dec(x_103);
-lean_dec(x_101);
+lean_object* x_184; lean_object* x_185; lean_object* x_186; 
+lean_dec(x_104);
+lean_dec(x_102);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_183 = lean_box(4);
-x_184 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_184, 0, x_183);
-lean_ctor_set(x_184, 1, x_1);
+x_184 = lean_box(4);
 x_185 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_185, 0, x_184);
-lean_ctor_set(x_185, 1, x_102);
-return x_185;
+lean_ctor_set(x_185, 1, x_1);
+x_186 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_186, 0, x_185);
+lean_ctor_set(x_186, 1, x_103);
+return x_186;
 }
 }
 }
 }
 else
 {
-uint8_t x_186; 
+uint8_t x_187; 
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_186 = !lean_is_exclusive(x_8);
-if (x_186 == 0)
+x_187 = !lean_is_exclusive(x_9);
+if (x_187 == 0)
 {
-return x_8;
+return x_9;
 }
 else
 {
-lean_object* x_187; lean_object* x_188; lean_object* x_189; 
-x_187 = lean_ctor_get(x_8, 0);
-x_188 = lean_ctor_get(x_8, 1);
+lean_object* x_188; lean_object* x_189; lean_object* x_190; 
+x_188 = lean_ctor_get(x_9, 0);
+x_189 = lean_ctor_get(x_9, 1);
+lean_inc(x_189);
 lean_inc(x_188);
-lean_inc(x_187);
-lean_dec(x_8);
-x_189 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_189, 0, x_187);
-lean_ctor_set(x_189, 1, x_188);
-return x_189;
+lean_dec(x_9);
+x_190 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_190, 0, x_188);
+lean_ctor_set(x_190, 1, x_189);
+return x_190;
 }
 }
 }
+else
+{
+lean_object* x_191; lean_object* x_192; lean_object* x_193; 
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_191 = lean_box(3);
+x_192 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_192, 0, x_191);
+lean_ctor_set(x_192, 1, x_1);
+x_193 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_193, 0, x_192);
+lean_ctor_set(x_193, 1, x_7);
+return x_193;
+}
+}
 }
 lean_object* l_Lean_Meta_DiscrTree_mkPathAux_match__1___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
@@ -5890,7 +5977,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Meta_DiscrTree_insertCore___rarg___closed__2;
 x_2 = l_Lean_Meta_DiscrTree_insertCore___rarg___closed__3;
-x_3 = lean_unsigned_to_nat(248u);
+x_3 = lean_unsigned_to_nat(258u);
 x_4 = lean_unsigned_to_nat(23u);
 x_5 = l_Lean_Meta_DiscrTree_insertCore___rarg___closed__4;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -18320,6 +18407,10 @@ l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar___closed_
 lean_mark_persistent(l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar___closed__3);
 l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar___closed__4 = _init_l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar___closed__4();
 lean_mark_persistent(l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_shouldAddAsStar___closed__4);
+l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__1 = _init_l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__1();
+lean_mark_persistent(l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__1);
+l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__2 = _init_l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__2();
+lean_mark_persistent(l_Lean_Meta_DiscrTree_mkNoindexAnnotation___closed__2);
 l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_initCapacity = _init_l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_initCapacity();
 lean_mark_persistent(l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_initCapacity);
 l_Lean_Meta_DiscrTree_mkPath___closed__1 = _init_l_Lean_Meta_DiscrTree_mkPath___closed__1();