diff --git a/stage0/src/Lean/Elab/PatternVar.lean b/stage0/src/Lean/Elab/PatternVar.lean
index 462407dc77..a2d4591c93 100644
--- a/stage0/src/Lean/Elab/PatternVar.lean
+++ b/stage0/src/Lean/Elab/PatternVar.lean
@@ -171,6 +171,9 @@ partial def collect (stx : Syntax) : M Syntax := withRef stx <| withFreshMacroSc
     let lhs ← collect stx[2]
     let rhs ← collect stx[3]
     return stx.setArg 2 lhs |>.setArg 3 rhs
+  else if k == ``Lean.Parser.Term.unop then
+    let arg ← collect stx[2]
+    return stx.setArg 2 arg
   else if k == ``Lean.Parser.Term.inaccessible then
     return stx
   else if k == strLitKind then
diff --git a/stage0/stdlib/Lean/Elab/PatternVar.c b/stage0/stdlib/Lean/Elab/PatternVar.c
index c96638e643..1b3e14056a 100644
--- a/stage0/stdlib/Lean/Elab/PatternVar.c
+++ b/stage0/stdlib/Lean/Elab/PatternVar.c
@@ -16,13 +16,11 @@ extern "C" {
 lean_object* l_List_reverse___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_collectPatternVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__8;
 size_t lean_usize_add(size_t, size_t);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_erase_macro_scopes(lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__2;
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__2;
 lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_getPatternsVars___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -35,7 +33,6 @@ static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__4;
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_pushNewArg___closed__2;
 lean_object* l_Lean_LocalDecl_userName(lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__17;
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__8;
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__3___closed__6;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_processVar___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*);
 lean_object* l_Array_eraseIdx___rarg(lean_object*, lean_object*);
@@ -63,6 +60,7 @@ static lean_object* l_Lean_Elab_Term_CollectPatternVars_instInhabitedState___clo
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processExplicitArg___closed__7;
 lean_object* l_Lean_Syntax_node2(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapSepElemsM___at_Lean_Elab_Term_CollectPatternVars_collect___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__7;
 uint8_t l_Lean_Syntax_structEq(lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___lambda__2___closed__1;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_main___spec__3___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -79,9 +77,11 @@ uint8_t lean_name_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwCtorExpected___spec__1(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at_Lean_Elab_Term_getPatternsVars___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Init_Meta_0__Array_mapSepElemsMAux___at_Lean_Elab_Term_CollectPatternVars_collect___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___closed__1;
 lean_object* l_Lean_mkIdentFrom(lean_object*, lean_object*, uint8_t);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__23;
 static lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__2___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_mkStr2(lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_processVar___closed__2;
 static lean_object* l_Subarray_forInUnsafe_loop___at_Lean_Elab_Term_CollectPatternVars_collect___spec__2___closed__1;
@@ -128,9 +128,10 @@ LEAN_EXPORT lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_Coll
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_samePatternsVariables___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__3;
 static lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__6;
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__4(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_main___spec__3___closed__1;
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__1;
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_main___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__5;
@@ -149,7 +150,6 @@ static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__3___cl
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect___spec__3(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__26;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_getNextParam(lean_object*);
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__5;
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_getPatternsVars___spec__6(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_inheritedTraceOptions;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -158,7 +158,7 @@ lean_object* lean_array_fget(lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___closed__1;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_isDone___boxed(lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11(lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processExplicitArg___closed__1;
 uint8_t l_Lean_Syntax_matchesNull(lean_object*, lean_object*);
@@ -170,8 +170,10 @@ LEAN_EXPORT lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Term_getPatternsVars
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__3___closed__5;
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__2___closed__5;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__2;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_getPatternVarNames(lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__3___closed__3;
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__6;
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_panic___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -182,11 +184,9 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_State_found___defau
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_main___spec__3___closed__3;
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___closed__1;
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__4;
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__2___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_replaceRef(lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__1;
 lean_object* l_Lean_ResolveName_resolveNamespace(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_forM___at_Lean_Elab_Term_getPatternsVars___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__1;
@@ -220,8 +220,9 @@ static lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPa
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_isTracingEnabledFor___at_Lean_Elab_Term_CollectPatternVars_main___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5(lean_object*, size_t, size_t);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_isNextArgAccessible___boxed(lean_object*);
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_State_vars___default___closed__1;
@@ -246,10 +247,10 @@ static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5___cl
 lean_object* l_Lean_mkSepArray(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Subarray_forInUnsafe_loop___at_Lean_Elab_Term_CollectPatternVars_collect___spec__2(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__7;
 lean_object* l_Lean_ResolveName_resolveGlobalName(lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__16;
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__24;
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__3;
 size_t lean_usize_of_nat(lean_object*);
 extern lean_object* l_Lean_NameSet_empty;
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___closed__5;
@@ -260,6 +261,7 @@ LEAN_EXPORT lean_object* l_Lean_addTrace___at_Lean_Elab_Term_CollectPatternVars_
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at_Lean_Elab_Term_getPatternsVars___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__4;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_node6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentArray_push___rarg(lean_object*, lean_object*);
@@ -276,12 +278,12 @@ static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___cl
 static lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__4___closed__1;
 lean_object* l_Lean_Expr_const___override(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect___spec__3___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_instMonadTermElabM;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processExplicitArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mkArray1___rarg(lean_object*);
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__3;
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__1;
 lean_object* l_Lean_Syntax_setArg(lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -295,6 +297,7 @@ LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at_Lean_Elab_Term_getPatternsV
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_main___spec__3(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_List_mapTRAux___at_Lean_Elab_Term_CollectPatternVars_collect_processExplicitArg___spec__2(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__8;
 uint8_t l_Lean_BinderInfo_isExplicit(uint8_t);
 lean_object* l_Lean_Syntax_getKind(lean_object*);
 uint8_t l___private_Lean_Util_Trace_0__Lean_checkTraceOption(lean_object*, lean_object*, lean_object*);
@@ -306,7 +309,7 @@ uint8_t l_Lean_TagAttribute_hasTag(lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__3___closed__2;
 lean_object* l_ReaderT_pure___at_Lean_Elab_liftMacroM___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1___closed__1;
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__3;
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__5;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processImplicitArg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mkArray2___rarg(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_isEqvAux___at___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_samePatternsVariables___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -333,12 +336,12 @@ static lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_getPa
 static lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__1___closed__2;
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__2___closed__1;
 lean_object* l_Lean_expandMacros(lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__29;
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at_Lean_Elab_Term_getPatternsVars___spec__1___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_instInhabitedNamedArg;
 lean_object* l_Lean_Syntax_node1(lean_object*, lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___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*, lean_object*);
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__6;
 LEAN_EXPORT lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_CollectPatternVars_collect___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -365,12 +368,14 @@ lean_object* lean_nat_mod(lean_object*, lean_object*);
 static lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__1___closed__3;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_getPatternVars___lambda__1___closed__2;
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_pushNewArg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at_Lean_Elab_Term_getPatternsVars___spec__1___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppContext___closed__1;
 lean_object* l_Array_findIdx_x3f_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapSepElemsM___at_Lean_Elab_Term_CollectPatternVars_collect___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processExplicitArg___spec__1(size_t, size_t, lean_object*);
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__2;
 uint8_t l_List_isEmpty___rarg(lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_processVar___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_throwError___at_Lean_Elab_Term_CollectPatternVars_collect_processExplicitArg___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -382,10 +387,10 @@ static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__18;
 LEAN_EXPORT lean_object* l_Lean_Elab_liftMacroM___at_Lean_Elab_Term_getPatternsVars___spec__1___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_getPatternsVars___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__2___closed__4;
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__2;
 LEAN_EXPORT lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5___boxed(lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__14;
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__28;
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_getPatternsVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppCore___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__15;
@@ -406,10 +411,8 @@ static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__1;
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_instInhabitedContext;
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppContext___lambda__1___boxed(lean_object*, lean_object*);
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 LEAN_EXPORT uint8_t l_Lean_Elab_Term_CollectPatternVars_collect_processCtorAppContext___lambda__1(lean_object*, lean_object*);
-static lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__1;
 LEAN_EXPORT lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_CollectPatternVars_collect___spec__6(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Meta_getFVarLocalDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_matchPatternAttr;
@@ -1768,7 +1771,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_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__6;
 x_2 = l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__7;
-x_3 = lean_unsigned_to_nat(227u);
+x_3 = lean_unsigned_to_nat(230u);
 x_4 = lean_unsigned_to_nat(15u);
 x_5 = l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__8;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -2012,7 +2015,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_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__6;
 x_2 = l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__7;
-x_3 = lean_unsigned_to_nat(228u);
+x_3 = lean_unsigned_to_nat(231u);
 x_4 = lean_unsigned_to_nat(74u);
 x_5 = l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__8;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -4376,7 +4379,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_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__6;
 x_2 = l_Lean_Elab_Term_CollectPatternVars_collect_pushNewArg___closed__1;
-x_3 = lean_unsigned_to_nat(259u);
+x_3 = lean_unsigned_to_nat(262u);
 x_4 = lean_unsigned_to_nat(11u);
 x_5 = l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___spec__2___closed__8;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@@ -5954,6 +5957,65 @@ LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__7
 _start:
 {
 lean_object* x_11; 
+x_11 = l_Lean_Elab_Term_CollectPatternVars_collect(x_1, x_2, x_3, x_4, x_5, x_6, x_8, x_9, x_10);
+if (lean_obj_tag(x_11) == 0)
+{
+uint8_t x_12; 
+x_12 = !lean_is_exclusive(x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_13 = lean_ctor_get(x_11, 0);
+x_14 = lean_unsigned_to_nat(2u);
+x_15 = l_Lean_Syntax_setArg(x_7, x_14, x_13);
+lean_ctor_set(x_11, 0, x_15);
+return x_11;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_16 = lean_ctor_get(x_11, 0);
+x_17 = lean_ctor_get(x_11, 1);
+lean_inc(x_17);
+lean_inc(x_16);
+lean_dec(x_11);
+x_18 = lean_unsigned_to_nat(2u);
+x_19 = l_Lean_Syntax_setArg(x_7, x_18, x_16);
+x_20 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_17);
+return x_20;
+}
+}
+else
+{
+uint8_t x_21; 
+lean_dec(x_7);
+x_21 = !lean_is_exclusive(x_11);
+if (x_21 == 0)
+{
+return x_11;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = lean_ctor_get(x_11, 0);
+x_23 = lean_ctor_get(x_11, 1);
+lean_inc(x_23);
+lean_inc(x_22);
+lean_dec(x_11);
+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_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8(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, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; 
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_6);
@@ -6061,7 +6123,7 @@ return x_35;
 }
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -6069,16 +6131,16 @@ x_1 = lean_mk_string_from_bytes("_root_.namedPattern", 19);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__2() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__1;
+x_1 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__1;
 x_2 = l_String_toSubstring_x27(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__3() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -6086,7 +6148,7 @@ x_1 = lean_mk_string_from_bytes("_root_", 6);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__4() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -6094,51 +6156,51 @@ x_1 = lean_mk_string_from_bytes("namedPattern", 12);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__5() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__3;
-x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__4;
+x_1 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__3;
+x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__4;
 x_3 = l_Lean_Name_mkStr2(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__6() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__4;
+x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__4;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__7() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__6;
+x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__6;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__8() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__7;
+x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__7;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8(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, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9(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, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
 lean_object* x_13; lean_object* x_14; lean_object* x_15; 
@@ -6188,10 +6250,10 @@ x_27 = lean_ctor_get(x_26, 0);
 lean_inc(x_27);
 lean_dec(x_26);
 x_28 = lean_environment_main_module(x_27);
-x_29 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__5;
+x_29 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__5;
 x_30 = l_Lean_addMacroScope(x_28, x_29, x_23);
-x_31 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__2;
-x_32 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__8;
+x_31 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__2;
+x_32 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__8;
 lean_inc(x_22);
 x_33 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_33, 0, x_22);
@@ -6217,10 +6279,10 @@ x_39 = lean_ctor_get(x_37, 0);
 lean_inc(x_39);
 lean_dec(x_37);
 x_40 = lean_environment_main_module(x_39);
-x_41 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__5;
+x_41 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__5;
 x_42 = l_Lean_addMacroScope(x_40, x_41, x_23);
-x_43 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__2;
-x_44 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__8;
+x_43 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__2;
+x_44 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__8;
 lean_inc(x_22);
 x_45 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_45, 0, x_22);
@@ -6300,7 +6362,7 @@ return x_57;
 }
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -6308,26 +6370,26 @@ x_1 = lean_mk_string_from_bytes("h", 1);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__2() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__1;
+x_1 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__1;
 x_2 = l_String_toSubstring_x27(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__3() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__1;
+x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__1;
 x_3 = l_Lean_Name_str___override(x_1, x_2);
 return x_3;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9(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, lean_object* x_10, lean_object* x_11) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10(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, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 lean_object* x_12; 
@@ -6355,7 +6417,7 @@ lean_object* x_17; lean_object* x_18; lean_object* x_19;
 x_17 = lean_unsigned_to_nat(0u);
 x_18 = l_Lean_Syntax_getArg(x_15, x_17);
 lean_dec(x_15);
-x_19 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8(x_7, x_1, x_8, x_18, x_2, x_3, x_4, x_5, x_6, x_9, x_10, x_13);
+x_19 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9(x_7, x_1, x_8, x_18, x_2, x_3, x_4, x_5, x_6, x_9, x_10, x_13);
 lean_dec(x_7);
 return x_19;
 }
@@ -6379,16 +6441,16 @@ x_27 = lean_ctor_get(x_25, 0);
 lean_inc(x_27);
 lean_dec(x_25);
 x_28 = lean_environment_main_module(x_27);
-x_29 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__3;
+x_29 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__3;
 x_30 = l_Lean_addMacroScope(x_28, x_29, x_23);
 x_31 = lean_box(0);
-x_32 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__2;
+x_32 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__2;
 x_33 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_33, 0, x_22);
 lean_ctor_set(x_33, 1, x_32);
 lean_ctor_set(x_33, 2, x_30);
 lean_ctor_set(x_33, 3, x_31);
-x_34 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8(x_7, x_1, x_8, x_33, x_2, x_3, x_4, x_5, x_6, x_9, x_10, x_26);
+x_34 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9(x_7, x_1, x_8, x_33, x_2, x_3, x_4, x_5, x_6, x_9, x_10, x_26);
 lean_dec(x_7);
 return x_34;
 }
@@ -6427,7 +6489,7 @@ return x_38;
 }
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10(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, lean_object* x_10, lean_object* x_11) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11(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, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 lean_object* x_12; 
@@ -6491,7 +6553,7 @@ return x_29;
 }
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -6499,19 +6561,19 @@ x_1 = lean_mk_string_from_bytes("inaccessible", 12);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__2() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_1 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__3;
 x_2 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__4;
 x_3 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__5;
-x_4 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__1;
+x_4 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__1;
 x_5 = l_Lean_Name_mkStr4(x_1, x_2, x_3, x_4);
 return x_5;
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__3() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -6519,7 +6581,7 @@ x_1 = lean_mk_string_from_bytes(".(", 2);
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; uint8_t x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; 
@@ -6535,7 +6597,7 @@ if (x_9 == 0)
 lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
 x_10 = lean_ctor_get(x_8, 0);
 lean_dec(x_10);
-x_11 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__3;
+x_11 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__3;
 lean_inc(x_7);
 x_12 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_12, 0, x_7);
@@ -6545,7 +6607,7 @@ lean_inc(x_7);
 x_14 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_14, 0, x_7);
 lean_ctor_set(x_14, 1, x_13);
-x_15 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__2;
+x_15 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__2;
 x_16 = l_Lean_Syntax_node3(x_7, x_15, x_12, x_1, x_14);
 lean_ctor_set(x_8, 0, x_16);
 return x_8;
@@ -6556,7 +6618,7 @@ lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean
 x_17 = lean_ctor_get(x_8, 1);
 lean_inc(x_17);
 lean_dec(x_8);
-x_18 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__3;
+x_18 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__3;
 lean_inc(x_7);
 x_19 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_19, 0, x_7);
@@ -6566,7 +6628,7 @@ lean_inc(x_7);
 x_21 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_21, 0, x_7);
 lean_ctor_set(x_21, 1, x_20);
-x_22 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__2;
+x_22 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__2;
 x_23 = l_Lean_Syntax_node3(x_7, x_22, x_19, x_1, x_21);
 x_24 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_24, 0, x_23);
@@ -6575,7 +6637,7 @@ return x_24;
 }
 }
 }
-static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__1() {
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -6583,11 +6645,11 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect), 9
 return x_1;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12(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, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13(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, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; lean_object* x_12; 
-x_11 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__1;
+x_11 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___closed__1;
 x_12 = l_Array_mapSepElemsM___at_Lean_Elab_Term_CollectPatternVars_collect___spec__7(x_1, x_11, x_2, x_3, x_4, x_5, x_6, x_8, x_9, x_10);
 if (lean_obj_tag(x_12) == 0)
 {
@@ -6762,7 +6824,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_obj
 x_1 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__3;
 x_2 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__4;
 x_3 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__5;
-x_4 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__4;
+x_4 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__4;
 x_5 = l_Lean_Name_mkStr4(x_1, x_2, x_3, x_4);
 return x_5;
 }
@@ -6791,25 +6853,27 @@ static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("str", 3);
+x_1 = lean_mk_string_from_bytes("unop", 4);
 return x_1;
 }
 }
 static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__15() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__14;
-x_3 = l_Lean_Name_str___override(x_1, x_2);
-return x_3;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_1 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__3;
+x_2 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__4;
+x_3 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__5;
+x_4 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__14;
+x_5 = l_Lean_Name_mkStr4(x_1, x_2, x_3, x_4);
+return x_5;
 }
 }
 static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__16() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("num", 3);
+x_1 = lean_mk_string_from_bytes("str", 3);
 return x_1;
 }
 }
@@ -6827,7 +6891,7 @@ static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("scientific", 10);
+x_1 = lean_mk_string_from_bytes("num", 3);
 return x_1;
 }
 }
@@ -6845,7 +6909,7 @@ static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("char", 4);
+x_1 = lean_mk_string_from_bytes("scientific", 10);
 return x_1;
 }
 }
@@ -6863,27 +6927,25 @@ static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("quotedName", 10);
+x_1 = lean_mk_string_from_bytes("char", 4);
 return x_1;
 }
 }
 static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__23() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_1 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__3;
-x_2 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__4;
-x_3 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__5;
-x_4 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__22;
-x_5 = l_Lean_Name_mkStr4(x_1, x_2, x_3, x_4);
-return x_5;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__22;
+x_3 = l_Lean_Name_str___override(x_1, x_2);
+return x_3;
 }
 }
 static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__24() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("doubleQuotedName", 16);
+x_1 = lean_mk_string_from_bytes("quotedName", 10);
 return x_1;
 }
 }
@@ -6903,7 +6965,7 @@ static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string_from_bytes("typeAscription", 14);
+x_1 = lean_mk_string_from_bytes("doubleQuotedName", 16);
 return x_1;
 }
 }
@@ -6919,6 +6981,26 @@ x_5 = l_Lean_Name_mkStr4(x_1, x_2, x_3, x_4);
 return x_5;
 }
 }
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__28() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string_from_bytes("typeAscription", 14);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__29() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_1 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__3;
+x_2 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__4;
+x_3 = l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_finalize___closed__5;
+x_4 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__28;
+x_5 = l_Lean_Name_mkStr4(x_1, x_2, x_3, x_4);
+return x_5;
+}
+}
 LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect(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:
 {
@@ -6983,12 +7065,12 @@ x_33 = lean_name_eq(x_10, x_32);
 if (x_33 == 0)
 {
 lean_object* x_34; uint8_t x_35; 
-x_34 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__2;
+x_34 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__15;
 x_35 = lean_name_eq(x_10, x_34);
 if (x_35 == 0)
 {
 lean_object* x_36; uint8_t x_37; 
-x_36 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__15;
+x_36 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__2;
 x_37 = lean_name_eq(x_10, x_36);
 if (x_37 == 0)
 {
@@ -7018,195 +7100,185 @@ x_47 = lean_name_eq(x_10, x_46);
 if (x_47 == 0)
 {
 lean_object* x_48; uint8_t x_49; 
-x_48 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1___closed__2;
+x_48 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__27;
 x_49 = lean_name_eq(x_10, x_48);
-lean_dec(x_10);
 if (x_49 == 0)
 {
 lean_object* x_50; uint8_t x_51; 
-x_50 = l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5___closed__2;
-lean_inc(x_1);
-x_51 = l_Lean_Syntax_isOfKind(x_1, x_50);
+x_50 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1___closed__2;
+x_51 = lean_name_eq(x_10, x_50);
+lean_dec(x_10);
 if (x_51 == 0)
 {
-lean_object* x_52; lean_object* x_53; 
+lean_object* x_52; uint8_t x_53; 
+x_52 = l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5___closed__2;
+lean_inc(x_1);
+x_53 = l_Lean_Syntax_isOfKind(x_1, x_52);
+if (x_53 == 0)
+{
+lean_object* x_54; lean_object* x_55; 
 lean_dec(x_1);
-x_52 = lean_alloc_closure((void*)(l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg), 8, 5);
-lean_closure_set(x_52, 0, x_2);
-lean_closure_set(x_52, 1, x_3);
-lean_closure_set(x_52, 2, x_4);
-lean_closure_set(x_52, 3, x_5);
-lean_closure_set(x_52, 4, x_6);
-x_53 = l_Lean_Core_withFreshMacroScope___rarg(x_52, x_7, x_8, x_9);
-return x_53;
+x_54 = lean_alloc_closure((void*)(l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg), 8, 5);
+lean_closure_set(x_54, 0, x_2);
+lean_closure_set(x_54, 1, x_3);
+lean_closure_set(x_54, 2, x_4);
+lean_closure_set(x_54, 3, x_5);
+lean_closure_set(x_54, 4, x_6);
+x_55 = l_Lean_Core_withFreshMacroScope___rarg(x_54, x_7, x_8, x_9);
+return x_55;
 }
 else
 {
-lean_object* x_54; lean_object* x_55; uint8_t x_56; 
-x_54 = lean_unsigned_to_nat(1u);
-x_55 = l_Lean_Syntax_getArg(x_1, x_54);
-x_56 = l_Lean_Syntax_isNone(x_55);
-if (x_56 == 0)
-{
-lean_object* x_57; uint8_t x_58; 
-x_57 = lean_unsigned_to_nat(2u);
-lean_inc(x_55);
-x_58 = l_Lean_Syntax_matchesNull(x_55, x_57);
+lean_object* x_56; lean_object* x_57; uint8_t x_58; 
+x_56 = lean_unsigned_to_nat(1u);
+x_57 = l_Lean_Syntax_getArg(x_1, x_56);
+x_58 = l_Lean_Syntax_isNone(x_57);
 if (x_58 == 0)
 {
-lean_object* x_59; lean_object* x_60; 
-lean_dec(x_55);
+lean_object* x_59; uint8_t x_60; 
+x_59 = lean_unsigned_to_nat(2u);
+lean_inc(x_57);
+x_60 = l_Lean_Syntax_matchesNull(x_57, x_59);
+if (x_60 == 0)
+{
+lean_object* x_61; lean_object* x_62; 
+lean_dec(x_57);
 lean_dec(x_1);
-x_59 = lean_alloc_closure((void*)(l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg), 8, 5);
-lean_closure_set(x_59, 0, x_2);
-lean_closure_set(x_59, 1, x_3);
-lean_closure_set(x_59, 2, x_4);
-lean_closure_set(x_59, 3, x_5);
-lean_closure_set(x_59, 4, x_6);
-x_60 = l_Lean_Core_withFreshMacroScope___rarg(x_59, x_7, x_8, x_9);
-return x_60;
+x_61 = lean_alloc_closure((void*)(l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg), 8, 5);
+lean_closure_set(x_61, 0, x_2);
+lean_closure_set(x_61, 1, x_3);
+lean_closure_set(x_61, 2, x_4);
+lean_closure_set(x_61, 3, x_5);
+lean_closure_set(x_61, 4, x_6);
+x_62 = l_Lean_Core_withFreshMacroScope___rarg(x_61, x_7, x_8, x_9);
+return x_62;
 }
 else
 {
-lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-x_61 = lean_unsigned_to_nat(0u);
-x_62 = l_Lean_Syntax_getArg(x_55, x_61);
-lean_dec(x_55);
-x_63 = l_Lean_Syntax_getArgs(x_62);
-lean_dec(x_62);
-x_64 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_64, 0, x_63);
-x_65 = lean_box(0);
-x_66 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5), 12, 9);
-lean_closure_set(x_66, 0, x_1);
-lean_closure_set(x_66, 1, x_50);
-lean_closure_set(x_66, 2, x_65);
-lean_closure_set(x_66, 3, x_64);
-lean_closure_set(x_66, 4, x_2);
-lean_closure_set(x_66, 5, x_3);
-lean_closure_set(x_66, 6, x_4);
-lean_closure_set(x_66, 7, x_5);
-lean_closure_set(x_66, 8, x_6);
-x_67 = l_Lean_Core_withFreshMacroScope___rarg(x_66, x_7, x_8, x_9);
-return x_67;
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+x_63 = lean_unsigned_to_nat(0u);
+x_64 = l_Lean_Syntax_getArg(x_57, x_63);
+lean_dec(x_57);
+x_65 = l_Lean_Syntax_getArgs(x_64);
+lean_dec(x_64);
+x_66 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_66, 0, x_65);
+x_67 = lean_box(0);
+x_68 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5), 12, 9);
+lean_closure_set(x_68, 0, x_1);
+lean_closure_set(x_68, 1, x_52);
+lean_closure_set(x_68, 2, x_67);
+lean_closure_set(x_68, 3, x_66);
+lean_closure_set(x_68, 4, x_2);
+lean_closure_set(x_68, 5, x_3);
+lean_closure_set(x_68, 6, x_4);
+lean_closure_set(x_68, 7, x_5);
+lean_closure_set(x_68, 8, x_6);
+x_69 = l_Lean_Core_withFreshMacroScope___rarg(x_68, x_7, x_8, x_9);
+return x_69;
 }
 }
 else
 {
-lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; 
-lean_dec(x_55);
-x_68 = lean_box(0);
-x_69 = lean_box(0);
-x_70 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5), 12, 9);
-lean_closure_set(x_70, 0, x_1);
-lean_closure_set(x_70, 1, x_50);
-lean_closure_set(x_70, 2, x_69);
-lean_closure_set(x_70, 3, x_68);
-lean_closure_set(x_70, 4, x_2);
-lean_closure_set(x_70, 5, x_3);
-lean_closure_set(x_70, 6, x_4);
-lean_closure_set(x_70, 7, x_5);
-lean_closure_set(x_70, 8, x_6);
-x_71 = l_Lean_Core_withFreshMacroScope___rarg(x_70, x_7, x_8, x_9);
-return x_71;
+lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+lean_dec(x_57);
+x_70 = lean_box(0);
+x_71 = lean_box(0);
+x_72 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5), 12, 9);
+lean_closure_set(x_72, 0, x_1);
+lean_closure_set(x_72, 1, x_52);
+lean_closure_set(x_72, 2, x_71);
+lean_closure_set(x_72, 3, x_70);
+lean_closure_set(x_72, 4, x_2);
+lean_closure_set(x_72, 5, x_3);
+lean_closure_set(x_72, 6, x_4);
+lean_closure_set(x_72, 7, x_5);
+lean_closure_set(x_72, 8, x_6);
+x_73 = l_Lean_Core_withFreshMacroScope___rarg(x_72, x_7, x_8, x_9);
+return x_73;
 }
 }
 }
 else
 {
-lean_object* x_72; lean_object* x_73; lean_object* x_74; uint8_t x_75; 
-x_72 = l_Lean_Syntax_getArgs(x_1);
+lean_object* x_74; lean_object* x_75; lean_object* x_76; uint8_t x_77; 
+x_74 = l_Lean_Syntax_getArgs(x_1);
 lean_dec(x_1);
-x_73 = lean_array_get_size(x_72);
-x_74 = lean_unsigned_to_nat(0u);
-x_75 = lean_nat_dec_lt(x_74, x_73);
-if (x_75 == 0)
+x_75 = lean_array_get_size(x_74);
+x_76 = lean_unsigned_to_nat(0u);
+x_77 = lean_nat_dec_lt(x_76, x_75);
+if (x_77 == 0)
 {
-lean_object* x_76; lean_object* x_77; 
-lean_dec(x_73);
-x_76 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
-lean_closure_set(x_76, 0, x_2);
-lean_closure_set(x_76, 1, x_3);
-lean_closure_set(x_76, 2, x_4);
-lean_closure_set(x_76, 3, x_5);
-lean_closure_set(x_76, 4, x_6);
-lean_closure_set(x_76, 5, x_72);
-x_77 = l_Lean_Core_withFreshMacroScope___rarg(x_76, x_7, x_8, x_9);
-return x_77;
+lean_object* x_78; lean_object* x_79; 
+lean_dec(x_75);
+x_78 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
+lean_closure_set(x_78, 0, x_2);
+lean_closure_set(x_78, 1, x_3);
+lean_closure_set(x_78, 2, x_4);
+lean_closure_set(x_78, 3, x_5);
+lean_closure_set(x_78, 4, x_6);
+lean_closure_set(x_78, 5, x_74);
+x_79 = l_Lean_Core_withFreshMacroScope___rarg(x_78, x_7, x_8, x_9);
+return x_79;
 }
 else
 {
-uint8_t x_78; 
-x_78 = lean_nat_dec_le(x_73, x_73);
-if (x_78 == 0)
+uint8_t x_80; 
+x_80 = lean_nat_dec_le(x_75, x_75);
+if (x_80 == 0)
 {
-lean_object* x_79; lean_object* x_80; 
-lean_dec(x_73);
-x_79 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
-lean_closure_set(x_79, 0, x_2);
-lean_closure_set(x_79, 1, x_3);
-lean_closure_set(x_79, 2, x_4);
-lean_closure_set(x_79, 3, x_5);
-lean_closure_set(x_79, 4, x_6);
-lean_closure_set(x_79, 5, x_72);
-x_80 = l_Lean_Core_withFreshMacroScope___rarg(x_79, x_7, x_8, x_9);
-return x_80;
+lean_object* x_81; lean_object* x_82; 
+lean_dec(x_75);
+x_81 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
+lean_closure_set(x_81, 0, x_2);
+lean_closure_set(x_81, 1, x_3);
+lean_closure_set(x_81, 2, x_4);
+lean_closure_set(x_81, 3, x_5);
+lean_closure_set(x_81, 4, x_6);
+lean_closure_set(x_81, 5, x_74);
+x_82 = l_Lean_Core_withFreshMacroScope___rarg(x_81, x_7, x_8, x_9);
+return x_82;
 }
 else
 {
-size_t x_81; size_t x_82; uint8_t x_83; 
-x_81 = 0;
-x_82 = lean_usize_of_nat(x_73);
-lean_dec(x_73);
-x_83 = l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5(x_72, x_81, x_82);
-if (x_83 == 0)
+size_t x_83; size_t x_84; uint8_t x_85; 
+x_83 = 0;
+x_84 = lean_usize_of_nat(x_75);
+lean_dec(x_75);
+x_85 = l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5(x_74, x_83, x_84);
+if (x_85 == 0)
 {
-lean_object* x_84; lean_object* x_85; 
-x_84 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
-lean_closure_set(x_84, 0, x_2);
-lean_closure_set(x_84, 1, x_3);
-lean_closure_set(x_84, 2, x_4);
-lean_closure_set(x_84, 3, x_5);
-lean_closure_set(x_84, 4, x_6);
-lean_closure_set(x_84, 5, x_72);
-x_85 = l_Lean_Core_withFreshMacroScope___rarg(x_84, x_7, x_8, x_9);
-return x_85;
+lean_object* x_86; lean_object* x_87; 
+x_86 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
+lean_closure_set(x_86, 0, x_2);
+lean_closure_set(x_86, 1, x_3);
+lean_closure_set(x_86, 2, x_4);
+lean_closure_set(x_86, 3, x_5);
+lean_closure_set(x_86, 4, x_6);
+lean_closure_set(x_86, 5, x_74);
+x_87 = l_Lean_Core_withFreshMacroScope___rarg(x_86, x_7, x_8, x_9);
+return x_87;
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
-x_86 = l_Lean_Elab_Term_CollectPatternVars_State_vars___default___closed__1;
-x_87 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_CollectPatternVars_collect___spec__6(x_72, x_81, x_82, x_86);
-lean_dec(x_72);
-x_88 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
-lean_closure_set(x_88, 0, x_2);
-lean_closure_set(x_88, 1, x_3);
-lean_closure_set(x_88, 2, x_4);
-lean_closure_set(x_88, 3, x_5);
-lean_closure_set(x_88, 4, x_6);
-lean_closure_set(x_88, 5, x_87);
-x_89 = l_Lean_Core_withFreshMacroScope___rarg(x_88, x_7, x_8, x_9);
-return x_89;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_90; lean_object* x_91; 
-lean_dec(x_10);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_90 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
-lean_closure_set(x_90, 0, x_1);
+lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_88 = l_Lean_Elab_Term_CollectPatternVars_State_vars___default___closed__1;
+x_89 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_CollectPatternVars_collect___spec__6(x_74, x_83, x_84, x_88);
+lean_dec(x_74);
+x_90 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
+lean_closure_set(x_90, 0, x_2);
+lean_closure_set(x_90, 1, x_3);
+lean_closure_set(x_90, 2, x_4);
+lean_closure_set(x_90, 3, x_5);
+lean_closure_set(x_90, 4, x_6);
+lean_closure_set(x_90, 5, x_89);
 x_91 = l_Lean_Core_withFreshMacroScope___rarg(x_90, x_7, x_8, x_9);
 return x_91;
 }
 }
+}
+}
+}
 else
 {
 lean_object* x_92; lean_object* x_93; 
@@ -7299,134 +7371,120 @@ return x_103;
 }
 else
 {
-lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+lean_object* x_104; lean_object* x_105; 
 lean_dec(x_10);
-x_104 = lean_unsigned_to_nat(2u);
-x_105 = l_Lean_Syntax_getArg(x_1, x_104);
-x_106 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__7), 10, 7);
-lean_closure_set(x_106, 0, x_105);
-lean_closure_set(x_106, 1, x_2);
-lean_closure_set(x_106, 2, x_3);
-lean_closure_set(x_106, 3, x_4);
-lean_closure_set(x_106, 4, x_5);
-lean_closure_set(x_106, 5, x_6);
-lean_closure_set(x_106, 6, x_1);
-x_107 = l_Lean_Core_withFreshMacroScope___rarg(x_106, x_7, x_8, x_9);
-return x_107;
-}
-}
-else
-{
-lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-lean_dec(x_10);
-x_108 = lean_unsigned_to_nat(0u);
-x_109 = l_Lean_Syntax_getArg(x_1, x_108);
-x_110 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9), 11, 8);
-lean_closure_set(x_110, 0, x_109);
-lean_closure_set(x_110, 1, x_2);
-lean_closure_set(x_110, 2, x_3);
-lean_closure_set(x_110, 3, x_4);
-lean_closure_set(x_110, 4, x_5);
-lean_closure_set(x_110, 5, x_6);
-lean_closure_set(x_110, 6, x_1);
-lean_closure_set(x_110, 7, x_16);
-x_111 = l_Lean_Core_withFreshMacroScope___rarg(x_110, x_7, x_8, x_9);
-return x_111;
-}
-}
-else
-{
-lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
-lean_dec(x_10);
-x_112 = lean_unsigned_to_nat(0u);
-x_113 = l_Lean_Syntax_getArg(x_1, x_112);
-lean_dec(x_1);
-x_114 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processCtor), 9, 6);
-lean_closure_set(x_114, 0, x_113);
-lean_closure_set(x_114, 1, x_2);
-lean_closure_set(x_114, 2, x_3);
-lean_closure_set(x_114, 3, x_4);
-lean_closure_set(x_114, 4, x_5);
-lean_closure_set(x_114, 5, x_6);
-x_115 = l_Lean_Core_withFreshMacroScope___rarg(x_114, x_7, x_8, x_9);
-return x_115;
-}
-}
-else
-{
-lean_object* x_116; lean_object* x_117; uint8_t x_118; 
-lean_dec(x_10);
-x_116 = lean_unsigned_to_nat(1u);
-x_117 = l_Lean_Syntax_getArg(x_1, x_116);
-x_118 = l_Lean_Syntax_isNone(x_117);
-if (x_118 == 0)
-{
-lean_object* x_119; lean_object* x_120; lean_object* x_121; uint8_t x_122; 
-x_119 = lean_unsigned_to_nat(0u);
-x_120 = l_Lean_Syntax_getArg(x_117, x_119);
-x_121 = l_Lean_Syntax_getArg(x_117, x_116);
-x_122 = l_Lean_Syntax_isNone(x_121);
-if (x_122 == 0)
-{
-lean_object* x_123; lean_object* x_124; lean_object* x_125; uint8_t x_126; 
-x_123 = l_Lean_Syntax_getArg(x_121, x_119);
-lean_dec(x_121);
-x_124 = l_Lean_Syntax_getKind(x_123);
-x_125 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__27;
-x_126 = lean_name_eq(x_124, x_125);
-lean_dec(x_124);
-if (x_126 == 0)
-{
-lean_object* x_127; lean_object* x_128; 
-lean_dec(x_120);
-lean_dec(x_117);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_127 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
-lean_closure_set(x_127, 0, x_1);
-x_128 = l_Lean_Core_withFreshMacroScope___rarg(x_127, x_7, x_8, x_9);
-return x_128;
-}
-else
-{
-lean_object* x_129; lean_object* x_130; 
-x_129 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10), 11, 8);
-lean_closure_set(x_129, 0, x_120);
-lean_closure_set(x_129, 1, x_2);
-lean_closure_set(x_129, 2, x_3);
-lean_closure_set(x_129, 3, x_4);
-lean_closure_set(x_129, 4, x_5);
-lean_closure_set(x_129, 5, x_6);
-lean_closure_set(x_129, 6, x_117);
-lean_closure_set(x_129, 7, x_1);
-x_130 = l_Lean_Core_withFreshMacroScope___rarg(x_129, x_7, x_8, x_9);
-return x_130;
+x_104 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
+lean_closure_set(x_104, 0, x_1);
+x_105 = l_Lean_Core_withFreshMacroScope___rarg(x_104, x_7, x_8, x_9);
+return x_105;
 }
 }
 else
 {
-lean_object* x_131; lean_object* x_132; 
-lean_dec(x_121);
-x_131 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10), 11, 8);
-lean_closure_set(x_131, 0, x_120);
-lean_closure_set(x_131, 1, x_2);
-lean_closure_set(x_131, 2, x_3);
-lean_closure_set(x_131, 3, x_4);
-lean_closure_set(x_131, 4, x_5);
-lean_closure_set(x_131, 5, x_6);
-lean_closure_set(x_131, 6, x_117);
-lean_closure_set(x_131, 7, x_1);
-x_132 = l_Lean_Core_withFreshMacroScope___rarg(x_131, x_7, x_8, x_9);
-return x_132;
+lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+lean_dec(x_10);
+x_106 = lean_unsigned_to_nat(2u);
+x_107 = l_Lean_Syntax_getArg(x_1, x_106);
+x_108 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__7), 10, 7);
+lean_closure_set(x_108, 0, x_107);
+lean_closure_set(x_108, 1, x_2);
+lean_closure_set(x_108, 2, x_3);
+lean_closure_set(x_108, 3, x_4);
+lean_closure_set(x_108, 4, x_5);
+lean_closure_set(x_108, 5, x_6);
+lean_closure_set(x_108, 6, x_1);
+x_109 = l_Lean_Core_withFreshMacroScope___rarg(x_108, x_7, x_8, x_9);
+return x_109;
 }
 }
 else
 {
+lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+lean_dec(x_10);
+x_110 = lean_unsigned_to_nat(2u);
+x_111 = l_Lean_Syntax_getArg(x_1, x_110);
+x_112 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8), 10, 7);
+lean_closure_set(x_112, 0, x_111);
+lean_closure_set(x_112, 1, x_2);
+lean_closure_set(x_112, 2, x_3);
+lean_closure_set(x_112, 3, x_4);
+lean_closure_set(x_112, 4, x_5);
+lean_closure_set(x_112, 5, x_6);
+lean_closure_set(x_112, 6, x_1);
+x_113 = l_Lean_Core_withFreshMacroScope___rarg(x_112, x_7, x_8, x_9);
+return x_113;
+}
+}
+else
+{
+lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; 
+lean_dec(x_10);
+x_114 = lean_unsigned_to_nat(0u);
+x_115 = l_Lean_Syntax_getArg(x_1, x_114);
+x_116 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10), 11, 8);
+lean_closure_set(x_116, 0, x_115);
+lean_closure_set(x_116, 1, x_2);
+lean_closure_set(x_116, 2, x_3);
+lean_closure_set(x_116, 3, x_4);
+lean_closure_set(x_116, 4, x_5);
+lean_closure_set(x_116, 5, x_6);
+lean_closure_set(x_116, 6, x_1);
+lean_closure_set(x_116, 7, x_16);
+x_117 = l_Lean_Core_withFreshMacroScope___rarg(x_116, x_7, x_8, x_9);
+return x_117;
+}
+}
+else
+{
+lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; 
+lean_dec(x_10);
+x_118 = lean_unsigned_to_nat(0u);
+x_119 = l_Lean_Syntax_getArg(x_1, x_118);
+lean_dec(x_1);
+x_120 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processCtor), 9, 6);
+lean_closure_set(x_120, 0, x_119);
+lean_closure_set(x_120, 1, x_2);
+lean_closure_set(x_120, 2, x_3);
+lean_closure_set(x_120, 3, x_4);
+lean_closure_set(x_120, 4, x_5);
+lean_closure_set(x_120, 5, x_6);
+x_121 = l_Lean_Core_withFreshMacroScope___rarg(x_120, x_7, x_8, x_9);
+return x_121;
+}
+}
+else
+{
+lean_object* x_122; lean_object* x_123; uint8_t x_124; 
+lean_dec(x_10);
+x_122 = lean_unsigned_to_nat(1u);
+x_123 = l_Lean_Syntax_getArg(x_1, x_122);
+x_124 = l_Lean_Syntax_isNone(x_123);
+if (x_124 == 0)
+{
+lean_object* x_125; lean_object* x_126; lean_object* x_127; uint8_t x_128; 
+x_125 = lean_unsigned_to_nat(0u);
+x_126 = l_Lean_Syntax_getArg(x_123, x_125);
+x_127 = l_Lean_Syntax_getArg(x_123, x_122);
+x_128 = l_Lean_Syntax_isNone(x_127);
+if (x_128 == 0)
+{
+lean_object* x_129; lean_object* x_130; lean_object* x_131; uint8_t x_132; 
+x_129 = l_Lean_Syntax_getArg(x_127, x_125);
+lean_dec(x_127);
+x_130 = l_Lean_Syntax_getKind(x_129);
+x_131 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__29;
+x_132 = lean_name_eq(x_130, x_131);
+lean_dec(x_130);
+if (x_132 == 0)
+{
 lean_object* x_133; lean_object* x_134; 
-lean_dec(x_117);
+lean_dec(x_126);
+lean_dec(x_123);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
@@ -7437,19 +7495,18 @@ lean_closure_set(x_133, 0, x_1);
 x_134 = l_Lean_Core_withFreshMacroScope___rarg(x_133, x_7, x_8, x_9);
 return x_134;
 }
-}
-}
 else
 {
 lean_object* x_135; lean_object* x_136; 
-lean_dec(x_10);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_135 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___boxed), 4, 1);
-lean_closure_set(x_135, 0, x_1);
+x_135 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11), 11, 8);
+lean_closure_set(x_135, 0, x_126);
+lean_closure_set(x_135, 1, x_2);
+lean_closure_set(x_135, 2, x_3);
+lean_closure_set(x_135, 3, x_4);
+lean_closure_set(x_135, 4, x_5);
+lean_closure_set(x_135, 5, x_6);
+lean_closure_set(x_135, 6, x_123);
+lean_closure_set(x_135, 7, x_1);
 x_136 = l_Lean_Core_withFreshMacroScope___rarg(x_135, x_7, x_8, x_9);
 return x_136;
 }
@@ -7457,14 +7514,16 @@ return x_136;
 else
 {
 lean_object* x_137; lean_object* x_138; 
-lean_dec(x_10);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_137 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___boxed), 4, 1);
-lean_closure_set(x_137, 0, x_1);
+lean_dec(x_127);
+x_137 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11), 11, 8);
+lean_closure_set(x_137, 0, x_126);
+lean_closure_set(x_137, 1, x_2);
+lean_closure_set(x_137, 2, x_3);
+lean_closure_set(x_137, 3, x_4);
+lean_closure_set(x_137, 4, x_5);
+lean_closure_set(x_137, 5, x_6);
+lean_closure_set(x_137, 6, x_123);
+lean_closure_set(x_137, 7, x_1);
 x_138 = l_Lean_Core_withFreshMacroScope___rarg(x_137, x_7, x_8, x_9);
 return x_138;
 }
@@ -7472,7 +7531,7 @@ return x_138;
 else
 {
 lean_object* x_139; lean_object* x_140; 
-lean_dec(x_10);
+lean_dec(x_123);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
@@ -7484,413 +7543,404 @@ x_140 = l_Lean_Core_withFreshMacroScope___rarg(x_139, x_7, x_8, x_9);
 return x_140;
 }
 }
+}
 else
 {
-lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; 
+lean_object* x_141; lean_object* x_142; 
 lean_dec(x_10);
-x_141 = lean_unsigned_to_nat(1u);
-x_142 = l_Lean_Syntax_getArg(x_1, x_141);
-x_143 = l_Lean_Syntax_getArgs(x_142);
-lean_dec(x_142);
-x_144 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___boxed), 10, 7);
-lean_closure_set(x_144, 0, x_143);
-lean_closure_set(x_144, 1, x_2);
-lean_closure_set(x_144, 2, x_3);
-lean_closure_set(x_144, 3, x_4);
-lean_closure_set(x_144, 4, x_5);
-lean_closure_set(x_144, 5, x_6);
-lean_closure_set(x_144, 6, x_1);
-x_145 = l_Lean_Core_withFreshMacroScope___rarg(x_144, x_7, x_8, x_9);
-return x_145;
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_141 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___boxed), 4, 1);
+lean_closure_set(x_141, 0, x_1);
+x_142 = l_Lean_Core_withFreshMacroScope___rarg(x_141, x_7, x_8, x_9);
+return x_142;
 }
 }
 else
 {
-lean_object* x_146; lean_object* x_147; 
+lean_object* x_143; lean_object* x_144; 
 lean_dec(x_10);
-x_146 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp), 9, 6);
-lean_closure_set(x_146, 0, x_1);
-lean_closure_set(x_146, 1, x_2);
-lean_closure_set(x_146, 2, x_3);
-lean_closure_set(x_146, 3, x_4);
-lean_closure_set(x_146, 4, x_5);
-lean_closure_set(x_146, 5, x_6);
-x_147 = l_Lean_Core_withFreshMacroScope___rarg(x_146, x_7, x_8, x_9);
-return x_147;
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_143 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___boxed), 4, 1);
+lean_closure_set(x_143, 0, x_1);
+x_144 = l_Lean_Core_withFreshMacroScope___rarg(x_143, x_7, x_8, x_9);
+return x_144;
 }
 }
 else
 {
-lean_object* x_148; lean_object* x_149; 
+lean_object* x_145; lean_object* x_146; 
 lean_dec(x_10);
-x_148 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processId), 9, 6);
-lean_closure_set(x_148, 0, x_1);
-lean_closure_set(x_148, 1, x_2);
-lean_closure_set(x_148, 2, x_3);
-lean_closure_set(x_148, 3, x_4);
-lean_closure_set(x_148, 4, x_5);
-lean_closure_set(x_148, 5, x_6);
-x_149 = l_Lean_Core_withFreshMacroScope___rarg(x_148, x_7, x_8, x_9);
-return x_149;
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_145 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
+lean_closure_set(x_145, 0, x_1);
+x_146 = l_Lean_Core_withFreshMacroScope___rarg(x_145, x_7, x_8, x_9);
+return x_146;
 }
 }
 else
 {
-lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; 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_150 = lean_ctor_get(x_7, 0);
-x_151 = lean_ctor_get(x_7, 1);
-x_152 = lean_ctor_get(x_7, 2);
-x_153 = lean_ctor_get(x_7, 3);
-x_154 = lean_ctor_get(x_7, 4);
-x_155 = lean_ctor_get(x_7, 5);
-x_156 = lean_ctor_get(x_7, 6);
-x_157 = lean_ctor_get(x_7, 7);
-x_158 = lean_ctor_get(x_7, 8);
-x_159 = lean_ctor_get(x_7, 9);
-x_160 = lean_ctor_get(x_7, 10);
+lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+lean_dec(x_10);
+x_147 = lean_unsigned_to_nat(1u);
+x_148 = l_Lean_Syntax_getArg(x_1, x_147);
+x_149 = l_Lean_Syntax_getArgs(x_148);
+lean_dec(x_148);
+x_150 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___boxed), 10, 7);
+lean_closure_set(x_150, 0, x_149);
+lean_closure_set(x_150, 1, x_2);
+lean_closure_set(x_150, 2, x_3);
+lean_closure_set(x_150, 3, x_4);
+lean_closure_set(x_150, 4, x_5);
+lean_closure_set(x_150, 5, x_6);
+lean_closure_set(x_150, 6, x_1);
+x_151 = l_Lean_Core_withFreshMacroScope___rarg(x_150, x_7, x_8, x_9);
+return x_151;
+}
+}
+else
+{
+lean_object* x_152; lean_object* x_153; 
+lean_dec(x_10);
+x_152 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp), 9, 6);
+lean_closure_set(x_152, 0, x_1);
+lean_closure_set(x_152, 1, x_2);
+lean_closure_set(x_152, 2, x_3);
+lean_closure_set(x_152, 3, x_4);
+lean_closure_set(x_152, 4, x_5);
+lean_closure_set(x_152, 5, x_6);
+x_153 = l_Lean_Core_withFreshMacroScope___rarg(x_152, x_7, x_8, x_9);
+return x_153;
+}
+}
+else
+{
+lean_object* x_154; lean_object* x_155; 
+lean_dec(x_10);
+x_154 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processId), 9, 6);
+lean_closure_set(x_154, 0, x_1);
+lean_closure_set(x_154, 1, x_2);
+lean_closure_set(x_154, 2, x_3);
+lean_closure_set(x_154, 3, x_4);
+lean_closure_set(x_154, 4, x_5);
+lean_closure_set(x_154, 5, x_6);
+x_155 = l_Lean_Core_withFreshMacroScope___rarg(x_154, x_7, x_8, x_9);
+return x_155;
+}
+}
+else
+{
+lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; 
+x_156 = lean_ctor_get(x_7, 0);
+x_157 = lean_ctor_get(x_7, 1);
+x_158 = lean_ctor_get(x_7, 2);
+x_159 = lean_ctor_get(x_7, 3);
+x_160 = lean_ctor_get(x_7, 4);
+x_161 = lean_ctor_get(x_7, 5);
+x_162 = lean_ctor_get(x_7, 6);
+x_163 = lean_ctor_get(x_7, 7);
+x_164 = lean_ctor_get(x_7, 8);
+x_165 = lean_ctor_get(x_7, 9);
+x_166 = lean_ctor_get(x_7, 10);
+lean_inc(x_166);
+lean_inc(x_165);
+lean_inc(x_164);
+lean_inc(x_163);
+lean_inc(x_162);
+lean_inc(x_161);
 lean_inc(x_160);
 lean_inc(x_159);
 lean_inc(x_158);
 lean_inc(x_157);
 lean_inc(x_156);
-lean_inc(x_155);
-lean_inc(x_154);
-lean_inc(x_153);
-lean_inc(x_152);
-lean_inc(x_151);
-lean_inc(x_150);
 lean_dec(x_7);
-x_161 = l_Lean_replaceRef(x_1, x_155);
-lean_dec(x_155);
-x_162 = lean_alloc_ctor(0, 11, 0);
-lean_ctor_set(x_162, 0, x_150);
-lean_ctor_set(x_162, 1, x_151);
-lean_ctor_set(x_162, 2, x_152);
-lean_ctor_set(x_162, 3, x_153);
-lean_ctor_set(x_162, 4, x_154);
-lean_ctor_set(x_162, 5, x_161);
-lean_ctor_set(x_162, 6, x_156);
-lean_ctor_set(x_162, 7, x_157);
-lean_ctor_set(x_162, 8, x_158);
-lean_ctor_set(x_162, 9, x_159);
-lean_ctor_set(x_162, 10, x_160);
+x_167 = l_Lean_replaceRef(x_1, x_161);
+lean_dec(x_161);
+x_168 = lean_alloc_ctor(0, 11, 0);
+lean_ctor_set(x_168, 0, x_156);
+lean_ctor_set(x_168, 1, x_157);
+lean_ctor_set(x_168, 2, x_158);
+lean_ctor_set(x_168, 3, x_159);
+lean_ctor_set(x_168, 4, x_160);
+lean_ctor_set(x_168, 5, x_167);
+lean_ctor_set(x_168, 6, x_162);
+lean_ctor_set(x_168, 7, x_163);
+lean_ctor_set(x_168, 8, x_164);
+lean_ctor_set(x_168, 9, x_165);
+lean_ctor_set(x_168, 10, x_166);
 if (x_12 == 0)
 {
-lean_object* x_163; uint8_t x_164; 
-x_163 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__2;
-x_164 = lean_name_eq(x_10, x_163);
-if (x_164 == 0)
-{
-lean_object* x_165; uint8_t x_166; 
-x_165 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__4;
-x_166 = lean_name_eq(x_10, x_165);
-if (x_166 == 0)
-{
-lean_object* x_167; uint8_t x_168; 
-x_167 = l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___closed__2;
-x_168 = lean_name_eq(x_10, x_167);
-if (x_168 == 0)
-{
 lean_object* x_169; uint8_t x_170; 
-x_169 = l_Lean_Elab_Term_CollectPatternVars_collect_processExplicitArg___closed__6;
+x_169 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__2;
 x_170 = lean_name_eq(x_10, x_169);
 if (x_170 == 0)
 {
 lean_object* x_171; uint8_t x_172; 
-x_171 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__6;
+x_171 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__4;
 x_172 = lean_name_eq(x_10, x_171);
 if (x_172 == 0)
 {
 lean_object* x_173; uint8_t x_174; 
-x_173 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__8;
+x_173 = l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp___closed__2;
 x_174 = lean_name_eq(x_10, x_173);
 if (x_174 == 0)
 {
 lean_object* x_175; uint8_t x_176; 
-x_175 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__10;
+x_175 = l_Lean_Elab_Term_CollectPatternVars_collect_processExplicitArg___closed__6;
 x_176 = lean_name_eq(x_10, x_175);
 if (x_176 == 0)
 {
 lean_object* x_177; uint8_t x_178; 
-x_177 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__11;
+x_177 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__6;
 x_178 = lean_name_eq(x_10, x_177);
 if (x_178 == 0)
 {
 lean_object* x_179; uint8_t x_180; 
-x_179 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__13;
+x_179 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__8;
 x_180 = lean_name_eq(x_10, x_179);
 if (x_180 == 0)
 {
 lean_object* x_181; uint8_t x_182; 
-x_181 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__2;
+x_181 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__10;
 x_182 = lean_name_eq(x_10, x_181);
 if (x_182 == 0)
 {
 lean_object* x_183; uint8_t x_184; 
-x_183 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__15;
+x_183 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__11;
 x_184 = lean_name_eq(x_10, x_183);
 if (x_184 == 0)
 {
 lean_object* x_185; uint8_t x_186; 
-x_185 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__17;
+x_185 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__13;
 x_186 = lean_name_eq(x_10, x_185);
 if (x_186 == 0)
 {
 lean_object* x_187; uint8_t x_188; 
-x_187 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__19;
+x_187 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__15;
 x_188 = lean_name_eq(x_10, x_187);
 if (x_188 == 0)
 {
 lean_object* x_189; uint8_t x_190; 
-x_189 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__21;
+x_189 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__2;
 x_190 = lean_name_eq(x_10, x_189);
 if (x_190 == 0)
 {
 lean_object* x_191; uint8_t x_192; 
-x_191 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__23;
+x_191 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__17;
 x_192 = lean_name_eq(x_10, x_191);
 if (x_192 == 0)
 {
 lean_object* x_193; uint8_t x_194; 
-x_193 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__25;
+x_193 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__19;
 x_194 = lean_name_eq(x_10, x_193);
 if (x_194 == 0)
 {
 lean_object* x_195; uint8_t x_196; 
-x_195 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1___closed__2;
+x_195 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__21;
 x_196 = lean_name_eq(x_10, x_195);
-lean_dec(x_10);
 if (x_196 == 0)
 {
 lean_object* x_197; uint8_t x_198; 
-x_197 = l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5___closed__2;
-lean_inc(x_1);
-x_198 = l_Lean_Syntax_isOfKind(x_1, x_197);
+x_197 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__23;
+x_198 = lean_name_eq(x_10, x_197);
 if (x_198 == 0)
 {
-lean_object* x_199; lean_object* x_200; 
+lean_object* x_199; uint8_t x_200; 
+x_199 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__25;
+x_200 = lean_name_eq(x_10, x_199);
+if (x_200 == 0)
+{
+lean_object* x_201; uint8_t x_202; 
+x_201 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__27;
+x_202 = lean_name_eq(x_10, x_201);
+if (x_202 == 0)
+{
+lean_object* x_203; uint8_t x_204; 
+x_203 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1___closed__2;
+x_204 = lean_name_eq(x_10, x_203);
+lean_dec(x_10);
+if (x_204 == 0)
+{
+lean_object* x_205; uint8_t x_206; 
+x_205 = l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5___closed__2;
+lean_inc(x_1);
+x_206 = l_Lean_Syntax_isOfKind(x_1, x_205);
+if (x_206 == 0)
+{
+lean_object* x_207; lean_object* x_208; 
 lean_dec(x_1);
-x_199 = lean_alloc_closure((void*)(l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg), 8, 5);
-lean_closure_set(x_199, 0, x_2);
-lean_closure_set(x_199, 1, x_3);
-lean_closure_set(x_199, 2, x_4);
-lean_closure_set(x_199, 3, x_5);
-lean_closure_set(x_199, 4, x_6);
-x_200 = l_Lean_Core_withFreshMacroScope___rarg(x_199, x_162, x_8, x_9);
-return x_200;
+x_207 = lean_alloc_closure((void*)(l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg), 8, 5);
+lean_closure_set(x_207, 0, x_2);
+lean_closure_set(x_207, 1, x_3);
+lean_closure_set(x_207, 2, x_4);
+lean_closure_set(x_207, 3, x_5);
+lean_closure_set(x_207, 4, x_6);
+x_208 = l_Lean_Core_withFreshMacroScope___rarg(x_207, x_168, x_8, x_9);
+return x_208;
 }
 else
 {
-lean_object* x_201; lean_object* x_202; uint8_t x_203; 
-x_201 = lean_unsigned_to_nat(1u);
-x_202 = l_Lean_Syntax_getArg(x_1, x_201);
-x_203 = l_Lean_Syntax_isNone(x_202);
-if (x_203 == 0)
+lean_object* x_209; lean_object* x_210; uint8_t x_211; 
+x_209 = lean_unsigned_to_nat(1u);
+x_210 = l_Lean_Syntax_getArg(x_1, x_209);
+x_211 = l_Lean_Syntax_isNone(x_210);
+if (x_211 == 0)
 {
-lean_object* x_204; uint8_t x_205; 
-x_204 = lean_unsigned_to_nat(2u);
-lean_inc(x_202);
-x_205 = l_Lean_Syntax_matchesNull(x_202, x_204);
-if (x_205 == 0)
+lean_object* x_212; uint8_t x_213; 
+x_212 = lean_unsigned_to_nat(2u);
+lean_inc(x_210);
+x_213 = l_Lean_Syntax_matchesNull(x_210, x_212);
+if (x_213 == 0)
 {
-lean_object* x_206; lean_object* x_207; 
-lean_dec(x_202);
+lean_object* x_214; lean_object* x_215; 
+lean_dec(x_210);
 lean_dec(x_1);
-x_206 = lean_alloc_closure((void*)(l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg), 8, 5);
-lean_closure_set(x_206, 0, x_2);
-lean_closure_set(x_206, 1, x_3);
-lean_closure_set(x_206, 2, x_4);
-lean_closure_set(x_206, 3, x_5);
-lean_closure_set(x_206, 4, x_6);
-x_207 = l_Lean_Core_withFreshMacroScope___rarg(x_206, x_162, x_8, x_9);
-return x_207;
+x_214 = lean_alloc_closure((void*)(l___private_Lean_Elab_PatternVar_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg), 8, 5);
+lean_closure_set(x_214, 0, x_2);
+lean_closure_set(x_214, 1, x_3);
+lean_closure_set(x_214, 2, x_4);
+lean_closure_set(x_214, 3, x_5);
+lean_closure_set(x_214, 4, x_6);
+x_215 = l_Lean_Core_withFreshMacroScope___rarg(x_214, x_168, x_8, x_9);
+return x_215;
 }
 else
 {
-lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; 
-x_208 = lean_unsigned_to_nat(0u);
-x_209 = l_Lean_Syntax_getArg(x_202, x_208);
-lean_dec(x_202);
-x_210 = l_Lean_Syntax_getArgs(x_209);
-lean_dec(x_209);
-x_211 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_211, 0, x_210);
-x_212 = lean_box(0);
-x_213 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5), 12, 9);
-lean_closure_set(x_213, 0, x_1);
-lean_closure_set(x_213, 1, x_197);
-lean_closure_set(x_213, 2, x_212);
-lean_closure_set(x_213, 3, x_211);
-lean_closure_set(x_213, 4, x_2);
-lean_closure_set(x_213, 5, x_3);
-lean_closure_set(x_213, 6, x_4);
-lean_closure_set(x_213, 7, x_5);
-lean_closure_set(x_213, 8, x_6);
-x_214 = l_Lean_Core_withFreshMacroScope___rarg(x_213, x_162, x_8, x_9);
-return x_214;
+lean_object* x_216; lean_object* x_217; lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; 
+x_216 = lean_unsigned_to_nat(0u);
+x_217 = l_Lean_Syntax_getArg(x_210, x_216);
+lean_dec(x_210);
+x_218 = l_Lean_Syntax_getArgs(x_217);
+lean_dec(x_217);
+x_219 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_219, 0, x_218);
+x_220 = lean_box(0);
+x_221 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5), 12, 9);
+lean_closure_set(x_221, 0, x_1);
+lean_closure_set(x_221, 1, x_205);
+lean_closure_set(x_221, 2, x_220);
+lean_closure_set(x_221, 3, x_219);
+lean_closure_set(x_221, 4, x_2);
+lean_closure_set(x_221, 5, x_3);
+lean_closure_set(x_221, 6, x_4);
+lean_closure_set(x_221, 7, x_5);
+lean_closure_set(x_221, 8, x_6);
+x_222 = l_Lean_Core_withFreshMacroScope___rarg(x_221, x_168, x_8, x_9);
+return x_222;
 }
 }
 else
 {
-lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; 
-lean_dec(x_202);
-x_215 = lean_box(0);
-x_216 = lean_box(0);
-x_217 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5), 12, 9);
-lean_closure_set(x_217, 0, x_1);
-lean_closure_set(x_217, 1, x_197);
-lean_closure_set(x_217, 2, x_216);
-lean_closure_set(x_217, 3, x_215);
-lean_closure_set(x_217, 4, x_2);
-lean_closure_set(x_217, 5, x_3);
-lean_closure_set(x_217, 6, x_4);
-lean_closure_set(x_217, 7, x_5);
-lean_closure_set(x_217, 8, x_6);
-x_218 = l_Lean_Core_withFreshMacroScope___rarg(x_217, x_162, x_8, x_9);
-return x_218;
+lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; 
+lean_dec(x_210);
+x_223 = lean_box(0);
+x_224 = lean_box(0);
+x_225 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5), 12, 9);
+lean_closure_set(x_225, 0, x_1);
+lean_closure_set(x_225, 1, x_205);
+lean_closure_set(x_225, 2, x_224);
+lean_closure_set(x_225, 3, x_223);
+lean_closure_set(x_225, 4, x_2);
+lean_closure_set(x_225, 5, x_3);
+lean_closure_set(x_225, 6, x_4);
+lean_closure_set(x_225, 7, x_5);
+lean_closure_set(x_225, 8, x_6);
+x_226 = l_Lean_Core_withFreshMacroScope___rarg(x_225, x_168, x_8, x_9);
+return x_226;
 }
 }
 }
 else
 {
-lean_object* x_219; lean_object* x_220; lean_object* x_221; uint8_t x_222; 
-x_219 = l_Lean_Syntax_getArgs(x_1);
+lean_object* x_227; lean_object* x_228; lean_object* x_229; uint8_t x_230; 
+x_227 = l_Lean_Syntax_getArgs(x_1);
 lean_dec(x_1);
-x_220 = lean_array_get_size(x_219);
-x_221 = lean_unsigned_to_nat(0u);
-x_222 = lean_nat_dec_lt(x_221, x_220);
-if (x_222 == 0)
-{
-lean_object* x_223; lean_object* x_224; 
-lean_dec(x_220);
-x_223 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
-lean_closure_set(x_223, 0, x_2);
-lean_closure_set(x_223, 1, x_3);
-lean_closure_set(x_223, 2, x_4);
-lean_closure_set(x_223, 3, x_5);
-lean_closure_set(x_223, 4, x_6);
-lean_closure_set(x_223, 5, x_219);
-x_224 = l_Lean_Core_withFreshMacroScope___rarg(x_223, x_162, x_8, x_9);
-return x_224;
-}
-else
-{
-uint8_t x_225; 
-x_225 = lean_nat_dec_le(x_220, x_220);
-if (x_225 == 0)
-{
-lean_object* x_226; lean_object* x_227; 
-lean_dec(x_220);
-x_226 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
-lean_closure_set(x_226, 0, x_2);
-lean_closure_set(x_226, 1, x_3);
-lean_closure_set(x_226, 2, x_4);
-lean_closure_set(x_226, 3, x_5);
-lean_closure_set(x_226, 4, x_6);
-lean_closure_set(x_226, 5, x_219);
-x_227 = l_Lean_Core_withFreshMacroScope___rarg(x_226, x_162, x_8, x_9);
-return x_227;
-}
-else
-{
-size_t x_228; size_t x_229; uint8_t x_230; 
-x_228 = 0;
-x_229 = lean_usize_of_nat(x_220);
-lean_dec(x_220);
-x_230 = l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5(x_219, x_228, x_229);
+x_228 = lean_array_get_size(x_227);
+x_229 = lean_unsigned_to_nat(0u);
+x_230 = lean_nat_dec_lt(x_229, x_228);
 if (x_230 == 0)
 {
 lean_object* x_231; lean_object* x_232; 
+lean_dec(x_228);
 x_231 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
 lean_closure_set(x_231, 0, x_2);
 lean_closure_set(x_231, 1, x_3);
 lean_closure_set(x_231, 2, x_4);
 lean_closure_set(x_231, 3, x_5);
 lean_closure_set(x_231, 4, x_6);
-lean_closure_set(x_231, 5, x_219);
-x_232 = l_Lean_Core_withFreshMacroScope___rarg(x_231, x_162, x_8, x_9);
+lean_closure_set(x_231, 5, x_227);
+x_232 = l_Lean_Core_withFreshMacroScope___rarg(x_231, x_168, x_8, x_9);
 return x_232;
 }
 else
 {
-lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; 
-x_233 = l_Lean_Elab_Term_CollectPatternVars_State_vars___default___closed__1;
-x_234 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_CollectPatternVars_collect___spec__6(x_219, x_228, x_229, x_233);
-lean_dec(x_219);
-x_235 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
-lean_closure_set(x_235, 0, x_2);
-lean_closure_set(x_235, 1, x_3);
-lean_closure_set(x_235, 2, x_4);
-lean_closure_set(x_235, 3, x_5);
-lean_closure_set(x_235, 4, x_6);
-lean_closure_set(x_235, 5, x_234);
-x_236 = l_Lean_Core_withFreshMacroScope___rarg(x_235, x_162, x_8, x_9);
-return x_236;
-}
-}
-}
-}
+uint8_t x_233; 
+x_233 = lean_nat_dec_le(x_228, x_228);
+if (x_233 == 0)
+{
+lean_object* x_234; lean_object* x_235; 
+lean_dec(x_228);
+x_234 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
+lean_closure_set(x_234, 0, x_2);
+lean_closure_set(x_234, 1, x_3);
+lean_closure_set(x_234, 2, x_4);
+lean_closure_set(x_234, 3, x_5);
+lean_closure_set(x_234, 4, x_6);
+lean_closure_set(x_234, 5, x_227);
+x_235 = l_Lean_Core_withFreshMacroScope___rarg(x_234, x_168, x_8, x_9);
+return x_235;
 }
 else
 {
-lean_object* x_237; lean_object* x_238; 
-lean_dec(x_10);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_237 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
-lean_closure_set(x_237, 0, x_1);
-x_238 = l_Lean_Core_withFreshMacroScope___rarg(x_237, x_162, x_8, x_9);
-return x_238;
-}
-}
-else
+size_t x_236; size_t x_237; uint8_t x_238; 
+x_236 = 0;
+x_237 = lean_usize_of_nat(x_228);
+lean_dec(x_228);
+x_238 = l_Array_anyMUnsafe_any___at_Lean_Elab_Term_CollectPatternVars_collect___spec__5(x_227, x_236, x_237);
+if (x_238 == 0)
 {
 lean_object* x_239; lean_object* x_240; 
-lean_dec(x_10);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_239 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
-lean_closure_set(x_239, 0, x_1);
-x_240 = l_Lean_Core_withFreshMacroScope___rarg(x_239, x_162, x_8, x_9);
+x_239 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
+lean_closure_set(x_239, 0, x_2);
+lean_closure_set(x_239, 1, x_3);
+lean_closure_set(x_239, 2, x_4);
+lean_closure_set(x_239, 3, x_5);
+lean_closure_set(x_239, 4, x_6);
+lean_closure_set(x_239, 5, x_227);
+x_240 = l_Lean_Core_withFreshMacroScope___rarg(x_239, x_168, x_8, x_9);
 return x_240;
 }
-}
 else
 {
-lean_object* x_241; lean_object* x_242; 
-lean_dec(x_10);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_241 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
-lean_closure_set(x_241, 0, x_1);
-x_242 = l_Lean_Core_withFreshMacroScope___rarg(x_241, x_162, x_8, x_9);
-return x_242;
-}
-}
-else
-{
-lean_object* x_243; lean_object* x_244; 
-lean_dec(x_10);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_243 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
-lean_closure_set(x_243, 0, x_1);
-x_244 = l_Lean_Core_withFreshMacroScope___rarg(x_243, x_162, x_8, x_9);
+lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; 
+x_241 = l_Lean_Elab_Term_CollectPatternVars_State_vars___default___closed__1;
+x_242 = l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_CollectPatternVars_collect___spec__6(x_227, x_236, x_237, x_241);
+lean_dec(x_227);
+x_243 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1), 9, 6);
+lean_closure_set(x_243, 0, x_2);
+lean_closure_set(x_243, 1, x_3);
+lean_closure_set(x_243, 2, x_4);
+lean_closure_set(x_243, 3, x_5);
+lean_closure_set(x_243, 4, x_6);
+lean_closure_set(x_243, 5, x_242);
+x_244 = l_Lean_Core_withFreshMacroScope___rarg(x_243, x_168, x_8, x_9);
 return x_244;
 }
 }
+}
+}
+}
 else
 {
 lean_object* x_245; lean_object* x_246; 
@@ -7902,7 +7952,7 @@ lean_dec(x_3);
 lean_dec(x_2);
 x_245 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
 lean_closure_set(x_245, 0, x_1);
-x_246 = l_Lean_Core_withFreshMacroScope___rarg(x_245, x_162, x_8, x_9);
+x_246 = l_Lean_Core_withFreshMacroScope___rarg(x_245, x_168, x_8, x_9);
 return x_246;
 }
 }
@@ -7917,7 +7967,7 @@ lean_dec(x_3);
 lean_dec(x_2);
 x_247 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
 lean_closure_set(x_247, 0, x_1);
-x_248 = l_Lean_Core_withFreshMacroScope___rarg(x_247, x_162, x_8, x_9);
+x_248 = l_Lean_Core_withFreshMacroScope___rarg(x_247, x_168, x_8, x_9);
 return x_248;
 }
 }
@@ -7932,44 +7982,67 @@ lean_dec(x_3);
 lean_dec(x_2);
 x_249 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
 lean_closure_set(x_249, 0, x_1);
-x_250 = l_Lean_Core_withFreshMacroScope___rarg(x_249, x_162, x_8, x_9);
+x_250 = l_Lean_Core_withFreshMacroScope___rarg(x_249, x_168, x_8, x_9);
 return x_250;
 }
 }
 else
 {
-lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; 
+lean_object* x_251; lean_object* x_252; 
 lean_dec(x_10);
-x_251 = lean_unsigned_to_nat(2u);
-x_252 = l_Lean_Syntax_getArg(x_1, x_251);
-x_253 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__7), 10, 7);
-lean_closure_set(x_253, 0, x_252);
-lean_closure_set(x_253, 1, x_2);
-lean_closure_set(x_253, 2, x_3);
-lean_closure_set(x_253, 3, x_4);
-lean_closure_set(x_253, 4, x_5);
-lean_closure_set(x_253, 5, x_6);
-lean_closure_set(x_253, 6, x_1);
-x_254 = l_Lean_Core_withFreshMacroScope___rarg(x_253, x_162, x_8, x_9);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_251 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
+lean_closure_set(x_251, 0, x_1);
+x_252 = l_Lean_Core_withFreshMacroScope___rarg(x_251, x_168, x_8, x_9);
+return x_252;
+}
+}
+else
+{
+lean_object* x_253; lean_object* x_254; 
+lean_dec(x_10);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_253 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
+lean_closure_set(x_253, 0, x_1);
+x_254 = l_Lean_Core_withFreshMacroScope___rarg(x_253, x_168, x_8, x_9);
 return x_254;
 }
 }
 else
 {
-lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; 
+lean_object* x_255; lean_object* x_256; 
 lean_dec(x_10);
-x_255 = lean_unsigned_to_nat(0u);
-x_256 = l_Lean_Syntax_getArg(x_1, x_255);
-x_257 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9), 11, 8);
-lean_closure_set(x_257, 0, x_256);
-lean_closure_set(x_257, 1, x_2);
-lean_closure_set(x_257, 2, x_3);
-lean_closure_set(x_257, 3, x_4);
-lean_closure_set(x_257, 4, x_5);
-lean_closure_set(x_257, 5, x_6);
-lean_closure_set(x_257, 6, x_1);
-lean_closure_set(x_257, 7, x_163);
-x_258 = l_Lean_Core_withFreshMacroScope___rarg(x_257, x_162, x_8, x_9);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_255 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
+lean_closure_set(x_255, 0, x_1);
+x_256 = l_Lean_Core_withFreshMacroScope___rarg(x_255, x_168, x_8, x_9);
+return x_256;
+}
+}
+else
+{
+lean_object* x_257; lean_object* x_258; 
+lean_dec(x_10);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_257 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
+lean_closure_set(x_257, 0, x_1);
+x_258 = l_Lean_Core_withFreshMacroScope___rarg(x_257, x_168, x_8, x_9);
 return x_258;
 }
 }
@@ -7977,141 +8050,103 @@ else
 {
 lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; 
 lean_dec(x_10);
-x_259 = lean_unsigned_to_nat(0u);
+x_259 = lean_unsigned_to_nat(2u);
 x_260 = l_Lean_Syntax_getArg(x_1, x_259);
-lean_dec(x_1);
-x_261 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processCtor), 9, 6);
+x_261 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__7), 10, 7);
 lean_closure_set(x_261, 0, x_260);
 lean_closure_set(x_261, 1, x_2);
 lean_closure_set(x_261, 2, x_3);
 lean_closure_set(x_261, 3, x_4);
 lean_closure_set(x_261, 4, x_5);
 lean_closure_set(x_261, 5, x_6);
-x_262 = l_Lean_Core_withFreshMacroScope___rarg(x_261, x_162, x_8, x_9);
+lean_closure_set(x_261, 6, x_1);
+x_262 = l_Lean_Core_withFreshMacroScope___rarg(x_261, x_168, x_8, x_9);
 return x_262;
 }
 }
 else
 {
-lean_object* x_263; lean_object* x_264; uint8_t x_265; 
+lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; 
 lean_dec(x_10);
-x_263 = lean_unsigned_to_nat(1u);
+x_263 = lean_unsigned_to_nat(2u);
 x_264 = l_Lean_Syntax_getArg(x_1, x_263);
-x_265 = l_Lean_Syntax_isNone(x_264);
-if (x_265 == 0)
-{
-lean_object* x_266; lean_object* x_267; lean_object* x_268; uint8_t x_269; 
-x_266 = lean_unsigned_to_nat(0u);
-x_267 = l_Lean_Syntax_getArg(x_264, x_266);
-x_268 = l_Lean_Syntax_getArg(x_264, x_263);
-x_269 = l_Lean_Syntax_isNone(x_268);
-if (x_269 == 0)
-{
-lean_object* x_270; lean_object* x_271; lean_object* x_272; uint8_t x_273; 
-x_270 = l_Lean_Syntax_getArg(x_268, x_266);
-lean_dec(x_268);
-x_271 = l_Lean_Syntax_getKind(x_270);
-x_272 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__27;
-x_273 = lean_name_eq(x_271, x_272);
-lean_dec(x_271);
-if (x_273 == 0)
-{
-lean_object* x_274; lean_object* x_275; 
-lean_dec(x_267);
-lean_dec(x_264);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_274 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
-lean_closure_set(x_274, 0, x_1);
-x_275 = l_Lean_Core_withFreshMacroScope___rarg(x_274, x_162, x_8, x_9);
-return x_275;
-}
-else
-{
-lean_object* x_276; lean_object* x_277; 
-x_276 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10), 11, 8);
-lean_closure_set(x_276, 0, x_267);
-lean_closure_set(x_276, 1, x_2);
-lean_closure_set(x_276, 2, x_3);
-lean_closure_set(x_276, 3, x_4);
-lean_closure_set(x_276, 4, x_5);
-lean_closure_set(x_276, 5, x_6);
-lean_closure_set(x_276, 6, x_264);
-lean_closure_set(x_276, 7, x_1);
-x_277 = l_Lean_Core_withFreshMacroScope___rarg(x_276, x_162, x_8, x_9);
-return x_277;
+x_265 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8), 10, 7);
+lean_closure_set(x_265, 0, x_264);
+lean_closure_set(x_265, 1, x_2);
+lean_closure_set(x_265, 2, x_3);
+lean_closure_set(x_265, 3, x_4);
+lean_closure_set(x_265, 4, x_5);
+lean_closure_set(x_265, 5, x_6);
+lean_closure_set(x_265, 6, x_1);
+x_266 = l_Lean_Core_withFreshMacroScope___rarg(x_265, x_168, x_8, x_9);
+return x_266;
 }
 }
 else
 {
-lean_object* x_278; lean_object* x_279; 
-lean_dec(x_268);
-x_278 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10), 11, 8);
-lean_closure_set(x_278, 0, x_267);
-lean_closure_set(x_278, 1, x_2);
-lean_closure_set(x_278, 2, x_3);
-lean_closure_set(x_278, 3, x_4);
-lean_closure_set(x_278, 4, x_5);
-lean_closure_set(x_278, 5, x_6);
-lean_closure_set(x_278, 6, x_264);
-lean_closure_set(x_278, 7, x_1);
-x_279 = l_Lean_Core_withFreshMacroScope___rarg(x_278, x_162, x_8, x_9);
-return x_279;
-}
-}
-else
-{
-lean_object* x_280; lean_object* x_281; 
-lean_dec(x_264);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_280 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
-lean_closure_set(x_280, 0, x_1);
-x_281 = l_Lean_Core_withFreshMacroScope___rarg(x_280, x_162, x_8, x_9);
-return x_281;
-}
-}
-}
-else
-{
-lean_object* x_282; lean_object* x_283; 
+lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; 
 lean_dec(x_10);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_282 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___boxed), 4, 1);
-lean_closure_set(x_282, 0, x_1);
-x_283 = l_Lean_Core_withFreshMacroScope___rarg(x_282, x_162, x_8, x_9);
-return x_283;
+x_267 = lean_unsigned_to_nat(0u);
+x_268 = l_Lean_Syntax_getArg(x_1, x_267);
+x_269 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10), 11, 8);
+lean_closure_set(x_269, 0, x_268);
+lean_closure_set(x_269, 1, x_2);
+lean_closure_set(x_269, 2, x_3);
+lean_closure_set(x_269, 3, x_4);
+lean_closure_set(x_269, 4, x_5);
+lean_closure_set(x_269, 5, x_6);
+lean_closure_set(x_269, 6, x_1);
+lean_closure_set(x_269, 7, x_169);
+x_270 = l_Lean_Core_withFreshMacroScope___rarg(x_269, x_168, x_8, x_9);
+return x_270;
 }
 }
 else
 {
-lean_object* x_284; lean_object* x_285; 
+lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; 
 lean_dec(x_10);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-x_284 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___boxed), 4, 1);
-lean_closure_set(x_284, 0, x_1);
-x_285 = l_Lean_Core_withFreshMacroScope___rarg(x_284, x_162, x_8, x_9);
-return x_285;
+x_271 = lean_unsigned_to_nat(0u);
+x_272 = l_Lean_Syntax_getArg(x_1, x_271);
+lean_dec(x_1);
+x_273 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processCtor), 9, 6);
+lean_closure_set(x_273, 0, x_272);
+lean_closure_set(x_273, 1, x_2);
+lean_closure_set(x_273, 2, x_3);
+lean_closure_set(x_273, 3, x_4);
+lean_closure_set(x_273, 4, x_5);
+lean_closure_set(x_273, 5, x_6);
+x_274 = l_Lean_Core_withFreshMacroScope___rarg(x_273, x_168, x_8, x_9);
+return x_274;
 }
 }
 else
 {
+lean_object* x_275; lean_object* x_276; uint8_t x_277; 
+lean_dec(x_10);
+x_275 = lean_unsigned_to_nat(1u);
+x_276 = l_Lean_Syntax_getArg(x_1, x_275);
+x_277 = l_Lean_Syntax_isNone(x_276);
+if (x_277 == 0)
+{
+lean_object* x_278; lean_object* x_279; lean_object* x_280; uint8_t x_281; 
+x_278 = lean_unsigned_to_nat(0u);
+x_279 = l_Lean_Syntax_getArg(x_276, x_278);
+x_280 = l_Lean_Syntax_getArg(x_276, x_275);
+x_281 = l_Lean_Syntax_isNone(x_280);
+if (x_281 == 0)
+{
+lean_object* x_282; lean_object* x_283; lean_object* x_284; uint8_t x_285; 
+x_282 = l_Lean_Syntax_getArg(x_280, x_278);
+lean_dec(x_280);
+x_283 = l_Lean_Syntax_getKind(x_282);
+x_284 = l_Lean_Elab_Term_CollectPatternVars_collect___closed__29;
+x_285 = lean_name_eq(x_283, x_284);
+lean_dec(x_283);
+if (x_285 == 0)
+{
 lean_object* x_286; lean_object* x_287; 
-lean_dec(x_10);
+lean_dec(x_279);
+lean_dec(x_276);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
@@ -8119,58 +8154,151 @@ lean_dec(x_3);
 lean_dec(x_2);
 x_286 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
 lean_closure_set(x_286, 0, x_1);
-x_287 = l_Lean_Core_withFreshMacroScope___rarg(x_286, x_162, x_8, x_9);
+x_287 = l_Lean_Core_withFreshMacroScope___rarg(x_286, x_168, x_8, x_9);
 return x_287;
 }
-}
 else
 {
-lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; 
-lean_dec(x_10);
-x_288 = lean_unsigned_to_nat(1u);
-x_289 = l_Lean_Syntax_getArg(x_1, x_288);
-x_290 = l_Lean_Syntax_getArgs(x_289);
-lean_dec(x_289);
-x_291 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___boxed), 10, 7);
-lean_closure_set(x_291, 0, x_290);
-lean_closure_set(x_291, 1, x_2);
-lean_closure_set(x_291, 2, x_3);
-lean_closure_set(x_291, 3, x_4);
-lean_closure_set(x_291, 4, x_5);
-lean_closure_set(x_291, 5, x_6);
-lean_closure_set(x_291, 6, x_1);
-x_292 = l_Lean_Core_withFreshMacroScope___rarg(x_291, x_162, x_8, x_9);
-return x_292;
+lean_object* x_288; lean_object* x_289; 
+x_288 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11), 11, 8);
+lean_closure_set(x_288, 0, x_279);
+lean_closure_set(x_288, 1, x_2);
+lean_closure_set(x_288, 2, x_3);
+lean_closure_set(x_288, 3, x_4);
+lean_closure_set(x_288, 4, x_5);
+lean_closure_set(x_288, 5, x_6);
+lean_closure_set(x_288, 6, x_276);
+lean_closure_set(x_288, 7, x_1);
+x_289 = l_Lean_Core_withFreshMacroScope___rarg(x_288, x_168, x_8, x_9);
+return x_289;
 }
 }
 else
 {
-lean_object* x_293; lean_object* x_294; 
-lean_dec(x_10);
-x_293 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp), 9, 6);
-lean_closure_set(x_293, 0, x_1);
-lean_closure_set(x_293, 1, x_2);
-lean_closure_set(x_293, 2, x_3);
-lean_closure_set(x_293, 3, x_4);
-lean_closure_set(x_293, 4, x_5);
-lean_closure_set(x_293, 5, x_6);
-x_294 = l_Lean_Core_withFreshMacroScope___rarg(x_293, x_162, x_8, x_9);
-return x_294;
+lean_object* x_290; lean_object* x_291; 
+lean_dec(x_280);
+x_290 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11), 11, 8);
+lean_closure_set(x_290, 0, x_279);
+lean_closure_set(x_290, 1, x_2);
+lean_closure_set(x_290, 2, x_3);
+lean_closure_set(x_290, 3, x_4);
+lean_closure_set(x_290, 4, x_5);
+lean_closure_set(x_290, 5, x_6);
+lean_closure_set(x_290, 6, x_276);
+lean_closure_set(x_290, 7, x_1);
+x_291 = l_Lean_Core_withFreshMacroScope___rarg(x_290, x_168, x_8, x_9);
+return x_291;
 }
 }
 else
 {
-lean_object* x_295; lean_object* x_296; 
+lean_object* x_292; lean_object* x_293; 
+lean_dec(x_276);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_292 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
+lean_closure_set(x_292, 0, x_1);
+x_293 = l_Lean_Core_withFreshMacroScope___rarg(x_292, x_168, x_8, x_9);
+return x_293;
+}
+}
+}
+else
+{
+lean_object* x_294; lean_object* x_295; 
 lean_dec(x_10);
-x_295 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processId), 9, 6);
-lean_closure_set(x_295, 0, x_1);
-lean_closure_set(x_295, 1, x_2);
-lean_closure_set(x_295, 2, x_3);
-lean_closure_set(x_295, 3, x_4);
-lean_closure_set(x_295, 4, x_5);
-lean_closure_set(x_295, 5, x_6);
-x_296 = l_Lean_Core_withFreshMacroScope___rarg(x_295, x_162, x_8, x_9);
-return x_296;
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_294 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___boxed), 4, 1);
+lean_closure_set(x_294, 0, x_1);
+x_295 = l_Lean_Core_withFreshMacroScope___rarg(x_294, x_168, x_8, x_9);
+return x_295;
+}
+}
+else
+{
+lean_object* x_296; lean_object* x_297; 
+lean_dec(x_10);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_296 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___boxed), 4, 1);
+lean_closure_set(x_296, 0, x_1);
+x_297 = l_Lean_Core_withFreshMacroScope___rarg(x_296, x_168, x_8, x_9);
+return x_297;
+}
+}
+else
+{
+lean_object* x_298; lean_object* x_299; 
+lean_dec(x_10);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+x_298 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__6___boxed), 4, 1);
+lean_closure_set(x_298, 0, x_1);
+x_299 = l_Lean_Core_withFreshMacroScope___rarg(x_298, x_168, x_8, x_9);
+return x_299;
+}
+}
+else
+{
+lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; 
+lean_dec(x_10);
+x_300 = lean_unsigned_to_nat(1u);
+x_301 = l_Lean_Syntax_getArg(x_1, x_300);
+x_302 = l_Lean_Syntax_getArgs(x_301);
+lean_dec(x_301);
+x_303 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___boxed), 10, 7);
+lean_closure_set(x_303, 0, x_302);
+lean_closure_set(x_303, 1, x_2);
+lean_closure_set(x_303, 2, x_3);
+lean_closure_set(x_303, 3, x_4);
+lean_closure_set(x_303, 4, x_5);
+lean_closure_set(x_303, 5, x_6);
+lean_closure_set(x_303, 6, x_1);
+x_304 = l_Lean_Core_withFreshMacroScope___rarg(x_303, x_168, x_8, x_9);
+return x_304;
+}
+}
+else
+{
+lean_object* x_305; lean_object* x_306; 
+lean_dec(x_10);
+x_305 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processCtorApp), 9, 6);
+lean_closure_set(x_305, 0, x_1);
+lean_closure_set(x_305, 1, x_2);
+lean_closure_set(x_305, 2, x_3);
+lean_closure_set(x_305, 3, x_4);
+lean_closure_set(x_305, 4, x_5);
+lean_closure_set(x_305, 5, x_6);
+x_306 = l_Lean_Core_withFreshMacroScope___rarg(x_305, x_168, x_8, x_9);
+return x_306;
+}
+}
+else
+{
+lean_object* x_307; lean_object* x_308; 
+lean_dec(x_10);
+x_307 = lean_alloc_closure((void*)(l_Lean_Elab_Term_CollectPatternVars_collect_processId), 9, 6);
+lean_closure_set(x_307, 0, x_1);
+lean_closure_set(x_307, 1, x_2);
+lean_closure_set(x_307, 2, x_3);
+lean_closure_set(x_307, 3, x_4);
+lean_closure_set(x_307, 4, x_5);
+lean_closure_set(x_307, 5, x_6);
+x_308 = l_Lean_Core_withFreshMacroScope___rarg(x_307, x_168, x_8, x_9);
+return x_308;
 }
 }
 }
@@ -8706,29 +8834,29 @@ lean_dec(x_2);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___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, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___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, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
 lean_object* x_13; 
-x_13 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
+x_13 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11, x_12);
 lean_dec(x_1);
 return x_13;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11(x_1, x_2, x_3, x_4);
+x_5 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 return x_5;
 }
 }
-LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___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, lean_object* x_10) {
+LEAN_EXPORT lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___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, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; 
-x_11 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_11 = l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_1);
 return x_11;
 }
@@ -10870,36 +10998,36 @@ l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5___closed__1 = _init_l_Le
 lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5___closed__1);
 l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5___closed__2 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5___closed__2();
 lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__5___closed__2);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__1 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__1);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__2 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__2);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__3 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__3();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__3);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__4 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__4();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__4);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__5 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__5();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__5);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__6 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__6();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__6);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__7 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__7();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__7);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__8 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__8();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__8___closed__8);
 l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__1 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__1);
 l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__2 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__2();
 lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__2);
 l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__3 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__3();
 lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__3);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__1 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__1);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__2 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__2);
-l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__3 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__3();
-lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__11___closed__3);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__4 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__4();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__4);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__5 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__5();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__5);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__6 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__6();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__6);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__7 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__7();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__7);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__8 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__8();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__9___closed__8);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__1 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__1);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__2 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__2();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__2);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__3 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__3();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__10___closed__3);
 l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__1 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__1);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__2 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__2();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__2);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__3 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__3();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__12___closed__3);
+l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___closed__1 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___lambda__13___closed__1);
 l_Lean_Elab_Term_CollectPatternVars_collect___closed__1 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___closed__1);
 l_Lean_Elab_Term_CollectPatternVars_collect___closed__2 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__2();
@@ -10954,6 +11082,10 @@ l_Lean_Elab_Term_CollectPatternVars_collect___closed__26 = _init_l_Lean_Elab_Ter
 lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___closed__26);
 l_Lean_Elab_Term_CollectPatternVars_collect___closed__27 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__27();
 lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___closed__27);
+l_Lean_Elab_Term_CollectPatternVars_collect___closed__28 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__28();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___closed__28);
+l_Lean_Elab_Term_CollectPatternVars_collect___closed__29 = _init_l_Lean_Elab_Term_CollectPatternVars_collect___closed__29();
+lean_mark_persistent(l_Lean_Elab_Term_CollectPatternVars_collect___closed__29);
 l_Lean_isTracingEnabledFor___at_Lean_Elab_Term_CollectPatternVars_main___spec__1___closed__1 = _init_l_Lean_isTracingEnabledFor___at_Lean_Elab_Term_CollectPatternVars_main___spec__1___closed__1();
 lean_mark_persistent(l_Lean_isTracingEnabledFor___at_Lean_Elab_Term_CollectPatternVars_main___spec__1___closed__1);
 l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_main___spec__3___closed__1 = _init_l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_main___spec__3___closed__1();