chore: update stage0

2020-09-15 09:24:18 -07:00 · 2020-09-15 09:24:18 -07:00 · 133a0366cd
commit 133a0366cd
parent 3fa7e61b26
28 changed files with 22928 additions and 21334 deletions
--- a/stage0/src/Lean/Elab/App.lean
+++ b/stage0/src/Lean/Elab/App.lean
@ -62,7 +62,7 @@ match arg with
  ensureArgType f val expectedType

 private def mkArrow (d b : Expr) : TermElabM Expr := do
-n ← mkFreshAnonymousName;
+n ← mkFreshUserName;
 pure $ Lean.mkForall n BinderInfo.default d b

 /-
--- a/stage0/src/Lean/Elab/Binders.lean
+++ b/stage0/src/Lean/Elab/Binders.lean
@ -26,7 +26,7 @@ else
 /-- Given syntax of the form `ident <|> hole`, return `ident`. If `hole`, then we create a new anonymous name. -/
 private def expandBinderIdent (stx : Syntax) : TermElabM Syntax :=
 match_syntax stx with
-| `(_) => mkFreshAnonymousIdent stx
+| `(_) => mkFreshIdent stx
 | _    => pure stx

 /-- Given syntax of the form `(ident >> " : ")?`, return `ident`, or a new instance name. -/
@ -205,7 +205,7 @@ private partial def getFunBinderIdsAux? : Bool → Syntax → Array Syntax → T
     else do
       (some acc) ← getFunBinderIdsAux? false f acc | pure none;
       getFunBinderIdsAux? true a acc
-  | `(_) => do { ident ← mkFreshAnonymousIdent stx; pure (some (acc.push ident)) }
+  | `(_) => do { ident ← mkFreshIdent stx; pure (some (acc.push ident)) }
  | `($id:ident) => pure (some (acc.push id))
  | _ => pure none

@ -225,7 +225,7 @@ private partial def expandFunBindersAux (binders : Array Syntax) : Syntax → Na
    let binder := binders.get ⟨i, h⟩;
    let processAsPattern : Unit → TermElabM (Array Syntax × Syntax × Bool) := fun _ => do {
      let pattern := binder;
-      major ← mkFreshAnonymousIdent binder;
+      major ← mkFreshIdent binder;
      (binders, newBody, _) ← expandFunBindersAux body (i+1) (newBinders.push $ mkExplicitBinder major (mkHole binder));
      newBody ← `(match $major:ident with | $pattern => $newBody);
      pure (binders, newBody, true)
@ -235,7 +235,7 @@ private partial def expandFunBindersAux (binders : Array Syntax) : Syntax → Na
    | Syntax.node `Lean.Parser.Term.instBinder _     => expandFunBindersAux body (i+1) (newBinders.push binder)
    | Syntax.node `Lean.Parser.Term.explicitBinder _ => expandFunBindersAux body (i+1) (newBinders.push binder)
    | Syntax.node `Lean.Parser.Term.hole _ => do
-      ident ← mkFreshAnonymousIdent binder;
+      ident ← mkFreshIdent binder;
      let type := binder;
      expandFunBindersAux body (i+1) (newBinders.push $ mkExplicitBinder ident type)
    | Syntax.node `Lean.Parser.Term.paren args =>
--- a/stage0/src/Lean/Elab/Inductive.lean
+++ b/stage0/src/Lean/Elab/Inductive.lean
@ -120,6 +120,7 @@ private def throwUnexpectedInductiveType {α} : TermElabM α :=
 throwError "unexpected inductive resulting type"

 -- Given `e` of the form `forall As, B`, return `B`.
+-- It assumes `B` doesn't depend on `As`.
 private def getResultingType (e : Expr) : TermElabM Expr :=
 forallTelescopeReducing e fun _ r => pure r

@ -219,6 +220,14 @@ r.view.ctors.toList.mapM fun ctorView => Term.elabBinders ctorView.binders.getAr
        throwError ("unexpected constructor resulting type" ++ indentExpr resultingType);
      unlessM (isType resultingType) $
        throwError ("unexpected constructor resulting type, type expected" ++ indentExpr resultingType);
+      let args := resultingType.getAppArgs;
+      params.size.forM fun i => do {
+        let param := params.get! i;
+        let arg   := args.get! i;
+        unlessM (isDefEq param arg) $
+          throwError ("inductive datatype parameter mismatch" ++ indentExpr arg ++ Format.line ++ "expected" ++ indentExpr param);
+        pure ()
+      };
      pure type
    };
  type ← mkForallFVars ctorParams type;
--- a/stage0/src/Lean/Elab/Match.lean
+++ b/stage0/src/Lean/Elab/Match.lean
@ -48,22 +48,7 @@ private def expandSimpleMatchWithType (stx discr lhsVar type rhs : Syntax) (expe
 newStx ← `(let $lhsVar : $type := $discr; $rhs);
 withMacroExpansion stx newStx $ elabTerm newStx expectedType?

-private def expandMatchOptTypeAux (ref : Syntax) : Nat → MacroM Syntax
-| 0   => pure $ mkHole ref
-| n+1 => do t ← expandMatchOptTypeAux n; r ← `(forall _, $t); pure (r.copyInfo ref)
-
-private def expandMatchOptType (ref : Syntax) (optType : Syntax) (numDiscrs : Nat) : MacroM Syntax :=
-if optType.isNone then
-  expandMatchOptTypeAux ref numDiscrs
-else
-  pure $ (optType.getArg 0).getArg 1
-
-private def elabMatchOptType (matchOptType : Syntax) (numDiscrs : Nat) : TermElabM Expr := do
-ref ← getRef;
-typeStx ← liftMacroM $ expandMatchOptType ref matchOptType numDiscrs;
-elabType typeStx
-
-private partial def elabDiscrsAux (discrStxs : Array Syntax) (expectedType : Expr) : Nat → Expr → Array Expr → TermElabM (Array Expr)
+private partial def elabDiscrsWitMatchTypeAux (discrStxs : Array Syntax) (expectedType : Expr) : Nat → Expr → Array Expr → TermElabM (Array Expr)
 | i, matchType, discrs =>
  if h : i < discrStxs.size then do
    let discrStx := discrStxs.get ⟨i, h⟩;
@ -72,15 +57,40 @@ private partial def elabDiscrsAux (discrStxs : Array Syntax) (expectedType : Exp
    | Expr.forallE _ d b _ => do
      discr ← fullApproxDefEq $ elabTermEnsuringType discrStx d;
      trace `Elab.match fun _ => "discr #" ++ toString i ++ " " ++ discr ++ " : " ++ d;
-      elabDiscrsAux (i+1) (b.instantiate1 discr) (discrs.push discr)
+      elabDiscrsWitMatchTypeAux (i+1) (b.instantiate1 discr) (discrs.push discr)
    | _ => throwError ("invalid type provided to match-expression, function type with arity #" ++ toString discrStxs ++ " expected")
  else do
    unlessM (fullApproxDefEq $ isDefEq matchType expectedType) $
      throwError ("invalid result type provided to match-expression" ++ indentExpr matchType ++ Format.line ++ "expected type" ++ indentExpr expectedType);
    pure discrs

-private def elabDiscrs (discrStxs : Array Syntax) (matchType : Expr) (expectedType : Expr) : TermElabM (Array Expr) :=
-elabDiscrsAux discrStxs expectedType 0 matchType #[]
+private def elabDiscrsWitMatchType (discrStxs : Array Syntax) (matchType : Expr) (expectedType : Expr) : TermElabM (Array Expr) :=
+elabDiscrsWitMatchTypeAux discrStxs expectedType 0 matchType #[]
+
+private def mkUserNameFor (e : Expr) : TermElabM Name :=
+match e with
+| Expr.fvar fvarId _ => do localDecl ← getLocalDecl fvarId; pure localDecl.userName
+| _ => mkFreshUserName
+
+private def elabMatchTypeAndDiscrs (discrStxs : Array Syntax) (matchOptType : Syntax) (expectedType : Expr) : TermElabM (Array Expr × Expr) :=
+let numDiscrs := discrStxs.size;
+if matchOptType.isNone then do
+  discrs ← discrStxs.mapM fun discrStx => elabTerm discrStx none;
+  matchType ← discrs.foldrM
+    (fun (discr : Expr) (matchType : Expr) => do
+      discr ← instantiateMVars discr;
+      discrType ← inferType discr;
+      discrType ← instantiateMVars discrType;
+      matchTypeBody ← kabstract matchType discr;
+      userName ← mkUserNameFor discr;
+      pure $ Lean.mkForall userName BinderInfo.default discrType matchTypeBody)
+    expectedType;
+  pure (discrs, matchType)
+else do
+  let matchTypeStx := (matchOptType.getArg 0).getArg 1;
+  matchType ← elabType matchTypeStx;
+  discrs ← elabDiscrsWitMatchType discrStxs matchType expectedType;
+  pure (discrs, matchType)

 /-
 nodeWithAntiquot "matchAlt" `Lean.Parser.Term.matchAlt $ sepBy1 termParser ", " >> darrow >> termParser
@ -485,7 +495,8 @@ private partial def withPatternVarsAux {α} (pVars : Array PatternVar) (k : Arra
    match pVars.get ⟨i, h⟩ with
    | PatternVar.anonymousVar mvarId => do
      type ← mkFreshTypeMVar;
-      withLocalDecl ((`_x).appendIndexAfter i) BinderInfo.default type fun x =>
+      userName ← mkFreshUserName;
+      withLocalDecl userName BinderInfo.default type fun x =>
        withPatternVarsAux (i+1) (decls.push (PatternVarDecl.anonymousVar mvarId x.fvarId!))
    | PatternVar.localVar userName   => do
      type ← mkFreshTypeMVar;
@ -575,7 +586,7 @@ match val? with
  /- HACK: `fvarId` is not in the scope of `mvarId`
     If this generates problems in the future, we should update the metavariable declarations. -/
  assignExprMVar mvarId (mkFVar fvarId);
-  let userName := (`_x).appendIndexAfter (s.localDecls.size+1);
+  userName ← liftM $ mkFreshUserName;
  let newDecl := LocalDecl.cdecl (arbitrary _) fvarId userName type BinderInfo.default;
  modify $ fun s =>
    { s with
@ -688,9 +699,8 @@ unless result.unusedAltIdxs.isEmpty $

 private def elabMatchAux (discrStxs : Array Syntax) (altViews : Array MatchAltView) (matchOptType : Syntax) (expectedType : Expr)
    : TermElabM Expr := do
-matchType ← elabMatchOptType matchOptType discrStxs.size;
+(discrs, matchType) ← elabMatchTypeAndDiscrs discrStxs matchOptType expectedType;
 matchAlts ← expandMacrosInPatterns altViews;
-discrs ← elabDiscrs discrStxs matchType expectedType;
 trace `Elab.match fun _ => "matchType: " ++ matchType;
 alts ← matchAlts.mapM $ fun alt => elabMatchAltView alt matchType;
 let rhss := alts.map Prod.snd;
--- a/stage0/src/Lean/Elab/SyntheticMVars.lean
+++ b/stage0/src/Lean/Elab/SyntheticMVars.lean
@ -26,14 +26,33 @@ def ensureAssignmentHasNoMVars (mvarId : MVarId) : TermElabM Unit := do
 val ← instantiateMVars (mkMVar mvarId);
 when val.hasExprMVar $ throwError ("tactic failed, result still contain metavariables" ++ indentExpr val)

-def runTactic (mvarId : MVarId) (tacticCode : Syntax) : TermElabM Unit := do
-modifyThe Meta.State $ fun s => { s with mctx := s.mctx.instantiateMVarDeclMVars mvarId };
-remainingGoals ← liftTacticElabM mvarId $ do { evalTactic tacticCode; getUnsolvedGoals };
+private partial def getTacticRCurly? : Syntax → Option Syntax
+| stx =>
+  if stx.isOfKind `Lean.Parser.Term.byTactic then
+    getTacticRCurly? $ stx.getArg 1
+  else if stx.isOfKind `Lean.Parser.Tactic.seq && stx.getArgs.size == 1 then
+    getTacticRCurly? $ stx.getArg 0
+  else if stx.isOfKind `Lean.Parser.Tactic.nestedTacticBlockCurly then
+    some (stx.getArg 2)
+  else
+    none
+
+private def getTacticErrorRef (tacticCode : Syntax) : TermElabM Syntax := do
 ref ← getRef;
-let tailRef := ref.getTailWithPos.getD ref;
-withRef tailRef do
-unless remainingGoals.isEmpty (reportUnsolvedGoals remainingGoals);
-ensureAssignmentHasNoMVars mvarId
+match getTacticRCurly? tacticCode with
+| some rcurly => pure $ replaceRef rcurly ref
+| none        => pure $ replaceRef tacticCode ref
+
+def runTactic (mvarId : MVarId) (tacticCode : Syntax) : TermElabM Unit := do
+/- Recall, `tacticCode` is the whole `by ...` expression.
+   We store the `by` because in the future we want to save the initial state information at the `by` position. -/
+let code := tacticCode.getArg 1;
+modifyThe Meta.State $ fun s => { s with mctx := s.mctx.instantiateMVarDeclMVars mvarId };
+remainingGoals ← liftTacticElabM mvarId $ do { evalTactic code; getUnsolvedGoals };
+ref ← getTacticErrorRef tacticCode;
+withRef ref do
+  unless remainingGoals.isEmpty (reportUnsolvedGoals remainingGoals);
+  ensureAssignmentHasNoMVars mvarId

 /-- Auxiliary function used to implement `synthesizeSyntheticMVars`. -/
 private def resumeElabTerm (stx : Syntax) (expectedType? : Option Expr) (errToSorry := true) : TermElabM Expr :=
--- a/stage0/src/Lean/Elab/Tactic/Basic.lean
+++ b/stage0/src/Lean/Elab/Tactic/Basic.lean
@ -22,9 +22,7 @@ def goalsToMessageData (goals : List MVarId) : MessageData :=
 MessageData.joinSep (goals.map $ MessageData.ofGoal) (Format.line ++ Format.line)

 def Term.reportUnsolvedGoals (goals : List MVarId) : TermElabM Unit := do
-ref ← getRef;
-let tailRef := ref.getTailWithPos.getD ref;
-throwErrorAt tailRef $ "unsolved goals" ++ Format.line ++ goalsToMessageData goals
+throwError $ "unsolved goals" ++ Format.line ++ goalsToMessageData goals

 namespace Tactic

@ -398,7 +396,7 @@ match g? with

@[builtinTactic «case»] def evalCase : Tactic :=
 fun stx => match_syntax stx with
-  | `(tactic| case $tag $tac) => do
+  | `(tactic| case $tag => $tac:tacticSeq) => do
     let tag := tag.getId;
     gs ← getUnsolvedGoals;
     some g ← findTag? gs tag | throwError "tag not found";
--- a/stage0/src/Lean/Elab/Tactic/Match.lean
+++ b/stage0/src/Lean/Elab/Tactic/Match.lean
@ -20,19 +20,19 @@ let matchAlts := matchTac.getArg 4;
 let alts      := (matchAlts.getArg 1).getArgs;
 newAlts ← alts.mapSepElemsM fun alt => do {
  let alt    := alt.updateKind `Lean.Parser.Term.matchAlt;
-  let holeOrTactic := alt.getArg 2;
-  if holeOrTactic.isOfKind `Lean.Parser.Term.syntheticHole then
+  let holeOrTacticSeq := alt.getArg 2;
+  if holeOrTacticSeq.isOfKind `Lean.Parser.Term.syntheticHole then
    pure alt
-  else if holeOrTactic.isOfKind `Lean.Parser.Term.hole then do
+  else if holeOrTacticSeq.isOfKind `Lean.Parser.Term.hole then do
    s ← get;
-    let holeName := mkIdentFrom holeOrTactic (parentTag ++ (`match).appendIndexAfter s.nextIdx);
+    let holeName := mkIdentFrom holeOrTacticSeq (parentTag ++ (`match).appendIndexAfter s.nextIdx);
    newHole ← `(?$holeName:ident);
    modify fun s => { s with nextIdx := s.nextIdx + 1};
    pure $ alt.setArg 2 newHole
  else withFreshMacroScope do
    newHole ← `(?rhs);
    let newHoleId := newHole.getArg 1;
-    newCase ← `(tactic| case $newHoleId $holeOrTactic);
+    newCase ← `(tactic| case $newHoleId => $holeOrTacticSeq:tacticSeq );
    modify fun s => { s with cases := s.cases.push newCase };
    pure $ alt.setArg 2 newHole
 };
--- a/stage0/src/Lean/Elab/Term.lean
+++ b/stage0/src/Lean/Elab/Term.lean
@ -135,8 +135,6 @@ structure State :=
 (syntheticMVars    : List SyntheticMVarDecl := [])
 (mvarErrorContexts : List MVarErrorContext := [])
 (messages          : MessageLog := {})
-(instImplicitIdx   : Nat := 1)
-(anonymousIdx      : Nat := 1)
 (nextMacroScope    : Nat := firstFrontendMacroScope + 1)
 (letRecsToLift     : List LetRecToLift := [])

@ -435,28 +433,25 @@ pure e
 /--
  Auxiliary method for creating fresh binder names.
  Do not confuse with the method for creating fresh free/meta variable ids. -/
-def mkFreshAnonymousName : TermElabM Name := do
-s ← get;
-let anonymousIdx := s.anonymousIdx;
-modify $ fun s => { s with anonymousIdx := s.anonymousIdx + 1 };
-pure $ (`_a).appendIndexAfter anonymousIdx
+def mkFreshUserName : TermElabM Name :=
+withFreshMacroScope do
+  x ← `(x);
+  pure x.getId

 /--
  Auxiliary method for creating a `Syntax.ident` containing
  a fresh name. This method is intended for creating fresh binder names.
-  It is just a thin layer on top of `mkFreshAnonymousName`. -/
-def mkFreshAnonymousIdent (ref : Syntax) : TermElabM Syntax := do
-n ← mkFreshAnonymousName;
+  It is just a thin layer on top of `mkFreshUserName`. -/
+def mkFreshIdent (ref : Syntax) : TermElabM Syntax := do
+n ← mkFreshUserName;
 pure $ mkIdentFrom ref n

 /--
-  Auxiliary method for creating binder names for local instances.
-  Users expect them to be named as `_inst_<idx>`. -/
-def mkFreshInstanceName : TermElabM Name := do
-s ← get;
-let instIdx := s.instImplicitIdx;
-modify $ fun s => { s with instImplicitIdx := s.instImplicitIdx + 1 };
-pure $ (`_inst).appendIndexAfter instIdx
+  Auxiliary method for creating binder names for local instances. -/
+def mkFreshInstanceName : TermElabM Name :=
+withFreshMacroScope do
+  inst ← `(inst);
+  pure inst.getId

 private partial def hasCDot : Syntax → Bool
 | Syntax.node k args =>
@ -1037,7 +1032,7 @@ fun stx expectedType? => do
  registerMVarErrorContext mvar.mvarId! stx;
  pure mvar

-def mkTacticMVar (type : Expr) (tacticCode : Syntax) : TermElabM Expr := do
+private def mkTacticMVar (type : Expr) (tacticCode : Syntax) : TermElabM Expr := do
 mvar ← mkFreshExprMVar type MetavarKind.syntheticOpaque `main;
 let mvarId := mvar.mvarId!;
 ref ← getRef;
@ -1048,7 +1043,7 @@ pure mvar
@[builtinTermElab byTactic] def elabByTactic : TermElab :=
 fun stx expectedType? =>
  match expectedType? with
-  | some expectedType => mkTacticMVar expectedType (stx.getArg 1)
+  | some expectedType => mkTacticMVar expectedType stx
  | none => throwError ("invalid 'by' tactic, expected type has not been provided")

 /-- Main loop for `mkPairs`. -/
--- a/stage0/src/Lean/Parser/Tactic.lean
+++ b/stage0/src/Lean/Parser/Tactic.lean
@ -41,6 +41,8 @@ def ident' : Parser := ident <|> underscore
@[builtinTacticParser] def «case»       := parser! nonReservedSymbol "case " >> ident >> darrow >> indentedNonEmptySeq
@[builtinTacticParser] def «allGoals»   := parser! nonReservedSymbol "allGoals " >> indentedNonEmptySeq
@[builtinTacticParser] def «skip»       := parser! nonReservedSymbol "skip"
+@[builtinTacticParser] def «done»       := parser! nonReservedSymbol "done"
+@[builtinTacticParser] def «admit»      := parser! nonReservedSymbol "admit"
@[builtinTacticParser] def «traceState» := parser! nonReservedSymbol "traceState"
@[builtinTacticParser] def «failIfSuccess» := parser! nonReservedSymbol "failIfSuccess " >> indentedNonEmptySeq
@[builtinTacticParser] def «generalize» := parser! nonReservedSymbol "generalize " >> optional (try (ident >> " : ")) >> termParser 51 >> " = " >> ident
--- a/stage0/stdlib/Lean/Elab/App.c
+++ b/stage0/stdlib/Lean/Elab/App.c
@ -19,7 +19,7 @@ lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_App_28__elabAppAux
 lean_object* l_Array_forMAux___main___at___private_Lean_Elab_App_10__elabAppArgsAux___main___spec__18___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___private_Lean_Elab_App_7__hasOnlyTypeMVar___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_elabForall___spec__1___rarg(lean_object*);
-extern lean_object* l___private_Lean_Elab_SyntheticMVars_7__synthesizeSyntheticMVarsStep___closed__9;
+lean_object* l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_fieldIdxKind;
 lean_object* l___private_Lean_Elab_App_14__resolveLValAux___closed__23;
 lean_object* l___private_Lean_Elab_App_26__toMessageList(lean_object*);
@ -27,6 +27,7 @@ lean_object* l_Lean_Expr_mvarId_x21(lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 lean_object* l_Lean_Name_eraseMacroScopes(lean_object*);
 lean_object* l___private_Lean_Elab_App_14__resolveLValAux___closed__13;
+extern lean_object* l___private_Lean_Elab_SyntheticMVars_9__synthesizeSyntheticMVarsStep___closed__9;
 lean_object* l_Lean_Syntax_isNatLitAux(lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Meta_ExprDefEq_8__checkTypesAndAssign___closed__7;
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Term_expandApp___spec__1___closed__3;
@ -75,7 +76,6 @@ lean_object* l___private_Lean_Elab_App_4__tryCoeFun___closed__7;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* lean_environment_find(lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__1;
-extern lean_object* l___private_Lean_Elab_SyntheticMVars_7__synthesizeSyntheticMVarsStep___closed__10;
 lean_object* l___private_Lean_Elab_App_5__getForallBody(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Term_expandApp___spec__1___closed__6;
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
@ -130,7 +130,6 @@ lean_object* l___private_Lean_Elab_App_14__resolveLValAux___closed__2;
 lean_object* l_Lean_Elab_Term_addNamedArg___closed__6;
 lean_object* l_Lean_Meta_inferType___at___private_Lean_Meta_InferType_1__inferAppType___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at___private_Lean_Elab_App_10__elabAppArgsAux___main___spec__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* l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_23__elabAppFn(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_FindMVar_main___main___at___private_Lean_Elab_App_6__hasTypeMVar___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at___private_Lean_Elab_App_10__elabAppArgsAux___main___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*);
@ -176,10 +175,10 @@ extern lean_object* l___regBuiltin_Lean_Elab_Tactic_evalNestedTacticBlock___clos
 lean_object* l___private_Lean_Elab_App_14__resolveLValAux___closed__18;
 lean_object* l_Lean_Elab_Term_elabTermEnsuringType(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
+extern lean_object* l___private_Lean_Elab_SyntheticMVars_9__synthesizeSyntheticMVarsStep___closed__10;
 lean_object* l___private_Lean_Elab_App_14__resolveLValAux___closed__15;
 lean_object* l_Lean_mkProj(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrayRef(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_mkFreshAnonymousName___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_19__addLValArg___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*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabNamedPattern___closed__1;
@ -317,6 +316,7 @@ lean_object* l_Lean_Elab_getRefPos___at___private_Lean_Elab_App_25__toMessageDat
 extern lean_object* l_Lean_mkAppStx___closed__3;
 lean_object* l_Lean_Meta_getLevel___at_Lean_Elab_Term_tryCoe___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_25__toMessageData___closed__1;
+lean_object* l_Lean_Elab_Term_mkFreshUserName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Option_HasRepr___rarg___closed__3;
 lean_object* l_Array_forMAux___main___at___private_Lean_Elab_App_10__elabAppArgsAux___main___spec__13___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_forMAux___main___at___private_Lean_Elab_App_10__elabAppArgsAux___main___spec__15(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -1085,7 +1085,7 @@ lean_object* l___private_Lean_Elab_App_3__mkArrow(lean_object* x_1, lean_object*
 _start:
 {
 lean_object* x_10; uint8_t x_11; 
-x_10 = l_Lean_Elab_Term_mkFreshAnonymousName___rarg(x_4, x_5, x_6, x_7, x_8, x_9);
+x_10 = l_Lean_Elab_Term_mkFreshUserName(x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 x_11 = !lean_is_exclusive(x_10);
 if (x_11 == 0)
 {
@ -1123,7 +1123,6 @@ lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_3);
 return x_10;
 }
 }
@ -1216,6 +1215,7 @@ lean_inc(x_12);
 lean_dec(x_10);
 lean_inc(x_11);
 x_13 = l_Lean_mkSort(x_11);
+lean_inc(x_3);
 lean_inc(x_1);
 x_14 = l___private_Lean_Elab_App_3__mkArrow(x_1, x_13, x_3, x_4, x_5, x_6, x_7, x_8, x_12);
 x_15 = lean_ctor_get(x_14, 0);
@ -14095,7 +14095,7 @@ lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_37 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_35, x_36, x_4, x_5, x_6, x_7, x_8, x_9, x_34);
+x_37 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_35, x_36, x_4, x_5, x_6, x_7, x_8, x_9, x_34);
 if (lean_obj_tag(x_37) == 0)
 {
 lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
@ -19783,7 +19783,7 @@ lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_1920 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_1918, x_1919, x_4, x_5, x_6, x_7, x_1909, x_9, x_1917);
+x_1920 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_1918, x_1919, x_4, x_5, x_6, x_7, x_1909, x_9, x_1917);
 if (lean_obj_tag(x_1920) == 0)
 {
 lean_object* x_1921; lean_object* x_1922; lean_object* x_1923; lean_object* x_1924; 
@ -20439,7 +20439,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___private_Lean_Elab_App_11__elabAppArgs___closed__5;
-x_2 = l___private_Lean_Elab_SyntheticMVars_7__synthesizeSyntheticMVarsStep___closed__9;
+x_2 = l___private_Lean_Elab_SyntheticMVars_9__synthesizeSyntheticMVarsStep___closed__9;
 x_3 = lean_alloc_ctor(9, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@ -20463,7 +20463,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___private_Lean_Elab_App_11__elabAppArgs___closed__5;
-x_2 = l___private_Lean_Elab_SyntheticMVars_7__synthesizeSyntheticMVarsStep___closed__10;
+x_2 = l___private_Lean_Elab_SyntheticMVars_9__synthesizeSyntheticMVarsStep___closed__10;
 x_3 = lean_alloc_ctor(9, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
--- a/stage0/stdlib/Lean/Elab/Binders.c
+++ b/stage0/stdlib/Lean/Elab/Binders.c
--- a/stage0/stdlib/Lean/Elab/Command.c
+++ b/stage0/stdlib/Lean/Elab/Command.c
@ -22,6 +22,7 @@ lean_object* l_Lean_throwError___at___private_Lean_Elab_Command_3__elabCommandUs
 lean_object* l_Lean_Elab_applyVisibility___at_Lean_Elab_Command_expandDeclId___spec__5(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabEval___closed__3;
 lean_object* l_Lean_extractMacroScopes(lean_object*);
+lean_object* l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_9__addNamespace(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_commandElabAttribute___closed__3;
 lean_object* l_Lean_Elab_Command_Lean_MonadOptions;
@ -169,7 +170,6 @@ lean_object* l_Lean_Elab_Command_getLevelNames___rarg(lean_object*, lean_object*
 lean_object* l_Lean_Elab_Command_getScopes___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_MonadIO(lean_object*);
 lean_object* l_Std_mkHashMap___at_Lean_Elab_Command_commandElabAttribute___spec__1(lean_object*);
-lean_object* l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttribute___closed__10;
 lean_object* l___private_Lean_Elab_Command_8__addScopes___main___closed__3;
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___main___spec__7___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -6103,7 +6103,7 @@ return x_5;
 lean_object* l_Lean_Elab_Command_liftTermElabM___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-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_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+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_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
 x_6 = lean_st_ref_get(x_4, x_5);
 x_7 = lean_ctor_get(x_6, 0);
 lean_inc(x_7);
@ -6121,295 +6121,292 @@ lean_inc(x_12);
 x_13 = l___private_Lean_Elab_Command_6__mkTermContext(x_3, x_7, x_1);
 x_14 = lean_box(0);
 x_15 = l_Std_PersistentArray_empty___closed__3;
-x_16 = lean_unsigned_to_nat(1u);
-x_17 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_17, 0, x_14);
-lean_ctor_set(x_17, 1, x_14);
-lean_ctor_set(x_17, 2, x_15);
-lean_ctor_set(x_17, 3, x_16);
-lean_ctor_set(x_17, 4, x_16);
-lean_ctor_set(x_17, 5, x_11);
-lean_ctor_set(x_17, 6, x_14);
-x_18 = l___private_Lean_Elab_Command_1__mkCoreContext(x_3, x_7);
+x_16 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_16, 1, x_14);
+lean_ctor_set(x_16, 2, x_15);
+lean_ctor_set(x_16, 3, x_11);
+lean_ctor_set(x_16, 4, x_14);
+x_17 = l___private_Lean_Elab_Command_1__mkCoreContext(x_3, x_7);
 lean_dec(x_7);
-x_19 = l_Lean_TraceState_Inhabited___closed__1;
-x_20 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_20, 0, x_9);
-lean_ctor_set(x_20, 1, x_12);
-lean_ctor_set(x_20, 2, x_19);
-x_21 = lean_st_mk_ref(x_20, x_8);
-x_22 = lean_ctor_get(x_21, 0);
+x_18 = l_Lean_TraceState_Inhabited___closed__1;
+x_19 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_19, 0, x_9);
+lean_ctor_set(x_19, 1, x_12);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_st_mk_ref(x_19, x_8);
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_20, 1);
 lean_inc(x_22);
-x_23 = lean_ctor_get(x_21, 1);
-lean_inc(x_23);
-lean_dec(x_21);
-x_71 = l_Lean_Meta_State_inhabited___closed__7;
-x_72 = lean_st_mk_ref(x_71, x_23);
-x_73 = lean_ctor_get(x_72, 0);
+lean_dec(x_20);
+x_70 = l_Lean_Meta_State_inhabited___closed__7;
+x_71 = lean_st_mk_ref(x_70, x_22);
+x_72 = lean_ctor_get(x_71, 0);
+lean_inc(x_72);
+x_73 = lean_ctor_get(x_71, 1);
 lean_inc(x_73);
-x_74 = lean_ctor_get(x_72, 1);
-lean_inc(x_74);
-lean_dec(x_72);
-x_75 = lean_st_mk_ref(x_17, x_74);
-x_76 = lean_ctor_get(x_75, 0);
+lean_dec(x_71);
+x_74 = lean_st_mk_ref(x_16, x_73);
+x_75 = lean_ctor_get(x_74, 0);
+lean_inc(x_75);
+x_76 = lean_ctor_get(x_74, 1);
 lean_inc(x_76);
-x_77 = lean_ctor_get(x_75, 1);
-lean_inc(x_77);
-lean_dec(x_75);
-x_78 = l_Lean_Elab_Command_liftTermElabM___rarg___closed__2;
-lean_inc(x_22);
-lean_inc(x_73);
-lean_inc(x_76);
-x_79 = lean_apply_7(x_2, x_13, x_76, x_78, x_73, x_18, x_22, x_77);
-if (lean_obj_tag(x_79) == 0)
+lean_dec(x_74);
+x_77 = l_Lean_Elab_Command_liftTermElabM___rarg___closed__2;
+lean_inc(x_21);
+lean_inc(x_72);
+lean_inc(x_75);
+x_78 = lean_apply_7(x_2, x_13, x_75, x_77, x_72, x_17, x_21, x_76);
+if (lean_obj_tag(x_78) == 0)
 {
-lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-x_80 = lean_ctor_get(x_79, 0);
+lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+x_79 = lean_ctor_get(x_78, 0);
+lean_inc(x_79);
+x_80 = lean_ctor_get(x_78, 1);
 lean_inc(x_80);
-x_81 = lean_ctor_get(x_79, 1);
-lean_inc(x_81);
-lean_dec(x_79);
-x_82 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_82, 0, x_80);
-x_83 = lean_st_ref_get(x_76, x_81);
-lean_dec(x_76);
-x_84 = lean_ctor_get(x_83, 0);
+lean_dec(x_78);
+x_81 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_81, 0, x_79);
+x_82 = lean_st_ref_get(x_75, x_80);
+lean_dec(x_75);
+x_83 = lean_ctor_get(x_82, 0);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_82, 1);
 lean_inc(x_84);
-x_85 = lean_ctor_get(x_83, 1);
-lean_inc(x_85);
-lean_dec(x_83);
-x_86 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_86, 0, x_82);
-lean_ctor_set(x_86, 1, x_84);
-x_87 = lean_st_ref_get(x_73, x_85);
-lean_dec(x_73);
-x_88 = lean_ctor_get(x_87, 0);
+lean_dec(x_82);
+x_85 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_85, 0, x_81);
+lean_ctor_set(x_85, 1, x_83);
+x_86 = lean_st_ref_get(x_72, x_84);
+lean_dec(x_72);
+x_87 = lean_ctor_get(x_86, 0);
+lean_inc(x_87);
+x_88 = lean_ctor_get(x_86, 1);
 lean_inc(x_88);
-x_89 = lean_ctor_get(x_87, 1);
-lean_inc(x_89);
-lean_dec(x_87);
-x_90 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_90, 0, x_86);
-lean_ctor_set(x_90, 1, x_88);
-x_24 = x_90;
-x_25 = x_89;
-goto block_70;
+lean_dec(x_86);
+x_89 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_89, 0, x_85);
+lean_ctor_set(x_89, 1, x_87);
+x_23 = x_89;
+x_24 = x_88;
+goto block_69;
 }
 else
 {
-lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; 
-x_91 = lean_ctor_get(x_79, 0);
+lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; 
+x_90 = lean_ctor_get(x_78, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_78, 1);
 lean_inc(x_91);
-x_92 = lean_ctor_get(x_79, 1);
-lean_inc(x_92);
-lean_dec(x_79);
-x_93 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_93, 0, x_91);
-x_94 = lean_st_ref_get(x_76, x_92);
-lean_dec(x_76);
-x_95 = lean_ctor_get(x_94, 0);
+lean_dec(x_78);
+x_92 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_92, 0, x_90);
+x_93 = lean_st_ref_get(x_75, x_91);
+lean_dec(x_75);
+x_94 = lean_ctor_get(x_93, 0);
+lean_inc(x_94);
+x_95 = lean_ctor_get(x_93, 1);
 lean_inc(x_95);
-x_96 = lean_ctor_get(x_94, 1);
-lean_inc(x_96);
-lean_dec(x_94);
-x_97 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_97, 0, x_93);
-lean_ctor_set(x_97, 1, x_95);
-x_98 = lean_st_ref_get(x_73, x_96);
-lean_dec(x_73);
-x_99 = lean_ctor_get(x_98, 0);
+lean_dec(x_93);
+x_96 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_96, 0, x_92);
+lean_ctor_set(x_96, 1, x_94);
+x_97 = lean_st_ref_get(x_72, x_95);
+lean_dec(x_72);
+x_98 = lean_ctor_get(x_97, 0);
+lean_inc(x_98);
+x_99 = lean_ctor_get(x_97, 1);
 lean_inc(x_99);
-x_100 = lean_ctor_get(x_98, 1);
-lean_inc(x_100);
-lean_dec(x_98);
-x_101 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_101, 0, x_97);
-lean_ctor_set(x_101, 1, x_99);
-x_24 = x_101;
-x_25 = x_100;
-goto block_70;
+lean_dec(x_97);
+x_100 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_100, 0, x_96);
+lean_ctor_set(x_100, 1, x_98);
+x_23 = x_100;
+x_24 = x_99;
+goto block_69;
 }
-block_70:
+block_69:
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; 
-x_26 = lean_st_ref_get(x_22, x_25);
-lean_dec(x_22);
-x_27 = lean_ctor_get(x_24, 0);
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
+x_25 = lean_st_ref_get(x_21, x_24);
+lean_dec(x_21);
+x_26 = lean_ctor_get(x_23, 0);
+lean_inc(x_26);
+lean_dec(x_23);
+x_27 = lean_ctor_get(x_25, 0);
 lean_inc(x_27);
-lean_dec(x_24);
-x_28 = lean_ctor_get(x_26, 0);
+x_28 = lean_ctor_get(x_25, 1);
 lean_inc(x_28);
-x_29 = lean_ctor_get(x_26, 1);
+lean_dec(x_25);
+x_29 = lean_ctor_get(x_26, 0);
 lean_inc(x_29);
-lean_dec(x_26);
-x_30 = lean_ctor_get(x_27, 0);
+x_30 = lean_ctor_get(x_26, 1);
 lean_inc(x_30);
-x_31 = lean_ctor_get(x_27, 1);
-lean_inc(x_31);
-lean_dec(x_27);
-x_32 = lean_st_ref_take(x_4, x_29);
-x_33 = lean_ctor_get(x_32, 0);
+lean_dec(x_26);
+x_31 = lean_st_ref_take(x_4, x_28);
+x_32 = lean_ctor_get(x_31, 0);
+lean_inc(x_32);
+x_33 = lean_ctor_get(x_31, 1);
 lean_inc(x_33);
-x_34 = lean_ctor_get(x_32, 1);
-lean_inc(x_34);
-lean_dec(x_32);
-x_35 = lean_ctor_get(x_28, 0);
-lean_inc(x_35);
-x_36 = lean_ctor_get(x_28, 1);
-lean_inc(x_36);
-lean_dec(x_28);
-x_37 = lean_ctor_get(x_31, 2);
-lean_inc(x_37);
 lean_dec(x_31);
-x_38 = l_Std_PersistentArray_append___rarg(x_10, x_37);
-lean_dec(x_37);
-x_39 = !lean_is_exclusive(x_33);
-if (x_39 == 0)
+x_34 = lean_ctor_get(x_27, 0);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_27, 1);
+lean_inc(x_35);
+lean_dec(x_27);
+x_36 = lean_ctor_get(x_30, 2);
+lean_inc(x_36);
+lean_dec(x_30);
+x_37 = l_Std_PersistentArray_append___rarg(x_10, x_36);
+lean_dec(x_36);
+x_38 = !lean_is_exclusive(x_32);
+if (x_38 == 0)
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_40 = lean_ctor_get(x_33, 6);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_39 = lean_ctor_get(x_32, 6);
+lean_dec(x_39);
+x_40 = lean_ctor_get(x_32, 1);
 lean_dec(x_40);
-x_41 = lean_ctor_get(x_33, 1);
+x_41 = lean_ctor_get(x_32, 0);
 lean_dec(x_41);
-x_42 = lean_ctor_get(x_33, 0);
-lean_dec(x_42);
-lean_ctor_set(x_33, 6, x_36);
-lean_ctor_set(x_33, 1, x_38);
-lean_ctor_set(x_33, 0, x_35);
-x_43 = lean_st_ref_set(x_4, x_33, x_34);
-if (lean_obj_tag(x_30) == 0)
+lean_ctor_set(x_32, 6, x_35);
+lean_ctor_set(x_32, 1, x_37);
+lean_ctor_set(x_32, 0, x_34);
+x_42 = lean_st_ref_set(x_4, x_32, x_33);
+if (lean_obj_tag(x_29) == 0)
 {
-uint8_t x_44; 
-x_44 = !lean_is_exclusive(x_43);
-if (x_44 == 0)
+uint8_t x_43; 
+x_43 = !lean_is_exclusive(x_42);
+if (x_43 == 0)
 {
-lean_object* x_45; lean_object* x_46; 
-x_45 = lean_ctor_get(x_43, 0);
-lean_dec(x_45);
-x_46 = lean_ctor_get(x_30, 0);
+lean_object* x_44; lean_object* x_45; 
+x_44 = lean_ctor_get(x_42, 0);
+lean_dec(x_44);
+x_45 = lean_ctor_get(x_29, 0);
+lean_inc(x_45);
+lean_dec(x_29);
+lean_ctor_set_tag(x_42, 1);
+lean_ctor_set(x_42, 0, x_45);
+return x_42;
+}
+else
+{
+lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_46 = lean_ctor_get(x_42, 1);
 lean_inc(x_46);
-lean_dec(x_30);
-lean_ctor_set_tag(x_43, 1);
-lean_ctor_set(x_43, 0, x_46);
-return x_43;
-}
-else
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-x_47 = lean_ctor_get(x_43, 1);
+lean_dec(x_42);
+x_47 = lean_ctor_get(x_29, 0);
 lean_inc(x_47);
-lean_dec(x_43);
-x_48 = lean_ctor_get(x_30, 0);
-lean_inc(x_48);
-lean_dec(x_30);
-x_49 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_49, 0, x_48);
-lean_ctor_set(x_49, 1, x_47);
-return x_49;
+lean_dec(x_29);
+x_48 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_48, 0, x_47);
+lean_ctor_set(x_48, 1, x_46);
+return x_48;
 }
 }
 else
 {
-uint8_t x_50; 
-x_50 = !lean_is_exclusive(x_43);
-if (x_50 == 0)
+uint8_t x_49; 
+x_49 = !lean_is_exclusive(x_42);
+if (x_49 == 0)
 {
-lean_object* x_51; lean_object* x_52; 
-x_51 = lean_ctor_get(x_43, 0);
-lean_dec(x_51);
-x_52 = lean_ctor_get(x_30, 0);
+lean_object* x_50; lean_object* x_51; 
+x_50 = lean_ctor_get(x_42, 0);
+lean_dec(x_50);
+x_51 = lean_ctor_get(x_29, 0);
+lean_inc(x_51);
+lean_dec(x_29);
+lean_ctor_set(x_42, 0, x_51);
+return x_42;
+}
+else
+{
+lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+x_52 = lean_ctor_get(x_42, 1);
 lean_inc(x_52);
-lean_dec(x_30);
-lean_ctor_set(x_43, 0, x_52);
-return x_43;
-}
-else
-{
-lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_53 = lean_ctor_get(x_43, 1);
+lean_dec(x_42);
+x_53 = lean_ctor_get(x_29, 0);
 lean_inc(x_53);
-lean_dec(x_43);
-x_54 = lean_ctor_get(x_30, 0);
-lean_inc(x_54);
-lean_dec(x_30);
-x_55 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_55, 1, x_53);
-return x_55;
+lean_dec(x_29);
+x_54 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_54, 0, x_53);
+lean_ctor_set(x_54, 1, x_52);
+return x_54;
 }
 }
 }
 else
 {
-lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_56 = lean_ctor_get(x_33, 2);
-x_57 = lean_ctor_get(x_33, 3);
-x_58 = lean_ctor_get(x_33, 4);
-x_59 = lean_ctor_get(x_33, 5);
-lean_inc(x_59);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_55 = lean_ctor_get(x_32, 2);
+x_56 = lean_ctor_get(x_32, 3);
+x_57 = lean_ctor_get(x_32, 4);
+x_58 = lean_ctor_get(x_32, 5);
 lean_inc(x_58);
 lean_inc(x_57);
 lean_inc(x_56);
-lean_dec(x_33);
-x_60 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_60, 0, x_35);
-lean_ctor_set(x_60, 1, x_38);
-lean_ctor_set(x_60, 2, x_56);
-lean_ctor_set(x_60, 3, x_57);
-lean_ctor_set(x_60, 4, x_58);
-lean_ctor_set(x_60, 5, x_59);
-lean_ctor_set(x_60, 6, x_36);
-x_61 = lean_st_ref_set(x_4, x_60, x_34);
-if (lean_obj_tag(x_30) == 0)
+lean_inc(x_55);
+lean_dec(x_32);
+x_59 = lean_alloc_ctor(0, 7, 0);
+lean_ctor_set(x_59, 0, x_34);
+lean_ctor_set(x_59, 1, x_37);
+lean_ctor_set(x_59, 2, x_55);
+lean_ctor_set(x_59, 3, x_56);
+lean_ctor_set(x_59, 4, x_57);
+lean_ctor_set(x_59, 5, x_58);
+lean_ctor_set(x_59, 6, x_35);
+x_60 = lean_st_ref_set(x_4, x_59, x_33);
+if (lean_obj_tag(x_29) == 0)
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_62 = lean_ctor_get(x_61, 1);
-lean_inc(x_62);
-if (lean_is_exclusive(x_61)) {
- lean_ctor_release(x_61, 0);
- lean_ctor_release(x_61, 1);
- x_63 = x_61;
+lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_61 = lean_ctor_get(x_60, 1);
+lean_inc(x_61);
+if (lean_is_exclusive(x_60)) {
+ lean_ctor_release(x_60, 0);
+ lean_ctor_release(x_60, 1);
+ x_62 = x_60;
 } else {
- lean_dec_ref(x_61);
- x_63 = lean_box(0);
+ lean_dec_ref(x_60);
+ x_62 = lean_box(0);
 }
-x_64 = lean_ctor_get(x_30, 0);
-lean_inc(x_64);
-lean_dec(x_30);
-if (lean_is_scalar(x_63)) {
- x_65 = lean_alloc_ctor(1, 2, 0);
+x_63 = lean_ctor_get(x_29, 0);
+lean_inc(x_63);
+lean_dec(x_29);
+if (lean_is_scalar(x_62)) {
+ x_64 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_65 = x_63;
- lean_ctor_set_tag(x_65, 1);
+ x_64 = x_62;
+ lean_ctor_set_tag(x_64, 1);
 }
-lean_ctor_set(x_65, 0, x_64);
-lean_ctor_set(x_65, 1, x_62);
-return x_65;
+lean_ctor_set(x_64, 0, x_63);
+lean_ctor_set(x_64, 1, x_61);
+return x_64;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-x_66 = lean_ctor_get(x_61, 1);
-lean_inc(x_66);
-if (lean_is_exclusive(x_61)) {
- lean_ctor_release(x_61, 0);
- lean_ctor_release(x_61, 1);
- x_67 = x_61;
+lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_65 = lean_ctor_get(x_60, 1);
+lean_inc(x_65);
+if (lean_is_exclusive(x_60)) {
+ lean_ctor_release(x_60, 0);
+ lean_ctor_release(x_60, 1);
+ x_66 = x_60;
 } else {
- lean_dec_ref(x_61);
- x_67 = lean_box(0);
+ lean_dec_ref(x_60);
+ x_66 = lean_box(0);
 }
-x_68 = lean_ctor_get(x_30, 0);
-lean_inc(x_68);
-lean_dec(x_30);
-if (lean_is_scalar(x_67)) {
- x_69 = lean_alloc_ctor(0, 2, 0);
+x_67 = lean_ctor_get(x_29, 0);
+lean_inc(x_67);
+lean_dec(x_29);
+if (lean_is_scalar(x_66)) {
+ x_68 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_69 = x_67;
+ x_68 = x_66;
 }
-lean_ctor_set(x_69, 0, x_68);
-lean_ctor_set(x_69, 1, x_66);
-return x_69;
+lean_ctor_set(x_68, 0, x_67);
+lean_ctor_set(x_68, 1, x_65);
+return x_68;
 }
 }
 }
@ -12812,7 +12809,7 @@ lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_19 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_17, x_18, x_3, x_4, x_5, x_6, x_7, x_8, x_16);
+x_19 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_17, x_18, x_3, x_4, x_5, x_6, x_7, x_8, x_16);
 if (lean_obj_tag(x_19) == 0)
 {
 lean_object* x_20; lean_object* x_21; 
@ -14078,7 +14075,7 @@ lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_21 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_19, x_20, x_5, x_6, x_7, x_8, x_9, x_10, x_18);
+x_21 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_19, x_20, x_5, x_6, x_7, x_8, x_9, x_10, x_18);
 if (lean_obj_tag(x_21) == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
@ -14727,7 +14724,7 @@ lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_21 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_19, x_20, x_5, x_6, x_7, x_8, x_9, x_10, x_18);
+x_21 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_19, x_20, x_5, x_6, x_7, x_8, x_9, x_10, x_18);
 if (lean_obj_tag(x_21) == 0)
 {
 lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; 
@ -15707,7 +15704,7 @@ lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
-x_19 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_17, x_18, x_3, x_4, x_5, x_6, x_7, x_8, x_16);
+x_19 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_17, x_18, x_3, x_4, x_5, x_6, x_7, x_8, x_16);
 if (lean_obj_tag(x_19) == 0)
 {
 lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
--- a/stage0/stdlib/Lean/Elab/Declaration.c
+++ b/stage0/stdlib/Lean/Elab/Declaration.c
@ -17,6 +17,7 @@ lean_object* l_Lean_Elab_Command_elabDeclaration(lean_object*, lean_object*, lea
 extern lean_object* l_Lean_Elab_Command_elabStructure___closed__11;
 lean_object* l_Lean_Elab_applyVisibility___at_Lean_Elab_Command_expandDeclId___spec__5(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_extractMacroScopes(lean_object*);
+lean_object* l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_expandOptDeclSig(lean_object*);
 lean_object* l___private_Lean_Elab_Declaration_8__expandMutualPreamble_x3f___closed__5;
 lean_object* l_Lean_Elab_Command_elabAxiom___lambda__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_object*, lean_object*, lean_object*, lean_object*);
@ -58,7 +59,6 @@ lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Declaration_10_
 uint8_t l_Array_anyRangeMAux___main___at___private_Lean_Elab_Declaration_5__isMutualDef___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getLevelNames___rarg(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabMutual(lean_object*);
-lean_object* l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withLevelNames___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandDeclNamespace_x3f___closed__7;
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@ -1834,7 +1834,7 @@ lean_inc(x_12);
 lean_inc(x_11);
 lean_inc(x_10);
 lean_inc(x_9);
-x_26 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_24, x_25, x_9, x_10, x_11, x_12, x_13, x_14, x_23);
+x_26 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_24, x_25, x_9, x_10, x_11, x_12, x_13, x_14, x_23);
 if (lean_obj_tag(x_26) == 0)
 {
 lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
--- a/stage0/stdlib/Lean/Elab/DoNotation.c
+++ b/stage0/stdlib/Lean/Elab/DoNotation.c
@ -23,7 +23,6 @@ lean_object* l___private_Lean_Elab_DoNotation_5__expandLiftMethodAux(lean_object
 lean_object* l_Array_back___at___private_Lean_Elab_DoNotation_10__mkBind___spec__1___boxed(lean_object*);
 extern lean_object* l_Lean_MessageData_ofList___closed__3;
 lean_object* l___private_Lean_Elab_DoNotation_7__expandDoElemsAux___main___closed__5;
-extern lean_object* l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
 lean_object* l___private_Lean_Elab_DoNotation_11__processDoElemsAux___main___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*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Elab_Term_6__expandCDot___main___closed__3;
 lean_object* l___private_Lean_Elab_DoNotation_11__processDoElemsAux___main___closed__2;
@ -60,6 +59,7 @@ lean_object* l___private_Lean_Elab_DoNotation_1__mkIdBindFor___closed__3;
 extern lean_object* l_Lean_myMacro____x40_Lean_Util_Trace___hyg_11____closed__14;
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Lean_Elab_DoNotation_4__hasLiftMethod___main(lean_object*);
+lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_26__elabCDot___spec__1___rarg(lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__16;
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at___private_Lean_Elab_DoNotation_10__mkBind___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_object*, lean_object*);
@ -79,6 +79,7 @@ extern lean_object* l_Lean_Expr_Inhabited___closed__1;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+extern lean_object* l_Lean_Elab_Term_mkFreshUserName___closed__2;
 lean_object* l_Lean_Meta_getDecLevel___at_Lean_Elab_Term_tryLiftAndCoe___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_quoteAutoTactic___main___closed__9;
 lean_object* l___private_Lean_Elab_DoNotation_5__expandLiftMethodAux___main___closed__4;
@ -99,7 +100,6 @@ lean_object* l___private_Lean_Elab_DoNotation_7__expandDoElemsAux___main___close
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_expandOptType(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_25__elabCDot___spec__1___rarg(lean_object*);
 lean_object* l___private_Lean_Elab_DoNotation_11__processDoElemsAux___main___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*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkAppStx___closed__6;
 lean_object* l___private_Lean_Elab_DoNotation_11__processDoElemsAux___main(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*);
@ -2230,7 +2230,7 @@ x_82 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_83 = l_Lean_addMacroScope(x_81, x_82, x_80);
 x_84 = lean_box(0);
 x_85 = l_Lean_SourceInfo_inhabited___closed__1;
-x_86 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_86 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_87 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_87, 0, x_85);
 lean_ctor_set(x_87, 1, x_86);
@ -2336,7 +2336,7 @@ x_145 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_146 = l_Lean_addMacroScope(x_128, x_145, x_60);
 x_147 = lean_box(0);
 x_148 = l_Lean_SourceInfo_inhabited___closed__1;
-x_149 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_149 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_150 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_150, 0, x_148);
 lean_ctor_set(x_150, 1, x_149);
@ -2431,7 +2431,7 @@ x_203 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_204 = l_Lean_addMacroScope(x_128, x_203, x_60);
 x_205 = lean_box(0);
 x_206 = l_Lean_SourceInfo_inhabited___closed__1;
-x_207 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_207 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_208 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_208, 0, x_206);
 lean_ctor_set(x_208, 1, x_207);
@ -2533,7 +2533,7 @@ x_262 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_263 = l_Lean_addMacroScope(x_259, x_262, x_60);
 x_264 = lean_box(0);
 x_265 = l_Lean_SourceInfo_inhabited___closed__1;
-x_266 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_266 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_267 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_267, 0, x_265);
 lean_ctor_set(x_267, 1, x_266);
@ -2632,7 +2632,7 @@ x_324 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_325 = l_Lean_addMacroScope(x_259, x_324, x_60);
 x_326 = lean_box(0);
 x_327 = l_Lean_SourceInfo_inhabited___closed__1;
-x_328 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_328 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_329 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_329, 0, x_327);
 lean_ctor_set(x_329, 1, x_328);
@ -2948,7 +2948,7 @@ x_480 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_481 = l_Lean_addMacroScope(x_479, x_480, x_478);
 x_482 = lean_box(0);
 x_483 = l_Lean_SourceInfo_inhabited___closed__1;
-x_484 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_484 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_485 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_485, 0, x_483);
 lean_ctor_set(x_485, 1, x_484);
@ -3054,7 +3054,7 @@ x_543 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_544 = l_Lean_addMacroScope(x_526, x_543, x_459);
 x_545 = lean_box(0);
 x_546 = l_Lean_SourceInfo_inhabited___closed__1;
-x_547 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_547 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_548 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_548, 0, x_546);
 lean_ctor_set(x_548, 1, x_547);
@ -3149,7 +3149,7 @@ x_601 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_602 = l_Lean_addMacroScope(x_526, x_601, x_459);
 x_603 = lean_box(0);
 x_604 = l_Lean_SourceInfo_inhabited___closed__1;
-x_605 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_605 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_606 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_606, 0, x_604);
 lean_ctor_set(x_606, 1, x_605);
@ -3251,7 +3251,7 @@ x_660 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_661 = l_Lean_addMacroScope(x_657, x_660, x_459);
 x_662 = lean_box(0);
 x_663 = l_Lean_SourceInfo_inhabited___closed__1;
-x_664 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_664 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_665 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_665, 0, x_663);
 lean_ctor_set(x_665, 1, x_664);
@ -3350,7 +3350,7 @@ x_722 = l_Lean_Meta_AbstractMVars_abstractExprMVars___main___closed__2;
 x_723 = l_Lean_addMacroScope(x_657, x_722, x_459);
 x_724 = lean_box(0);
 x_725 = l_Lean_SourceInfo_inhabited___closed__1;
-x_726 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__2;
+x_726 = l_Lean_Elab_Term_mkFreshUserName___closed__2;
 x_727 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_727, 0, x_725);
 lean_ctor_set(x_727, 1, x_726);
@ -5452,7 +5452,7 @@ lean_inc(x_129);
 x_130 = lean_ctor_get(x_128, 1);
 lean_inc(x_130);
 lean_dec(x_128);
-x_131 = lean_ctor_get(x_129, 5);
+x_131 = lean_ctor_get(x_129, 3);
 lean_inc(x_131);
 lean_dec(x_129);
 x_132 = lean_ctor_get(x_7, 1);
@ -5487,9 +5487,9 @@ x_144 = !lean_is_exclusive(x_142);
 if (x_144 == 0)
 {
 lean_object* x_145; lean_object* x_146; lean_object* x_147; 
-x_145 = lean_ctor_get(x_142, 5);
+x_145 = lean_ctor_get(x_142, 3);
 lean_dec(x_145);
-lean_ctor_set(x_142, 5, x_140);
+lean_ctor_set(x_142, 3, x_140);
 x_146 = lean_st_ref_set(x_4, x_142, x_143);
 x_147 = lean_ctor_get(x_146, 1);
 lean_inc(x_147);
@ -5500,111 +5500,105 @@ goto block_120;
 }
 else
 {
-lean_object* x_148; lean_object* x_149; 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_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; 
 x_148 = lean_ctor_get(x_142, 0);
 x_149 = lean_ctor_get(x_142, 1);
 x_150 = lean_ctor_get(x_142, 2);
-x_151 = lean_ctor_get(x_142, 3);
-x_152 = lean_ctor_get(x_142, 4);
-x_153 = lean_ctor_get(x_142, 6);
-lean_inc(x_153);
-lean_inc(x_152);
+x_151 = lean_ctor_get(x_142, 4);
 lean_inc(x_151);
 lean_inc(x_150);
 lean_inc(x_149);
 lean_inc(x_148);
 lean_dec(x_142);
-x_154 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_154, 0, x_148);
-lean_ctor_set(x_154, 1, x_149);
-lean_ctor_set(x_154, 2, x_150);
-lean_ctor_set(x_154, 3, x_151);
-lean_ctor_set(x_154, 4, x_152);
-lean_ctor_set(x_154, 5, x_140);
-lean_ctor_set(x_154, 6, x_153);
-x_155 = lean_st_ref_set(x_4, x_154, x_143);
-x_156 = lean_ctor_get(x_155, 1);
-lean_inc(x_156);
-lean_dec(x_155);
+x_152 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_152, 0, x_148);
+lean_ctor_set(x_152, 1, x_149);
+lean_ctor_set(x_152, 2, x_150);
+lean_ctor_set(x_152, 3, x_140);
+lean_ctor_set(x_152, 4, x_151);
+x_153 = lean_st_ref_set(x_4, x_152, x_143);
+x_154 = lean_ctor_get(x_153, 1);
+lean_inc(x_154);
+lean_dec(x_153);
 x_13 = x_139;
-x_14 = x_156;
+x_14 = x_154;
 goto block_120;
 }
 }
 else
 {
-lean_object* x_157; 
+lean_object* x_155; 
 lean_dec(x_12);
 lean_dec(x_2);
 lean_dec(x_1);
-x_157 = lean_ctor_get(x_138, 0);
-lean_inc(x_157);
+x_155 = lean_ctor_get(x_138, 0);
+lean_inc(x_155);
 lean_dec(x_138);
-if (lean_obj_tag(x_157) == 0)
+if (lean_obj_tag(x_155) == 0)
 {
-lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; uint8_t x_163; 
-x_158 = lean_ctor_get(x_157, 0);
-lean_inc(x_158);
-x_159 = lean_ctor_get(x_157, 1);
-lean_inc(x_159);
-lean_dec(x_157);
-x_160 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_160, 0, x_159);
-x_161 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_161, 0, x_160);
-x_162 = l_Lean_throwErrorAt___at___private_Lean_Elab_Term_21__elabTermAux___main___spec__1___rarg(x_158, x_161, x_3, x_4, x_5, x_6, x_7, x_8, x_130);
+lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; uint8_t x_161; 
+x_156 = lean_ctor_get(x_155, 0);
+lean_inc(x_156);
+x_157 = lean_ctor_get(x_155, 1);
+lean_inc(x_157);
+lean_dec(x_155);
+x_158 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_158, 0, x_157);
+x_159 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_159, 0, x_158);
+x_160 = l_Lean_throwErrorAt___at___private_Lean_Elab_Term_21__elabTermAux___main___spec__1___rarg(x_156, x_159, x_3, x_4, x_5, x_6, x_7, x_8, x_130);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
-lean_dec(x_158);
-x_163 = !lean_is_exclusive(x_162);
-if (x_163 == 0)
+lean_dec(x_156);
+x_161 = !lean_is_exclusive(x_160);
+if (x_161 == 0)
 {
-return x_162;
+return x_160;
 }
 else
 {
-lean_object* x_164; lean_object* x_165; lean_object* x_166; 
-x_164 = lean_ctor_get(x_162, 0);
-x_165 = lean_ctor_get(x_162, 1);
-lean_inc(x_165);
-lean_inc(x_164);
-lean_dec(x_162);
-x_166 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_166, 0, x_164);
-lean_ctor_set(x_166, 1, x_165);
-return x_166;
+lean_object* x_162; lean_object* x_163; lean_object* x_164; 
+x_162 = lean_ctor_get(x_160, 0);
+x_163 = lean_ctor_get(x_160, 1);
+lean_inc(x_163);
+lean_inc(x_162);
+lean_dec(x_160);
+x_164 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_164, 0, x_162);
+lean_ctor_set(x_164, 1, x_163);
+return x_164;
 }
 }
 else
 {
-lean_object* x_167; uint8_t x_168; 
+lean_object* x_165; uint8_t x_166; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-x_167 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_25__elabCDot___spec__1___rarg(x_130);
-x_168 = !lean_is_exclusive(x_167);
-if (x_168 == 0)
+x_165 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_26__elabCDot___spec__1___rarg(x_130);
+x_166 = !lean_is_exclusive(x_165);
+if (x_166 == 0)
 {
-return x_167;
+return x_165;
 }
 else
 {
-lean_object* x_169; lean_object* x_170; lean_object* x_171; 
-x_169 = lean_ctor_get(x_167, 0);
-x_170 = lean_ctor_get(x_167, 1);
-lean_inc(x_170);
-lean_inc(x_169);
-lean_dec(x_167);
-x_171 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_171, 0, x_169);
-lean_ctor_set(x_171, 1, x_170);
-return x_171;
+lean_object* x_167; lean_object* x_168; lean_object* x_169; 
+x_167 = lean_ctor_get(x_165, 0);
+x_168 = lean_ctor_get(x_165, 1);
+lean_inc(x_168);
+lean_inc(x_167);
+lean_dec(x_165);
+x_169 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_169, 0, x_167);
+lean_ctor_set(x_169, 1, x_168);
+return x_169;
 }
 }
 }
@ -6045,7 +6039,7 @@ return x_119;
 }
 else
 {
-uint8_t x_172; 
+uint8_t x_170; 
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
@ -6054,23 +6048,23 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_172 = !lean_is_exclusive(x_10);
-if (x_172 == 0)
+x_170 = !lean_is_exclusive(x_10);
+if (x_170 == 0)
 {
 return x_10;
 }
 else
 {
-lean_object* x_173; lean_object* x_174; lean_object* x_175; 
-x_173 = lean_ctor_get(x_10, 0);
-x_174 = lean_ctor_get(x_10, 1);
-lean_inc(x_174);
-lean_inc(x_173);
+lean_object* x_171; lean_object* x_172; lean_object* x_173; 
+x_171 = lean_ctor_get(x_10, 0);
+x_172 = lean_ctor_get(x_10, 1);
+lean_inc(x_172);
+lean_inc(x_171);
 lean_dec(x_10);
-x_175 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_175, 0, x_173);
-lean_ctor_set(x_175, 1, x_174);
-return x_175;
+x_173 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_173, 0, x_171);
+lean_ctor_set(x_173, 1, x_172);
+return x_173;
 }
 }
 }
--- a/stage0/stdlib/Lean/Elab/Inductive.c
+++ b/stage0/stdlib/Lean/Elab/Inductive.c
--- a/stage0/stdlib/Lean/Elab/LetRec.c
+++ b/stage0/stdlib/Lean/Elab/LetRec.c
@ -1104,13 +1104,13 @@ lean_inc(x_32);
 x_36 = l_Lean_Syntax_isOfKind(x_32, x_35);
 if (x_36 == 0)
 {
-lean_object* x_126; uint8_t x_127; 
-x_126 = l_Lean_Elab_Term_elabLetDeclCore___closed__4;
+lean_object* x_124; uint8_t x_125; 
+x_124 = l_Lean_Elab_Term_elabLetDeclCore___closed__4;
 lean_inc(x_32);
-x_127 = l_Lean_Syntax_isOfKind(x_32, x_126);
-if (x_127 == 0)
+x_125 = l_Lean_Syntax_isOfKind(x_32, x_124);
+if (x_125 == 0)
 {
-lean_object* x_128; uint8_t x_129; 
+lean_object* x_126; uint8_t x_127; 
 lean_dec(x_32);
 lean_dec(x_28);
 lean_dec(x_16);
@ -1121,42 +1121,42 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_128 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_LetRec_1__mkLetRecDeclView___spec__6___rarg(x_29);
-x_129 = !lean_is_exclusive(x_128);
-if (x_129 == 0)
+x_126 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_LetRec_1__mkLetRecDeclView___spec__6___rarg(x_29);
+x_127 = !lean_is_exclusive(x_126);
+if (x_127 == 0)
 {
-return x_128;
+return x_126;
 }
 else
 {
-lean_object* x_130; lean_object* x_131; lean_object* x_132; 
-x_130 = lean_ctor_get(x_128, 0);
-x_131 = lean_ctor_get(x_128, 1);
-lean_inc(x_131);
-lean_inc(x_130);
-lean_dec(x_128);
-x_132 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_132, 0, x_130);
-lean_ctor_set(x_132, 1, x_131);
-return x_132;
+lean_object* x_128; lean_object* x_129; lean_object* x_130; 
+x_128 = lean_ctor_get(x_126, 0);
+x_129 = lean_ctor_get(x_126, 1);
+lean_inc(x_129);
+lean_inc(x_128);
+lean_dec(x_126);
+x_130 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_130, 0, x_128);
+lean_ctor_set(x_130, 1, x_129);
+return x_130;
 }
 }
 else
 {
-lean_object* x_133; 
-x_133 = lean_box(0);
-x_37 = x_133;
-goto block_125;
+lean_object* x_131; 
+x_131 = lean_box(0);
+x_37 = x_131;
+goto block_123;
 }
 }
 else
 {
-lean_object* x_134; 
-x_134 = lean_box(0);
-x_37 = x_134;
-goto block_125;
+lean_object* x_132; 
+x_132 = lean_box(0);
+x_37 = x_132;
+goto block_123;
 }
-block_125:
+block_123:
 {
 lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
 lean_dec(x_37);
@ -1169,21 +1169,21 @@ lean_inc(x_41);
 lean_dec(x_39);
 if (lean_obj_tag(x_40) == 0)
 {
-lean_object* x_123; 
-x_123 = lean_box(0);
-x_42 = x_123;
-goto block_122;
+lean_object* x_121; 
+x_121 = lean_box(0);
+x_42 = x_121;
+goto block_120;
 }
 else
 {
-lean_object* x_124; 
-x_124 = lean_ctor_get(x_40, 0);
-lean_inc(x_124);
+lean_object* x_122; 
+x_122 = lean_ctor_get(x_40, 0);
+lean_inc(x_122);
 lean_dec(x_40);
-x_42 = x_124;
-goto block_122;
+x_42 = x_122;
+goto block_120;
 }
-block_122:
+block_120:
 {
 lean_object* x_43; lean_object* x_44; 
 lean_inc(x_38);
@ -1278,7 +1278,7 @@ lean_inc(x_76);
 x_77 = lean_ctor_get(x_75, 1);
 lean_inc(x_77);
 lean_dec(x_75);
-x_78 = lean_ctor_get(x_76, 5);
+x_78 = lean_ctor_get(x_76, 3);
 lean_inc(x_78);
 lean_dec(x_76);
 x_79 = lean_ctor_get(x_7, 1);
@ -1308,9 +1308,9 @@ x_90 = !lean_is_exclusive(x_88);
 if (x_90 == 0)
 {
 lean_object* x_91; lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_91 = lean_ctor_get(x_88, 5);
+x_91 = lean_ctor_get(x_88, 3);
 lean_dec(x_91);
-lean_ctor_set(x_88, 5, x_86);
+lean_ctor_set(x_88, 3, x_86);
 x_92 = lean_st_ref_set(x_4, x_88, x_89);
 x_93 = lean_ctor_get(x_92, 1);
 lean_inc(x_93);
@ -1330,73 +1330,67 @@ goto block_24;
 }
 else
 {
-lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+lean_object* x_95; lean_object* x_96; lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; 
 x_95 = lean_ctor_get(x_88, 0);
 x_96 = lean_ctor_get(x_88, 1);
 x_97 = lean_ctor_get(x_88, 2);
-x_98 = lean_ctor_get(x_88, 3);
-x_99 = lean_ctor_get(x_88, 4);
-x_100 = lean_ctor_get(x_88, 6);
-lean_inc(x_100);
-lean_inc(x_99);
+x_98 = lean_ctor_get(x_88, 4);
 lean_inc(x_98);
 lean_inc(x_97);
 lean_inc(x_96);
 lean_inc(x_95);
 lean_dec(x_88);
-x_101 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_101, 0, x_95);
-lean_ctor_set(x_101, 1, x_96);
-lean_ctor_set(x_101, 2, x_97);
-lean_ctor_set(x_101, 3, x_98);
-lean_ctor_set(x_101, 4, x_99);
-lean_ctor_set(x_101, 5, x_86);
-lean_ctor_set(x_101, 6, x_100);
-x_102 = lean_st_ref_set(x_4, x_101, x_89);
-x_103 = lean_ctor_get(x_102, 1);
+x_99 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_99, 0, x_95);
+lean_ctor_set(x_99, 1, x_96);
+lean_ctor_set(x_99, 2, x_97);
+lean_ctor_set(x_99, 3, x_86);
+lean_ctor_set(x_99, 4, x_98);
+x_100 = lean_st_ref_set(x_4, x_99, x_89);
+x_101 = lean_ctor_get(x_100, 1);
+lean_inc(x_101);
+lean_dec(x_100);
+x_102 = lean_alloc_ctor(0, 8, 0);
+lean_ctor_set(x_102, 0, x_32);
+lean_ctor_set(x_102, 1, x_28);
+lean_ctor_set(x_102, 2, x_38);
+lean_ctor_set(x_102, 3, x_43);
+lean_ctor_set(x_102, 4, x_59);
+lean_ctor_set(x_102, 5, x_58);
+lean_ctor_set(x_102, 6, x_64);
+lean_ctor_set(x_102, 7, x_85);
+x_17 = x_102;
+x_18 = x_101;
+goto block_24;
+}
+}
+else
+{
+lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+x_103 = lean_ctor_get(x_63, 0);
 lean_inc(x_103);
-lean_dec(x_102);
-x_104 = lean_alloc_ctor(0, 8, 0);
-lean_ctor_set(x_104, 0, x_32);
-lean_ctor_set(x_104, 1, x_28);
-lean_ctor_set(x_104, 2, x_38);
-lean_ctor_set(x_104, 3, x_43);
-lean_ctor_set(x_104, 4, x_59);
-lean_ctor_set(x_104, 5, x_58);
-lean_ctor_set(x_104, 6, x_64);
-lean_ctor_set(x_104, 7, x_85);
-x_17 = x_104;
-x_18 = x_103;
-goto block_24;
-}
-}
-else
-{
-lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_105 = lean_ctor_get(x_63, 0);
-lean_inc(x_105);
-x_106 = lean_ctor_get(x_63, 1);
-lean_inc(x_106);
+x_104 = lean_ctor_get(x_63, 1);
+lean_inc(x_104);
 lean_dec(x_63);
-x_107 = lean_unsigned_to_nat(4u);
-x_108 = l_Lean_Syntax_getArg(x_32, x_107);
-x_109 = lean_alloc_ctor(0, 8, 0);
-lean_ctor_set(x_109, 0, x_32);
-lean_ctor_set(x_109, 1, x_28);
-lean_ctor_set(x_109, 2, x_38);
-lean_ctor_set(x_109, 3, x_43);
-lean_ctor_set(x_109, 4, x_59);
-lean_ctor_set(x_109, 5, x_58);
-lean_ctor_set(x_109, 6, x_105);
-lean_ctor_set(x_109, 7, x_108);
-x_17 = x_109;
-x_18 = x_106;
+x_105 = lean_unsigned_to_nat(4u);
+x_106 = l_Lean_Syntax_getArg(x_32, x_105);
+x_107 = lean_alloc_ctor(0, 8, 0);
+lean_ctor_set(x_107, 0, x_32);
+lean_ctor_set(x_107, 1, x_28);
+lean_ctor_set(x_107, 2, x_38);
+lean_ctor_set(x_107, 3, x_43);
+lean_ctor_set(x_107, 4, x_59);
+lean_ctor_set(x_107, 5, x_58);
+lean_ctor_set(x_107, 6, x_103);
+lean_ctor_set(x_107, 7, x_106);
+x_17 = x_107;
+x_18 = x_104;
 goto block_24;
 }
 }
 else
 {
-uint8_t x_110; 
+uint8_t x_108; 
 lean_dec(x_43);
 lean_dec(x_38);
 lean_dec(x_32);
@ -1409,29 +1403,29 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_110 = !lean_is_exclusive(x_55);
-if (x_110 == 0)
+x_108 = !lean_is_exclusive(x_55);
+if (x_108 == 0)
 {
 return x_55;
 }
 else
 {
-lean_object* x_111; lean_object* x_112; lean_object* x_113; 
-x_111 = lean_ctor_get(x_55, 0);
-x_112 = lean_ctor_get(x_55, 1);
-lean_inc(x_112);
-lean_inc(x_111);
+lean_object* x_109; lean_object* x_110; lean_object* x_111; 
+x_109 = lean_ctor_get(x_55, 0);
+x_110 = lean_ctor_get(x_55, 1);
+lean_inc(x_110);
+lean_inc(x_109);
 lean_dec(x_55);
-x_113 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_113, 0, x_111);
-lean_ctor_set(x_113, 1, x_112);
-return x_113;
+x_111 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_111, 0, x_109);
+lean_ctor_set(x_111, 1, x_110);
+return x_111;
 }
 }
 }
 else
 {
-uint8_t x_114; 
+uint8_t x_112; 
 lean_dec(x_43);
 lean_dec(x_38);
 lean_dec(x_32);
@ -1444,29 +1438,29 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_114 = !lean_is_exclusive(x_47);
-if (x_114 == 0)
+x_112 = !lean_is_exclusive(x_47);
+if (x_112 == 0)
 {
 return x_47;
 }
 else
 {
-lean_object* x_115; lean_object* x_116; lean_object* x_117; 
-x_115 = lean_ctor_get(x_47, 0);
-x_116 = lean_ctor_get(x_47, 1);
-lean_inc(x_116);
-lean_inc(x_115);
+lean_object* x_113; lean_object* x_114; lean_object* x_115; 
+x_113 = lean_ctor_get(x_47, 0);
+x_114 = lean_ctor_get(x_47, 1);
+lean_inc(x_114);
+lean_inc(x_113);
 lean_dec(x_47);
-x_117 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_117, 0, x_115);
-lean_ctor_set(x_117, 1, x_116);
-return x_117;
+x_115 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_115, 0, x_113);
+lean_ctor_set(x_115, 1, x_114);
+return x_115;
 }
 }
 }
 else
 {
-uint8_t x_118; 
+uint8_t x_116; 
 lean_dec(x_43);
 lean_dec(x_38);
 lean_dec(x_32);
@ -1479,23 +1473,23 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_118 = !lean_is_exclusive(x_44);
-if (x_118 == 0)
+x_116 = !lean_is_exclusive(x_44);
+if (x_116 == 0)
 {
 return x_44;
 }
 else
 {
-lean_object* x_119; lean_object* x_120; lean_object* x_121; 
-x_119 = lean_ctor_get(x_44, 0);
-x_120 = lean_ctor_get(x_44, 1);
-lean_inc(x_120);
-lean_inc(x_119);
+lean_object* x_117; lean_object* x_118; lean_object* x_119; 
+x_117 = lean_ctor_get(x_44, 0);
+x_118 = lean_ctor_get(x_44, 1);
+lean_inc(x_118);
+lean_inc(x_117);
 lean_dec(x_44);
-x_121 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_121, 0, x_119);
-lean_ctor_set(x_121, 1, x_120);
-return x_121;
+x_119 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_119, 0, x_117);
+lean_ctor_set(x_119, 1, x_118);
+return x_119;
 }
 }
 }
@ -1503,41 +1497,41 @@ return x_121;
 }
 else
 {
-lean_object* x_135; lean_object* x_136; uint8_t x_137; 
+lean_object* x_133; lean_object* x_134; uint8_t x_135; 
 lean_dec(x_28);
 lean_dec(x_16);
 lean_dec(x_1);
-x_135 = l_Array_umapMAux___main___at___private_Lean_Elab_LetRec_1__mkLetRecDeclView___spec__7___closed__3;
-x_136 = l_Lean_throwErrorAt___at___private_Lean_Elab_Term_21__elabTermAux___main___spec__1___rarg(x_32, x_135, x_3, x_4, x_5, x_6, x_7, x_8, x_29);
+x_133 = l_Array_umapMAux___main___at___private_Lean_Elab_LetRec_1__mkLetRecDeclView___spec__7___closed__3;
+x_134 = l_Lean_throwErrorAt___at___private_Lean_Elab_Term_21__elabTermAux___main___spec__1___rarg(x_32, x_133, x_3, x_4, x_5, x_6, x_7, x_8, x_29);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_32);
-x_137 = !lean_is_exclusive(x_136);
-if (x_137 == 0)
+x_135 = !lean_is_exclusive(x_134);
+if (x_135 == 0)
 {
-return x_136;
+return x_134;
 }
 else
 {
-lean_object* x_138; lean_object* x_139; lean_object* x_140; 
-x_138 = lean_ctor_get(x_136, 0);
-x_139 = lean_ctor_get(x_136, 1);
-lean_inc(x_139);
-lean_inc(x_138);
-lean_dec(x_136);
-x_140 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_140, 0, x_138);
-lean_ctor_set(x_140, 1, x_139);
-return x_140;
+lean_object* x_136; lean_object* x_137; lean_object* x_138; 
+x_136 = lean_ctor_get(x_134, 0);
+x_137 = lean_ctor_get(x_134, 1);
+lean_inc(x_137);
+lean_inc(x_136);
+lean_dec(x_134);
+x_138 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_138, 0, x_136);
+lean_ctor_set(x_138, 1, x_137);
+return x_138;
 }
 }
 }
 else
 {
-uint8_t x_141; 
+uint8_t x_139; 
 lean_dec(x_25);
 lean_dec(x_16);
 lean_dec(x_8);
@ -1547,23 +1541,23 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_141 = !lean_is_exclusive(x_27);
-if (x_141 == 0)
+x_139 = !lean_is_exclusive(x_27);
+if (x_139 == 0)
 {
 return x_27;
 }
 else
 {
-lean_object* x_142; lean_object* x_143; lean_object* x_144; 
-x_142 = lean_ctor_get(x_27, 0);
-x_143 = lean_ctor_get(x_27, 1);
-lean_inc(x_143);
-lean_inc(x_142);
+lean_object* x_140; lean_object* x_141; lean_object* x_142; 
+x_140 = lean_ctor_get(x_27, 0);
+x_141 = lean_ctor_get(x_27, 1);
+lean_inc(x_141);
+lean_inc(x_140);
 lean_dec(x_27);
-x_144 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_144, 0, x_142);
-lean_ctor_set(x_144, 1, x_143);
-return x_144;
+x_142 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_142, 0, x_140);
+lean_ctor_set(x_142, 1, x_141);
+return x_142;
 }
 }
 block_24:
@ -2214,11 +2208,11 @@ x_22 = !lean_is_exclusive(x_20);
 if (x_22 == 0)
 {
 lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; 
-x_23 = lean_ctor_get(x_20, 6);
+x_23 = lean_ctor_get(x_20, 4);
 x_24 = l_Array_toList___rarg(x_18);
 lean_dec(x_18);
 x_25 = l_List_append___rarg(x_24, x_23);
-lean_ctor_set(x_20, 6, x_25);
+lean_ctor_set(x_20, 4, x_25);
 x_26 = lean_st_ref_set(x_5, x_20, x_21);
 x_27 = !lean_is_exclusive(x_26);
 if (x_27 == 0)
@ -2245,53 +2239,47 @@ return x_32;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
 x_33 = lean_ctor_get(x_20, 0);
 x_34 = lean_ctor_get(x_20, 1);
 x_35 = lean_ctor_get(x_20, 2);
 x_36 = lean_ctor_get(x_20, 3);
 x_37 = lean_ctor_get(x_20, 4);
-x_38 = lean_ctor_get(x_20, 5);
-x_39 = lean_ctor_get(x_20, 6);
-lean_inc(x_39);
-lean_inc(x_38);
 lean_inc(x_37);
 lean_inc(x_36);
 lean_inc(x_35);
 lean_inc(x_34);
 lean_inc(x_33);
 lean_dec(x_20);
-x_40 = l_Array_toList___rarg(x_18);
+x_38 = l_Array_toList___rarg(x_18);
 lean_dec(x_18);
-x_41 = l_List_append___rarg(x_40, x_39);
-x_42 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_42, 0, x_33);
-lean_ctor_set(x_42, 1, x_34);
-lean_ctor_set(x_42, 2, x_35);
-lean_ctor_set(x_42, 3, x_36);
-lean_ctor_set(x_42, 4, x_37);
-lean_ctor_set(x_42, 5, x_38);
-lean_ctor_set(x_42, 6, x_41);
-x_43 = lean_st_ref_set(x_5, x_42, x_21);
-x_44 = lean_ctor_get(x_43, 1);
-lean_inc(x_44);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- lean_ctor_release(x_43, 1);
+x_39 = l_List_append___rarg(x_38, x_37);
+x_40 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_40, 0, x_33);
+lean_ctor_set(x_40, 1, x_34);
+lean_ctor_set(x_40, 2, x_35);
+lean_ctor_set(x_40, 3, x_36);
+lean_ctor_set(x_40, 4, x_39);
+x_41 = lean_st_ref_set(x_5, x_40, x_21);
+x_42 = lean_ctor_get(x_41, 1);
+lean_inc(x_42);
+if (lean_is_exclusive(x_41)) {
+ lean_ctor_release(x_41, 0);
+ lean_ctor_release(x_41, 1);
+ x_43 = x_41;
+} else {
+ lean_dec_ref(x_41);
+ x_43 = lean_box(0);
+}
+x_44 = lean_box(0);
+if (lean_is_scalar(x_43)) {
+ x_45 = lean_alloc_ctor(0, 2, 0);
+} else {
 x_45 = x_43;
-} else {
- lean_dec_ref(x_43);
- x_45 = lean_box(0);
 }
-x_46 = lean_box(0);
-if (lean_is_scalar(x_45)) {
- x_47 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_47 = x_45;
-}
-lean_ctor_set(x_47, 0, x_46);
-lean_ctor_set(x_47, 1, x_44);
-return x_47;
+lean_ctor_set(x_45, 0, x_44);
+lean_ctor_set(x_45, 1, x_42);
+return x_45;
 }
 }
 }
--- a/stage0/stdlib/Lean/Elab/Match.c
+++ b/stage0/stdlib/Lean/Elab/Match.c
--- a/stage0/stdlib/Lean/Elab/MutualDef.c
+++ b/stage0/stdlib/Lean/Elab/MutualDef.c
@ -25,6 +25,7 @@ lean_object* l___private_Lean_Elab_MutualDef_34__mkClosureForAux___main___closed
 lean_object* l_Array_forMAux___main___at___private_Lean_Elab_MutualDef_10__collectUsed___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* l_Lean_Elab_Term_removeUnused(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_extractMacroScopes(lean_object*);
+lean_object* l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_23__markModified___rarg(lean_object*);
 lean_object* l_Std_RBNode_fold___main___at___private_Lean_Elab_MutualDef_32__pushNewVars___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallBoundedTelescope___at___private_Lean_Elab_MutualDef_9__elabFunValues___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -129,7 +130,6 @@ lean_object* l_Lean_Meta_getLocalDecl___at___private_Lean_Elab_MutualDef_34__mkC
 lean_object* l___private_Lean_Elab_MutualDef_6__withFunLocalDeclsAux___main___rarg(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_string_utf8_byte_size(lean_object*);
 lean_object* l_Lean_Meta_lambdaLetTelescope___at___private_Lean_Elab_PreDefinition_Structural_7__elimRecursion_x3f___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withLevelNames___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at___private_Lean_Elab_MutualDef_34__mkClosureForAux___main___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_foldl___main___at_Lean_Elab_Term_MutualClosure_pushLetRecs___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@ -2004,7 +2004,7 @@ lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
-x_27 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_25, x_26, x_4, x_5, x_6, x_7, x_8, x_9, x_24);
+x_27 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_25, x_26, x_4, x_5, x_6, x_7, x_8, x_9, x_24);
 if (lean_obj_tag(x_27) == 0)
 {
 lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
@ -4278,7 +4278,7 @@ lean_inc(x_15);
 x_16 = lean_ctor_get(x_14, 1);
 lean_inc(x_16);
 lean_dec(x_14);
-x_17 = lean_ctor_get(x_15, 5);
+x_17 = lean_ctor_get(x_15, 3);
 lean_inc(x_17);
 lean_dec(x_15);
 x_18 = lean_ctor_get(x_7, 1);
@ -4311,9 +4311,9 @@ x_28 = !lean_is_exclusive(x_26);
 if (x_28 == 0)
 {
 lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_29 = lean_ctor_get(x_26, 5);
+x_29 = lean_ctor_get(x_26, 3);
 lean_dec(x_29);
-lean_ctor_set(x_26, 5, x_24);
+lean_ctor_set(x_26, 3, x_24);
 x_30 = lean_st_ref_set(x_4, x_26, x_27);
 x_31 = !lean_is_exclusive(x_30);
 if (x_31 == 0)
@ -4338,77 +4338,71 @@ return x_34;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
 x_35 = lean_ctor_get(x_26, 0);
 x_36 = lean_ctor_get(x_26, 1);
 x_37 = lean_ctor_get(x_26, 2);
-x_38 = lean_ctor_get(x_26, 3);
-x_39 = lean_ctor_get(x_26, 4);
-x_40 = lean_ctor_get(x_26, 6);
-lean_inc(x_40);
-lean_inc(x_39);
+x_38 = lean_ctor_get(x_26, 4);
 lean_inc(x_38);
 lean_inc(x_37);
 lean_inc(x_36);
 lean_inc(x_35);
 lean_dec(x_26);
-x_41 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_41, 0, x_35);
-lean_ctor_set(x_41, 1, x_36);
-lean_ctor_set(x_41, 2, x_37);
-lean_ctor_set(x_41, 3, x_38);
-lean_ctor_set(x_41, 4, x_39);
-lean_ctor_set(x_41, 5, x_24);
-lean_ctor_set(x_41, 6, x_40);
-x_42 = lean_st_ref_set(x_4, x_41, x_27);
-x_43 = lean_ctor_get(x_42, 1);
-lean_inc(x_43);
-if (lean_is_exclusive(x_42)) {
- lean_ctor_release(x_42, 0);
- lean_ctor_release(x_42, 1);
- x_44 = x_42;
+x_39 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_39, 0, x_35);
+lean_ctor_set(x_39, 1, x_36);
+lean_ctor_set(x_39, 2, x_37);
+lean_ctor_set(x_39, 3, x_24);
+lean_ctor_set(x_39, 4, x_38);
+x_40 = lean_st_ref_set(x_4, x_39, x_27);
+x_41 = lean_ctor_get(x_40, 1);
+lean_inc(x_41);
+if (lean_is_exclusive(x_40)) {
+ lean_ctor_release(x_40, 0);
+ lean_ctor_release(x_40, 1);
+ x_42 = x_40;
 } else {
- lean_dec_ref(x_42);
- x_44 = lean_box(0);
+ lean_dec_ref(x_40);
+ x_42 = lean_box(0);
 }
-if (lean_is_scalar(x_44)) {
- x_45 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_42)) {
+ x_43 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_45 = x_44;
+ x_43 = x_42;
 }
-lean_ctor_set(x_45, 0, x_23);
-lean_ctor_set(x_45, 1, x_43);
-return x_45;
+lean_ctor_set(x_43, 0, x_23);
+lean_ctor_set(x_43, 1, x_41);
+return x_43;
 }
 }
 else
 {
-lean_object* x_46; 
-x_46 = lean_ctor_get(x_22, 0);
-lean_inc(x_46);
+lean_object* x_44; 
+x_44 = lean_ctor_get(x_22, 0);
+lean_inc(x_44);
 lean_dec(x_22);
-if (lean_obj_tag(x_46) == 0)
+if (lean_obj_tag(x_44) == 0)
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_47 = lean_ctor_get(x_46, 0);
-lean_inc(x_47);
-x_48 = lean_ctor_get(x_46, 1);
-lean_inc(x_48);
-lean_dec(x_46);
-x_49 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_49, 0, x_48);
-x_50 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_50, 0, x_49);
-x_51 = l_Lean_throwErrorAt___at___private_Lean_Elab_Term_21__elabTermAux___main___spec__1___rarg(x_47, x_50, x_3, x_4, x_5, x_6, x_7, x_8, x_16);
-lean_dec(x_47);
-return x_51;
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_45 = lean_ctor_get(x_44, 0);
+lean_inc(x_45);
+x_46 = lean_ctor_get(x_44, 1);
+lean_inc(x_46);
+lean_dec(x_44);
+x_47 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_47, 0, x_46);
+x_48 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_48, 0, x_47);
+x_49 = l_Lean_throwErrorAt___at___private_Lean_Elab_Term_21__elabTermAux___main___spec__1___rarg(x_45, x_48, x_3, x_4, x_5, x_6, x_7, x_8, x_16);
+lean_dec(x_45);
+return x_49;
 }
 else
 {
-lean_object* x_52; 
+lean_object* x_50; 
 lean_dec(x_3);
-x_52 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_21__elabTermAux___main___spec__2___rarg(x_16);
-return x_52;
+x_50 = l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_21__elabTermAux___main___spec__2___rarg(x_16);
+return x_50;
 }
 }
 }
@ -8621,162 +8615,150 @@ return x_37;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; 
 x_38 = lean_ctor_get(x_26, 0);
 x_39 = lean_ctor_get(x_26, 1);
 x_40 = lean_ctor_get(x_26, 2);
 x_41 = lean_ctor_get(x_26, 3);
 x_42 = lean_ctor_get(x_26, 4);
-x_43 = lean_ctor_get(x_26, 5);
-x_44 = lean_ctor_get(x_26, 6);
-lean_inc(x_44);
-lean_inc(x_43);
 lean_inc(x_42);
 lean_inc(x_41);
 lean_inc(x_40);
 lean_inc(x_39);
 lean_inc(x_38);
 lean_dec(x_26);
-x_45 = l_Std_PersistentArray_push___rarg(x_40, x_24);
-x_46 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_46, 0, x_38);
-lean_ctor_set(x_46, 1, x_39);
-lean_ctor_set(x_46, 2, x_45);
-lean_ctor_set(x_46, 3, x_41);
-lean_ctor_set(x_46, 4, x_42);
-lean_ctor_set(x_46, 5, x_43);
-lean_ctor_set(x_46, 6, x_44);
-x_47 = lean_st_ref_set(x_6, x_46, x_27);
-x_48 = lean_ctor_get(x_47, 1);
-lean_inc(x_48);
-if (lean_is_exclusive(x_47)) {
- lean_ctor_release(x_47, 0);
- lean_ctor_release(x_47, 1);
+x_43 = l_Std_PersistentArray_push___rarg(x_40, x_24);
+x_44 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_44, 0, x_38);
+lean_ctor_set(x_44, 1, x_39);
+lean_ctor_set(x_44, 2, x_43);
+lean_ctor_set(x_44, 3, x_41);
+lean_ctor_set(x_44, 4, x_42);
+x_45 = lean_st_ref_set(x_6, x_44, x_27);
+x_46 = lean_ctor_get(x_45, 1);
+lean_inc(x_46);
+if (lean_is_exclusive(x_45)) {
+ lean_ctor_release(x_45, 0);
+ lean_ctor_release(x_45, 1);
+ x_47 = x_45;
+} else {
+ lean_dec_ref(x_45);
+ x_47 = lean_box(0);
+}
+x_48 = lean_box(0);
+if (lean_is_scalar(x_47)) {
+ x_49 = lean_alloc_ctor(0, 2, 0);
+} else {
 x_49 = x_47;
-} else {
- lean_dec_ref(x_47);
- x_49 = lean_box(0);
 }
-x_50 = lean_box(0);
-if (lean_is_scalar(x_49)) {
- x_51 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_51 = x_49;
-}
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_48);
-return x_51;
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_46);
+return x_49;
 }
 }
 else
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; uint8_t x_65; 
-x_52 = lean_ctor_get(x_14, 0);
-lean_inc(x_52);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
+x_50 = lean_ctor_get(x_14, 0);
+lean_inc(x_50);
 lean_dec(x_14);
-x_53 = lean_ctor_get(x_5, 0);
-x_54 = lean_ctor_get(x_5, 1);
-x_55 = l_Lean_addMessageDataContextFull___at_Lean_Meta_Lean_AddMessageDataContext___spec__1(x_2, x_7, x_8, x_9, x_10, x_11);
-x_56 = lean_ctor_get(x_55, 0);
-lean_inc(x_56);
-x_57 = lean_ctor_get(x_55, 1);
-lean_inc(x_57);
-lean_dec(x_55);
-x_58 = l_Lean_FileMap_toPosition(x_54, x_52);
-x_59 = lean_box(0);
-x_60 = l_String_splitAux___main___closed__1;
-lean_inc(x_53);
-x_61 = lean_alloc_ctor(0, 5, 1);
-lean_ctor_set(x_61, 0, x_53);
-lean_ctor_set(x_61, 1, x_58);
-lean_ctor_set(x_61, 2, x_59);
-lean_ctor_set(x_61, 3, x_60);
-lean_ctor_set(x_61, 4, x_56);
-lean_ctor_set_uint8(x_61, sizeof(void*)*5, x_3);
-x_62 = lean_st_ref_take(x_6, x_57);
-x_63 = lean_ctor_get(x_62, 0);
-lean_inc(x_63);
-x_64 = lean_ctor_get(x_62, 1);
-lean_inc(x_64);
-lean_dec(x_62);
-x_65 = !lean_is_exclusive(x_63);
-if (x_65 == 0)
+x_51 = lean_ctor_get(x_5, 0);
+x_52 = lean_ctor_get(x_5, 1);
+x_53 = l_Lean_addMessageDataContextFull___at_Lean_Meta_Lean_AddMessageDataContext___spec__1(x_2, x_7, x_8, x_9, x_10, x_11);
+x_54 = lean_ctor_get(x_53, 0);
+lean_inc(x_54);
+x_55 = lean_ctor_get(x_53, 1);
+lean_inc(x_55);
+lean_dec(x_53);
+x_56 = l_Lean_FileMap_toPosition(x_52, x_50);
+x_57 = lean_box(0);
+x_58 = l_String_splitAux___main___closed__1;
+lean_inc(x_51);
+x_59 = lean_alloc_ctor(0, 5, 1);
+lean_ctor_set(x_59, 0, x_51);
+lean_ctor_set(x_59, 1, x_56);
+lean_ctor_set(x_59, 2, x_57);
+lean_ctor_set(x_59, 3, x_58);
+lean_ctor_set(x_59, 4, x_54);
+lean_ctor_set_uint8(x_59, sizeof(void*)*5, x_3);
+x_60 = lean_st_ref_take(x_6, x_55);
+x_61 = lean_ctor_get(x_60, 0);
+lean_inc(x_61);
+x_62 = lean_ctor_get(x_60, 1);
+lean_inc(x_62);
+lean_dec(x_60);
+x_63 = !lean_is_exclusive(x_61);
+if (x_63 == 0)
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; uint8_t x_69; 
-x_66 = lean_ctor_get(x_63, 2);
-x_67 = l_Std_PersistentArray_push___rarg(x_66, x_61);
-lean_ctor_set(x_63, 2, x_67);
-x_68 = lean_st_ref_set(x_6, x_63, x_64);
-x_69 = !lean_is_exclusive(x_68);
-if (x_69 == 0)
+lean_object* x_64; lean_object* x_65; lean_object* x_66; uint8_t x_67; 
+x_64 = lean_ctor_get(x_61, 2);
+x_65 = l_Std_PersistentArray_push___rarg(x_64, x_59);
+lean_ctor_set(x_61, 2, x_65);
+x_66 = lean_st_ref_set(x_6, x_61, x_62);
+x_67 = !lean_is_exclusive(x_66);
+if (x_67 == 0)
 {
-lean_object* x_70; lean_object* x_71; 
-x_70 = lean_ctor_get(x_68, 0);
-lean_dec(x_70);
-x_71 = lean_box(0);
-lean_ctor_set(x_68, 0, x_71);
-return x_68;
-}
-else
-{
-lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_72 = lean_ctor_get(x_68, 1);
-lean_inc(x_72);
+lean_object* x_68; lean_object* x_69; 
+x_68 = lean_ctor_get(x_66, 0);
 lean_dec(x_68);
-x_73 = lean_box(0);
-x_74 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_74, 0, x_73);
-lean_ctor_set(x_74, 1, x_72);
-return x_74;
+x_69 = lean_box(0);
+lean_ctor_set(x_66, 0, x_69);
+return x_66;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_70 = lean_ctor_get(x_66, 1);
+lean_inc(x_70);
+lean_dec(x_66);
+x_71 = lean_box(0);
+x_72 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_72, 0, x_71);
+lean_ctor_set(x_72, 1, x_70);
+return x_72;
 }
 }
 else
 {
-lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_75 = lean_ctor_get(x_63, 0);
-x_76 = lean_ctor_get(x_63, 1);
-x_77 = lean_ctor_get(x_63, 2);
-x_78 = lean_ctor_get(x_63, 3);
-x_79 = lean_ctor_get(x_63, 4);
-x_80 = lean_ctor_get(x_63, 5);
-x_81 = lean_ctor_get(x_63, 6);
-lean_inc(x_81);
-lean_inc(x_80);
-lean_inc(x_79);
-lean_inc(x_78);
+lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+x_73 = lean_ctor_get(x_61, 0);
+x_74 = lean_ctor_get(x_61, 1);
+x_75 = lean_ctor_get(x_61, 2);
+x_76 = lean_ctor_get(x_61, 3);
+x_77 = lean_ctor_get(x_61, 4);
 lean_inc(x_77);
 lean_inc(x_76);
 lean_inc(x_75);
-lean_dec(x_63);
-x_82 = l_Std_PersistentArray_push___rarg(x_77, x_61);
-x_83 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_83, 0, x_75);
-lean_ctor_set(x_83, 1, x_76);
-lean_ctor_set(x_83, 2, x_82);
-lean_ctor_set(x_83, 3, x_78);
-lean_ctor_set(x_83, 4, x_79);
-lean_ctor_set(x_83, 5, x_80);
-lean_ctor_set(x_83, 6, x_81);
-x_84 = lean_st_ref_set(x_6, x_83, x_64);
-x_85 = lean_ctor_get(x_84, 1);
-lean_inc(x_85);
-if (lean_is_exclusive(x_84)) {
- lean_ctor_release(x_84, 0);
- lean_ctor_release(x_84, 1);
- x_86 = x_84;
+lean_inc(x_74);
+lean_inc(x_73);
+lean_dec(x_61);
+x_78 = l_Std_PersistentArray_push___rarg(x_75, x_59);
+x_79 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_79, 0, x_73);
+lean_ctor_set(x_79, 1, x_74);
+lean_ctor_set(x_79, 2, x_78);
+lean_ctor_set(x_79, 3, x_76);
+lean_ctor_set(x_79, 4, x_77);
+x_80 = lean_st_ref_set(x_6, x_79, x_62);
+x_81 = lean_ctor_get(x_80, 1);
+lean_inc(x_81);
+if (lean_is_exclusive(x_80)) {
+ lean_ctor_release(x_80, 0);
+ lean_ctor_release(x_80, 1);
+ x_82 = x_80;
 } else {
- lean_dec_ref(x_84);
- x_86 = lean_box(0);
+ lean_dec_ref(x_80);
+ x_82 = lean_box(0);
 }
-x_87 = lean_box(0);
-if (lean_is_scalar(x_86)) {
- x_88 = lean_alloc_ctor(0, 2, 0);
+x_83 = lean_box(0);
+if (lean_is_scalar(x_82)) {
+ x_84 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_88 = x_86;
+ x_84 = x_82;
 }
-lean_ctor_set(x_88, 0, x_87);
-lean_ctor_set(x_88, 1, x_85);
-return x_88;
+lean_ctor_set(x_84, 0, x_83);
+lean_ctor_set(x_84, 1, x_81);
+return x_84;
 }
 }
 }
@ -14925,7 +14907,7 @@ lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
-x_19 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_17, x_18, x_7, x_8, x_9, x_10, x_11, x_12, x_16);
+x_19 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_17, x_18, x_7, x_8, x_9, x_10, x_11, x_12, x_16);
 if (lean_obj_tag(x_19) == 0)
 {
 uint8_t x_20; 
--- a/stage0/stdlib/Lean/Elab/Quotation.c
+++ b/stage0/stdlib/Lean/Elab/Quotation.c
--- a/stage0/stdlib/Lean/Elab/StructInst.c
+++ b/stage0/stdlib/Lean/Elab/StructInst.c
@ -187,7 +187,6 @@ lean_object* l_Std_HashMapImp_find_x3f___at___private_Lean_Elab_StructInst_12__m
 lean_object* l_Lean_Elab_Term_StructInst_Struct_structName(lean_object*);
 lean_object* l_Lean_Expr_getAppNumArgsAux___main(lean_object*, lean_object*);
 uint8_t lean_metavar_ctx_is_expr_assigned(lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__11;
 lean_object* l_Lean_Elab_Term_StructInst_defaultMissing_x3f___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_mkDefaultValueAux_x3f___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_25__elabStructInstAux___closed__2;
@ -381,6 +380,7 @@ lean_object* l_Lean_Elab_Term_StructInst_throwFailedToElabField___rarg___closed_
 lean_object* l_Std_AssocList_find_x3f___main___at___private_Lean_Elab_StructInst_12__mkFieldMap___spec__2___boxed(lean_object*, lean_object*);
 lean_object* lean_environment_main_module(lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_4__elabModifyOp___closed__22;
+extern lean_object* l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__9;
 uint8_t l_Lean_Expr_isMVar(lean_object*);
 lean_object* l_Array_foldlStepMAux___main___at___private_Lean_Elab_StructInst_3__isModifyOp_x3f___spec__1___closed__5;
 lean_object* l_Lean_Elab_Term_StructInst_Struct_modifyFieldsM___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -627,49 +627,49 @@ return x_3;
 lean_object* l___private_Lean_Elab_StructInst_1__expandNonAtomicExplicitSource(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) {
 _start:
 {
-lean_object* x_9; lean_object* x_10; uint8_t x_11; uint8_t x_12; lean_object* x_13; lean_object* x_14; lean_object* x_255; 
+lean_object* x_9; lean_object* x_10; uint8_t x_11; uint8_t x_12; lean_object* x_13; lean_object* x_14; lean_object* x_253; 
 x_9 = lean_unsigned_to_nat(1u);
 x_10 = l_Lean_Syntax_getArg(x_1, x_9);
 x_11 = l_Lean_Syntax_isNone(x_10);
-x_255 = lean_st_ref_take(x_3, x_8);
+x_253 = lean_st_ref_take(x_3, x_8);
 if (x_11 == 0)
 {
-lean_object* x_256; lean_object* x_257; uint8_t x_258; 
-x_256 = lean_ctor_get(x_255, 0);
-lean_inc(x_256);
-x_257 = lean_ctor_get(x_255, 1);
-lean_inc(x_257);
-lean_dec(x_255);
-x_258 = 0;
-x_12 = x_258;
-x_13 = x_256;
-x_14 = x_257;
-goto block_254;
+lean_object* x_254; lean_object* x_255; uint8_t x_256; 
+x_254 = lean_ctor_get(x_253, 0);
+lean_inc(x_254);
+x_255 = lean_ctor_get(x_253, 1);
+lean_inc(x_255);
+lean_dec(x_253);
+x_256 = 0;
+x_12 = x_256;
+x_13 = x_254;
+x_14 = x_255;
+goto block_252;
 }
 else
 {
-lean_object* x_259; lean_object* x_260; uint8_t x_261; 
-x_259 = lean_ctor_get(x_255, 0);
-lean_inc(x_259);
-x_260 = lean_ctor_get(x_255, 1);
-lean_inc(x_260);
-lean_dec(x_255);
-x_261 = 1;
-x_12 = x_261;
-x_13 = x_259;
-x_14 = x_260;
-goto block_254;
+lean_object* x_257; lean_object* x_258; uint8_t x_259; 
+x_257 = lean_ctor_get(x_253, 0);
+lean_inc(x_257);
+x_258 = lean_ctor_get(x_253, 1);
+lean_inc(x_258);
+lean_dec(x_253);
+x_259 = 1;
+x_12 = x_259;
+x_13 = x_257;
+x_14 = x_258;
+goto block_252;
 }
-block_254:
+block_252:
 {
 uint8_t x_15; 
 x_15 = !lean_is_exclusive(x_13);
 if (x_15 == 0)
 {
 lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_16 = lean_ctor_get(x_13, 5);
+x_16 = lean_ctor_get(x_13, 3);
 x_17 = lean_nat_add(x_16, x_9);
-lean_ctor_set(x_13, 5, x_17);
+lean_ctor_set(x_13, 3, x_17);
 x_18 = lean_st_ref_set(x_3, x_13, x_14);
 if (x_12 == 0)
 {
@ -1052,55 +1052,49 @@ return x_172;
 }
 else
 {
-lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; 
+lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; 
 x_173 = lean_ctor_get(x_13, 0);
 x_174 = lean_ctor_get(x_13, 1);
 x_175 = lean_ctor_get(x_13, 2);
 x_176 = lean_ctor_get(x_13, 3);
 x_177 = lean_ctor_get(x_13, 4);
-x_178 = lean_ctor_get(x_13, 5);
-x_179 = lean_ctor_get(x_13, 6);
-lean_inc(x_179);
-lean_inc(x_178);
 lean_inc(x_177);
 lean_inc(x_176);
 lean_inc(x_175);
 lean_inc(x_174);
 lean_inc(x_173);
 lean_dec(x_13);
-x_180 = lean_nat_add(x_178, x_9);
-x_181 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_181, 0, x_173);
-lean_ctor_set(x_181, 1, x_174);
-lean_ctor_set(x_181, 2, x_175);
-lean_ctor_set(x_181, 3, x_176);
-lean_ctor_set(x_181, 4, x_177);
-lean_ctor_set(x_181, 5, x_180);
-lean_ctor_set(x_181, 6, x_179);
-x_182 = lean_st_ref_set(x_3, x_181, x_14);
+x_178 = lean_nat_add(x_176, x_9);
+x_179 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_179, 0, x_173);
+lean_ctor_set(x_179, 1, x_174);
+lean_ctor_set(x_179, 2, x_175);
+lean_ctor_set(x_179, 3, x_178);
+lean_ctor_set(x_179, 4, x_177);
+x_180 = lean_st_ref_set(x_3, x_179, x_14);
 if (x_12 == 0)
 {
-lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; uint8_t x_191; uint8_t x_192; uint8_t x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; 
-x_183 = lean_ctor_get(x_182, 1);
+lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; uint8_t x_189; uint8_t x_190; uint8_t x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; 
+x_181 = lean_ctor_get(x_180, 1);
+lean_inc(x_181);
+lean_dec(x_180);
+x_182 = lean_ctor_get(x_2, 0);
+lean_inc(x_182);
+x_183 = lean_ctor_get(x_2, 1);
 lean_inc(x_183);
-lean_dec(x_182);
-x_184 = lean_ctor_get(x_2, 0);
+x_184 = lean_ctor_get(x_2, 2);
 lean_inc(x_184);
-x_185 = lean_ctor_get(x_2, 1);
+x_185 = lean_ctor_get(x_2, 3);
 lean_inc(x_185);
-x_186 = lean_ctor_get(x_2, 2);
+x_186 = lean_ctor_get(x_2, 4);
 lean_inc(x_186);
-x_187 = lean_ctor_get(x_2, 3);
+x_187 = lean_ctor_get(x_2, 5);
 lean_inc(x_187);
-x_188 = lean_ctor_get(x_2, 4);
+x_188 = lean_ctor_get(x_2, 6);
 lean_inc(x_188);
-x_189 = lean_ctor_get(x_2, 5);
-lean_inc(x_189);
-x_190 = lean_ctor_get(x_2, 6);
-lean_inc(x_190);
-x_191 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
-x_192 = lean_ctor_get_uint8(x_2, sizeof(void*)*8 + 1);
-x_193 = lean_ctor_get_uint8(x_2, sizeof(void*)*8 + 2);
+x_189 = lean_ctor_get_uint8(x_2, sizeof(void*)*8);
+x_190 = lean_ctor_get_uint8(x_2, sizeof(void*)*8 + 1);
+x_191 = lean_ctor_get_uint8(x_2, sizeof(void*)*8 + 2);
 if (lean_is_exclusive(x_2)) {
 lean_ctor_release(x_2, 0);
 lean_ctor_release(x_2, 1);
@ -1110,185 +1104,185 @@ if (lean_is_exclusive(x_2)) {
 lean_ctor_release(x_2, 5);
 lean_ctor_release(x_2, 6);
 lean_ctor_release(x_2, 7);
- x_194 = x_2;
+ x_192 = x_2;
 } else {
 lean_dec_ref(x_2);
- x_194 = lean_box(0);
+ x_192 = lean_box(0);
 }
-if (lean_is_scalar(x_194)) {
- x_195 = lean_alloc_ctor(0, 8, 3);
+if (lean_is_scalar(x_192)) {
+ x_193 = lean_alloc_ctor(0, 8, 3);
 } else {
- x_195 = x_194;
+ x_193 = x_192;
 }
-lean_ctor_set(x_195, 0, x_184);
-lean_ctor_set(x_195, 1, x_185);
-lean_ctor_set(x_195, 2, x_186);
-lean_ctor_set(x_195, 3, x_187);
-lean_ctor_set(x_195, 4, x_188);
-lean_ctor_set(x_195, 5, x_189);
-lean_ctor_set(x_195, 6, x_190);
-lean_ctor_set(x_195, 7, x_178);
-lean_ctor_set_uint8(x_195, sizeof(void*)*8, x_191);
-lean_ctor_set_uint8(x_195, sizeof(void*)*8 + 1, x_192);
-lean_ctor_set_uint8(x_195, sizeof(void*)*8 + 2, x_193);
-x_196 = lean_unsigned_to_nat(0u);
-x_197 = l_Lean_Syntax_getArg(x_10, x_196);
+lean_ctor_set(x_193, 0, x_182);
+lean_ctor_set(x_193, 1, x_183);
+lean_ctor_set(x_193, 2, x_184);
+lean_ctor_set(x_193, 3, x_185);
+lean_ctor_set(x_193, 4, x_186);
+lean_ctor_set(x_193, 5, x_187);
+lean_ctor_set(x_193, 6, x_188);
+lean_ctor_set(x_193, 7, x_176);
+lean_ctor_set_uint8(x_193, sizeof(void*)*8, x_189);
+lean_ctor_set_uint8(x_193, sizeof(void*)*8 + 1, x_190);
+lean_ctor_set_uint8(x_193, sizeof(void*)*8 + 2, x_191);
+x_194 = lean_unsigned_to_nat(0u);
+x_195 = l_Lean_Syntax_getArg(x_10, x_194);
 lean_inc(x_4);
+lean_inc(x_195);
+x_196 = l_Lean_Elab_Term_isLocalIdent_x3f(x_195, x_193, x_3, x_4, x_5, x_6, x_7, x_181);
+x_197 = lean_ctor_get(x_196, 0);
 lean_inc(x_197);
-x_198 = l_Lean_Elab_Term_isLocalIdent_x3f(x_197, x_195, x_3, x_4, x_5, x_6, x_7, x_183);
-x_199 = lean_ctor_get(x_198, 0);
-lean_inc(x_199);
-if (lean_obj_tag(x_199) == 0)
+if (lean_obj_tag(x_197) == 0)
 {
-lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; 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; lean_object* x_215; 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; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; lean_object* x_245; 
-x_200 = lean_ctor_get(x_198, 1);
+lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; 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; lean_object* x_215; 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; lean_object* x_223; lean_object* x_224; lean_object* x_225; lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; 
+x_198 = lean_ctor_get(x_196, 1);
+lean_inc(x_198);
+lean_dec(x_196);
+x_199 = l_Lean_Elab_Term_getCurrMacroScope(x_193, x_3, x_4, x_5, x_6, x_7, x_198);
+x_200 = lean_ctor_get(x_199, 0);
 lean_inc(x_200);
-lean_dec(x_198);
-x_201 = l_Lean_Elab_Term_getCurrMacroScope(x_195, x_3, x_4, x_5, x_6, x_7, x_200);
-x_202 = lean_ctor_get(x_201, 0);
-lean_inc(x_202);
-x_203 = lean_ctor_get(x_201, 1);
+x_201 = lean_ctor_get(x_199, 1);
+lean_inc(x_201);
+lean_dec(x_199);
+x_202 = l_Lean_Elab_Term_getMainModule___rarg(x_7, x_201);
+x_203 = lean_ctor_get(x_202, 0);
 lean_inc(x_203);
-lean_dec(x_201);
-x_204 = l_Lean_Elab_Term_getMainModule___rarg(x_7, x_203);
-x_205 = lean_ctor_get(x_204, 0);
-lean_inc(x_205);
-x_206 = lean_ctor_get(x_204, 1);
-lean_inc(x_206);
-lean_dec(x_204);
-x_207 = l___private_Lean_Elab_StructInst_1__expandNonAtomicExplicitSource___closed__4;
-x_208 = l_Lean_addMacroScope(x_205, x_207, x_202);
-x_209 = lean_box(0);
-x_210 = l_Lean_SourceInfo_inhabited___closed__1;
-x_211 = l___private_Lean_Elab_StructInst_1__expandNonAtomicExplicitSource___closed__3;
-x_212 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_212, 0, x_210);
-lean_ctor_set(x_212, 1, x_211);
-lean_ctor_set(x_212, 2, x_208);
-lean_ctor_set(x_212, 3, x_209);
-x_213 = l_Lean_Syntax_setArg(x_10, x_196, x_212);
-x_214 = l_Lean_Syntax_setArg(x_1, x_9, x_213);
-x_215 = l_Lean_Elab_Term_getCurrMacroScope(x_195, x_3, x_4, x_5, x_6, x_7, x_206);
+x_204 = lean_ctor_get(x_202, 1);
+lean_inc(x_204);
+lean_dec(x_202);
+x_205 = l___private_Lean_Elab_StructInst_1__expandNonAtomicExplicitSource___closed__4;
+x_206 = l_Lean_addMacroScope(x_203, x_205, x_200);
+x_207 = lean_box(0);
+x_208 = l_Lean_SourceInfo_inhabited___closed__1;
+x_209 = l___private_Lean_Elab_StructInst_1__expandNonAtomicExplicitSource___closed__3;
+x_210 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_210, 0, x_208);
+lean_ctor_set(x_210, 1, x_209);
+lean_ctor_set(x_210, 2, x_206);
+lean_ctor_set(x_210, 3, x_207);
+x_211 = l_Lean_Syntax_setArg(x_10, x_194, x_210);
+x_212 = l_Lean_Syntax_setArg(x_1, x_9, x_211);
+x_213 = l_Lean_Elab_Term_getCurrMacroScope(x_193, x_3, x_4, x_5, x_6, x_7, x_204);
 lean_dec(x_4);
-lean_dec(x_195);
-x_216 = lean_ctor_get(x_215, 0);
-lean_inc(x_216);
-x_217 = lean_ctor_get(x_215, 1);
+lean_dec(x_193);
+x_214 = lean_ctor_get(x_213, 0);
+lean_inc(x_214);
+x_215 = lean_ctor_get(x_213, 1);
+lean_inc(x_215);
+lean_dec(x_213);
+x_216 = l_Lean_Elab_Term_getMainModule___rarg(x_7, x_215);
+x_217 = lean_ctor_get(x_216, 0);
 lean_inc(x_217);
-lean_dec(x_215);
-x_218 = l_Lean_Elab_Term_getMainModule___rarg(x_7, x_217);
-x_219 = lean_ctor_get(x_218, 0);
-lean_inc(x_219);
-x_220 = lean_ctor_get(x_218, 1);
-lean_inc(x_220);
-if (lean_is_exclusive(x_218)) {
- lean_ctor_release(x_218, 0);
- lean_ctor_release(x_218, 1);
- x_221 = x_218;
+x_218 = lean_ctor_get(x_216, 1);
+lean_inc(x_218);
+if (lean_is_exclusive(x_216)) {
+ lean_ctor_release(x_216, 0);
+ lean_ctor_release(x_216, 1);
+ x_219 = x_216;
 } else {
- lean_dec_ref(x_218);
- x_221 = lean_box(0);
+ lean_dec_ref(x_216);
+ x_219 = lean_box(0);
+}
+x_220 = l_Lean_addMacroScope(x_217, x_205, x_214);
+x_221 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_221, 0, x_208);
+lean_ctor_set(x_221, 1, x_209);
+lean_ctor_set(x_221, 2, x_220);
+lean_ctor_set(x_221, 3, x_207);
+x_222 = l_Array_empty___closed__1;
+x_223 = lean_array_push(x_222, x_221);
+x_224 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
+x_225 = lean_array_push(x_223, x_224);
+x_226 = lean_array_push(x_225, x_224);
+x_227 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__10;
+x_228 = lean_array_push(x_226, x_227);
+x_229 = lean_array_push(x_228, x_195);
+x_230 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__8;
+x_231 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_231, 0, x_230);
+lean_ctor_set(x_231, 1, x_229);
+x_232 = lean_array_push(x_222, x_231);
+x_233 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__6;
+x_234 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_234, 0, x_233);
+lean_ctor_set(x_234, 1, x_232);
+x_235 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__4;
+x_236 = lean_array_push(x_235, x_234);
+x_237 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__16;
+x_238 = lean_array_push(x_236, x_237);
+x_239 = lean_array_push(x_238, x_212);
+x_240 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__2;
+x_241 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_241, 0, x_240);
+lean_ctor_set(x_241, 1, x_239);
+x_242 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_242, 0, x_241);
+if (lean_is_scalar(x_219)) {
+ x_243 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_243 = x_219;
 }
-x_222 = l_Lean_addMacroScope(x_219, x_207, x_216);
-x_223 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_223, 0, x_210);
-lean_ctor_set(x_223, 1, x_211);
-lean_ctor_set(x_223, 2, x_222);
-lean_ctor_set(x_223, 3, x_209);
-x_224 = l_Array_empty___closed__1;
-x_225 = lean_array_push(x_224, x_223);
-x_226 = l___private_Lean_Elab_Quotation_2__quoteSyntax___main___closed__42;
-x_227 = lean_array_push(x_225, x_226);
-x_228 = lean_array_push(x_227, x_226);
-x_229 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__10;
-x_230 = lean_array_push(x_228, x_229);
-x_231 = lean_array_push(x_230, x_197);
-x_232 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__8;
-x_233 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_233, 0, x_232);
-lean_ctor_set(x_233, 1, x_231);
-x_234 = lean_array_push(x_224, x_233);
-x_235 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__6;
-x_236 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_236, 0, x_235);
-lean_ctor_set(x_236, 1, x_234);
-x_237 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__4;
-x_238 = lean_array_push(x_237, x_236);
-x_239 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__16;
-x_240 = lean_array_push(x_238, x_239);
-x_241 = lean_array_push(x_240, x_214);
-x_242 = l___private_Lean_Elab_Quotation_4__getHeadInfo___elambda__3___closed__2;
-x_243 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_243, 0, x_242);
-lean_ctor_set(x_243, 1, x_241);
-x_244 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_244, 0, x_243);
-if (lean_is_scalar(x_221)) {
- x_245 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_245 = x_221;
-}
-lean_ctor_set(x_245, 0, x_244);
-lean_ctor_set(x_245, 1, x_220);
-return x_245;
+lean_ctor_set(x_243, 1, x_218);
+return x_243;
 }
 else
 {
-lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; 
-lean_dec(x_199);
+lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; 
 lean_dec(x_197);
 lean_dec(x_195);
+lean_dec(x_193);
 lean_dec(x_10);
 lean_dec(x_4);
 lean_dec(x_1);
-x_246 = lean_ctor_get(x_198, 1);
-lean_inc(x_246);
-if (lean_is_exclusive(x_198)) {
- lean_ctor_release(x_198, 0);
- lean_ctor_release(x_198, 1);
- x_247 = x_198;
+x_244 = lean_ctor_get(x_196, 1);
+lean_inc(x_244);
+if (lean_is_exclusive(x_196)) {
+ lean_ctor_release(x_196, 0);
+ lean_ctor_release(x_196, 1);
+ x_245 = x_196;
 } else {
- lean_dec_ref(x_198);
- x_247 = lean_box(0);
+ lean_dec_ref(x_196);
+ x_245 = lean_box(0);
 }
-x_248 = lean_box(0);
-if (lean_is_scalar(x_247)) {
- x_249 = lean_alloc_ctor(0, 2, 0);
+x_246 = lean_box(0);
+if (lean_is_scalar(x_245)) {
+ x_247 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_249 = x_247;
+ x_247 = x_245;
 }
-lean_ctor_set(x_249, 0, x_248);
-lean_ctor_set(x_249, 1, x_246);
-return x_249;
+lean_ctor_set(x_247, 0, x_246);
+lean_ctor_set(x_247, 1, x_244);
+return x_247;
 }
 }
 else
 {
-lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; 
-lean_dec(x_178);
+lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; 
+lean_dec(x_176);
 lean_dec(x_10);
 lean_dec(x_4);
 lean_dec(x_2);
 lean_dec(x_1);
-x_250 = lean_ctor_get(x_182, 1);
-lean_inc(x_250);
-if (lean_is_exclusive(x_182)) {
- lean_ctor_release(x_182, 0);
- lean_ctor_release(x_182, 1);
- x_251 = x_182;
+x_248 = lean_ctor_get(x_180, 1);
+lean_inc(x_248);
+if (lean_is_exclusive(x_180)) {
+ lean_ctor_release(x_180, 0);
+ lean_ctor_release(x_180, 1);
+ x_249 = x_180;
 } else {
- lean_dec_ref(x_182);
- x_251 = lean_box(0);
+ lean_dec_ref(x_180);
+ x_249 = lean_box(0);
 }
-x_252 = lean_box(0);
-if (lean_is_scalar(x_251)) {
- x_253 = lean_alloc_ctor(0, 2, 0);
+x_250 = lean_box(0);
+if (lean_is_scalar(x_249)) {
+ x_251 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_253 = x_251;
+ x_251 = x_249;
 }
-lean_ctor_set(x_253, 0, x_252);
-lean_ctor_set(x_253, 1, x_250);
-return x_253;
+lean_ctor_set(x_251, 0, x_250);
+lean_ctor_set(x_251, 1, x_248);
+return x_251;
 }
 }
 }
@ -9361,7 +9355,7 @@ lean_object* _init_l_Lean_Elab_Term_StructInst_formatStruct___main___closed__5()
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__11;
+x_1 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__9;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@ -28011,7 +28005,7 @@ lean_inc(x_93);
 x_94 = lean_ctor_get(x_92, 1);
 lean_inc(x_94);
 lean_dec(x_92);
-x_95 = lean_ctor_get(x_93, 5);
+x_95 = lean_ctor_get(x_93, 3);
 lean_inc(x_95);
 lean_dec(x_93);
 x_96 = lean_ctor_get(x_7, 1);
@ -28042,9 +28036,9 @@ x_106 = !lean_is_exclusive(x_104);
 if (x_106 == 0)
 {
 lean_object* x_107; lean_object* x_108; lean_object* x_109; 
-x_107 = lean_ctor_get(x_104, 5);
+x_107 = lean_ctor_get(x_104, 3);
 lean_dec(x_107);
-lean_ctor_set(x_104, 5, x_102);
+lean_ctor_set(x_104, 3, x_102);
 x_108 = lean_st_ref_set(x_4, x_104, x_105);
 x_109 = lean_ctor_get(x_108, 1);
 lean_inc(x_109);
@ -28055,34 +28049,28 @@ goto block_84;
 }
 else
 {
-lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; 
+lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; 
 x_110 = lean_ctor_get(x_104, 0);
 x_111 = lean_ctor_get(x_104, 1);
 x_112 = lean_ctor_get(x_104, 2);
-x_113 = lean_ctor_get(x_104, 3);
-x_114 = lean_ctor_get(x_104, 4);
-x_115 = lean_ctor_get(x_104, 6);
-lean_inc(x_115);
-lean_inc(x_114);
+x_113 = lean_ctor_get(x_104, 4);
 lean_inc(x_113);
 lean_inc(x_112);
 lean_inc(x_111);
 lean_inc(x_110);
 lean_dec(x_104);
-x_116 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_116, 0, x_110);
-lean_ctor_set(x_116, 1, x_111);
-lean_ctor_set(x_116, 2, x_112);
-lean_ctor_set(x_116, 3, x_113);
-lean_ctor_set(x_116, 4, x_114);
-lean_ctor_set(x_116, 5, x_102);
-lean_ctor_set(x_116, 6, x_115);
-x_117 = lean_st_ref_set(x_4, x_116, x_105);
-x_118 = lean_ctor_get(x_117, 1);
-lean_inc(x_118);
-lean_dec(x_117);
+x_114 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_114, 0, x_110);
+lean_ctor_set(x_114, 1, x_111);
+lean_ctor_set(x_114, 2, x_112);
+lean_ctor_set(x_114, 3, x_102);
+lean_ctor_set(x_114, 4, x_113);
+x_115 = lean_st_ref_set(x_4, x_114, x_105);
+x_116 = lean_ctor_get(x_115, 1);
+lean_inc(x_116);
+lean_dec(x_115);
 x_10 = x_101;
-x_11 = x_118;
+x_11 = x_116;
 goto block_84;
 }
 block_84:
--- a/stage0/stdlib/Lean/Elab/Structure.c
+++ b/stage0/stdlib/Lean/Elab/Structure.c
@ -21,6 +21,7 @@ lean_object* l_Lean_Elab_elabAttr___at___private_Lean_Elab_Structure_2__expandCt
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__1___boxed(lean_object**);
 lean_object* l_Lean_Elab_Term_removeUnused(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_applyVisibility___at_Lean_Elab_Command_expandDeclId___spec__5(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Lean_Elab_Structure_31__elabStructureView___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_cases_on(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_6__findFieldInfo_x3f___boxed(lean_object*, lean_object*);
@ -94,7 +95,6 @@ extern lean_object* l___regBuiltin_Lean_Elab_Term_elabTypeStx___closed__2;
 lean_object* l_Lean_Elab_Command_shouldInferResultUniverse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getLevelNames___rarg(lean_object*, lean_object*);
 lean_object* lean_string_utf8_byte_size(lean_object*);
-lean_object* l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withLevelNames___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabStructure___closed__10;
 lean_object* l___private_Lean_Elab_Structure_20__collectUniversesFromFields(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -19142,7 +19142,7 @@ lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
 lean_inc(x_5);
-x_14 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_12, x_13, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+x_14 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_12, x_13, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 if (lean_obj_tag(x_14) == 0)
 {
 lean_object* x_15; lean_object* x_16; 
--- a/stage0/stdlib/Lean/Elab/SyntheticMVars.c
+++ b/stage0/stdlib/Lean/Elab/SyntheticMVars.c
--- a/stage0/stdlib/Lean/Elab/Tactic/Basic.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Basic.c
--- a/stage0/stdlib/Lean/Elab/Tactic/ElabTerm.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/ElabTerm.c
@ -15,6 +15,7 @@ extern "C" {
 #endif
 lean_object* l_Lean_Meta_assert(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_elabAsFVar___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*, lean_object*);
+lean_object* l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_withIncRecDepth___rarg___lambda__2___closed__2;
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalChoiceAux___main___spec__1___rarg(lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalExact(lean_object*);
@ -28,7 +29,6 @@ lean_object* l_List_append___rarg(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_Elab_Tactic_elabAsFVar___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*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalApply(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalRefine(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
@ -150,7 +150,7 @@ lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
-x_25 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_3, x_24, x_6, x_7, x_8, x_9, x_10, x_11, x_23);
+x_25 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_3, x_24, x_6, x_7, x_8, x_9, x_10, x_11, x_23);
 if (lean_obj_tag(x_25) == 0)
 {
 lean_object* x_26; lean_object* x_27; 
@ -282,7 +282,7 @@ lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_47);
-x_53 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_3, x_52, x_47, x_7, x_8, x_9, x_10, x_11, x_51);
+x_53 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_3, x_52, x_47, x_7, x_8, x_9, x_10, x_11, x_51);
 if (lean_obj_tag(x_53) == 0)
 {
 lean_object* x_54; lean_object* x_55; 
@ -456,7 +456,7 @@ lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_84);
-x_90 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_3, x_89, x_84, x_7, x_8, x_9, x_71, x_11, x_88);
+x_90 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_3, x_89, x_84, x_7, x_8, x_9, x_71, x_11, x_88);
 if (lean_obj_tag(x_90) == 0)
 {
 lean_object* x_91; lean_object* x_92; 
@ -2280,7 +2280,7 @@ lean_inc(x_34);
 lean_dec(x_33);
 x_35 = 0;
 x_36 = lean_box(0);
-x_37 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_35, x_36, x_6, x_7, x_8, x_9, x_10, x_11, x_34);
+x_37 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_35, x_36, x_6, x_7, x_8, x_9, x_10, x_11, x_34);
 if (lean_obj_tag(x_37) == 0)
 {
 uint8_t x_38; 
@ -2403,7 +2403,7 @@ lean_inc(x_63);
 lean_dec(x_62);
 x_64 = 0;
 x_65 = lean_box(0);
-x_66 = l___private_Lean_Elab_SyntheticMVars_11__synthesizeSyntheticMVarsAux___main(x_64, x_65, x_6, x_7, x_8, x_9, x_10, x_11, x_63);
+x_66 = l___private_Lean_Elab_SyntheticMVars_13__synthesizeSyntheticMVarsAux___main(x_64, x_65, x_6, x_7, x_8, x_9, x_10, x_11, x_63);
 if (lean_obj_tag(x_66) == 0)
 {
 lean_object* x_67; lean_object* x_68; lean_object* x_69; 
--- a/stage0/stdlib/Lean/Elab/Tactic/Induction.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Induction.c
@ -9244,6 +9244,7 @@ lean_inc(x_25);
 lean_dec(x_24);
 x_26 = l_Lean_Elab_Tactic_done(x_4, x_5, x_6, x_7, x_9, x_10, x_11, x_12, x_25);
 lean_dec(x_12);
+lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_7);
--- a/stage0/stdlib/Lean/Elab/Tactic/Match.c
+++ b/stage0/stdlib/Lean/Elab/Tactic/Match.c
@ -47,6 +47,7 @@ lean_object* lean_st_ref_take(lean_object*, lean_object*);
 lean_object* l_Lean_Name_append___main(lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Elab_Binders_11__expandFunBindersAux___main___closed__18;
 lean_object* l_Lean_Name_appendIndexAfter(lean_object*, lean_object*);
+extern lean_object* l___private_Lean_Elab_Match_38__elabMatchAux___closed__2;
 lean_object* l___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux___lambda__1___closed__3;
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Tactic_evalRefine___closed__3;
@ -59,6 +60,7 @@ lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at___private
 extern lean_object* l_Lean_Parser_FirstTokens_toStr___closed__3;
 extern lean_object* l_Lean_Elab_Tactic_tacticElabAttribute;
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__10;
 lean_object* l_Lean_mkSepStx(lean_object*, lean_object*);
 lean_object* l_Lean_mkAtomFrom(lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Tactic_evalRefine___closed__1;
@ -69,7 +71,6 @@ lean_object* l_Lean_Elab_Tactic_evalTactic___main(lean_object*, lean_object*, le
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 extern lean_object* l___private_Lean_Elab_Quotation_8__letBindRhss___main___closed__4;
 lean_object* l_Lean_Elab_Tactic_evalMatch(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Lean_Elab_Match_39__elabMatchAux___closed__2;
 lean_object* l_Array_mapSepElemsM___at___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_Tactic_Basic_1__evalTacticUsing___main___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -78,12 +79,12 @@ extern lean_object* l___private_Lean_Elab_Binders_11__expandFunBindersAux___main
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkHole___closed__2;
+extern lean_object* l_Lean_myMacro____x40_Lean_Util_Trace___hyg_11____closed__17;
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__2;
 lean_object* lean_nat_mod(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Match_2__mkAuxiliaryMatchTerm(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___regBuiltin_Lean_Elab_Term_elabSyntheticHole___closed__2;
-extern lean_object* l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__12;
 lean_object* l_Lean_Elab_Tactic_evalMatch___closed__1;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 lean_object* l___private_Init_LeanInit_15__mapSepElemsMAux___main___at___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux___spec__2(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) {
@ -259,7 +260,7 @@ lean_inc(x_9);
 x_13 = l_Lean_Syntax_isOfKind(x_9, x_12);
 if (x_13 == 0)
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; 
 x_14 = lean_unsigned_to_nat(1u);
 x_15 = lean_nat_add(x_5, x_14);
 x_16 = lean_ctor_get(x_4, 0);
@ -283,126 +284,113 @@ lean_ctor_set(x_25, 1, x_24);
 x_26 = l_Lean_Syntax_getArg(x_25, x_14);
 x_27 = l___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux___lambda__1___closed__4;
 x_28 = lean_array_push(x_27, x_26);
-x_29 = lean_array_push(x_28, x_9);
-x_30 = l_Lean_Elab_Tactic_evalCase___closed__5;
-x_31 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_31, 0, x_30);
-lean_ctor_set(x_31, 1, x_29);
-x_32 = !lean_is_exclusive(x_3);
-if (x_32 == 0)
+x_29 = l_Lean_myMacro____x40_Lean_Util_Trace___hyg_11____closed__17;
+x_30 = lean_array_push(x_28, x_29);
+x_31 = lean_array_push(x_30, x_9);
+x_32 = l_Lean_Elab_Tactic_evalCase___closed__5;
+x_33 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_ctor_set(x_33, 1, x_31);
+x_34 = !lean_is_exclusive(x_3);
+if (x_34 == 0)
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_33 = lean_ctor_get(x_3, 1);
-x_34 = lean_array_push(x_33, x_31);
-lean_ctor_set(x_3, 1, x_34);
-x_35 = l_Lean_Syntax_setArg(x_7, x_8, x_25);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_3);
-x_37 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set(x_37, 1, x_15);
-return x_37;
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_35 = lean_ctor_get(x_3, 1);
+x_36 = lean_array_push(x_35, x_33);
+lean_ctor_set(x_3, 1, x_36);
+x_37 = l_Lean_Syntax_setArg(x_7, x_8, x_25);
+x_38 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_38, 0, x_37);
+lean_ctor_set(x_38, 1, x_3);
+x_39 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_39, 0, x_38);
+lean_ctor_set(x_39, 1, x_15);
+return x_39;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_38 = lean_ctor_get(x_3, 0);
-x_39 = lean_ctor_get(x_3, 1);
-lean_inc(x_39);
-lean_inc(x_38);
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_40 = lean_ctor_get(x_3, 0);
+x_41 = lean_ctor_get(x_3, 1);
+lean_inc(x_41);
+lean_inc(x_40);
 lean_dec(x_3);
-x_40 = lean_array_push(x_39, x_31);
-x_41 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_41, 0, x_38);
-lean_ctor_set(x_41, 1, x_40);
-x_42 = l_Lean_Syntax_setArg(x_7, x_8, x_25);
+x_42 = lean_array_push(x_41, x_33);
 x_43 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_43, 0, x_42);
-lean_ctor_set(x_43, 1, x_41);
-x_44 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_44, 0, x_43);
-lean_ctor_set(x_44, 1, x_15);
-return x_44;
+lean_ctor_set(x_43, 0, x_40);
+lean_ctor_set(x_43, 1, x_42);
+x_44 = l_Lean_Syntax_setArg(x_7, x_8, x_25);
+x_45 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_45, 0, x_44);
+lean_ctor_set(x_45, 1, x_43);
+x_46 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_46, 0, x_45);
+lean_ctor_set(x_46, 1, x_15);
+return x_46;
 }
 }
 else
 {
-uint8_t x_45; 
+uint8_t x_47; 
 lean_dec(x_4);
-x_45 = !lean_is_exclusive(x_3);
-if (x_45 == 0)
+x_47 = !lean_is_exclusive(x_3);
+if (x_47 == 0)
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_46 = lean_ctor_get(x_3, 0);
-x_47 = l___private_Lean_Elab_Match_39__elabMatchAux___closed__2;
-lean_inc(x_46);
-x_48 = l_Lean_Name_appendIndexAfter(x_47, x_46);
-x_49 = l_Lean_Name_append___main(x_1, x_48);
-x_50 = l_Lean_mkIdentFrom(x_9, x_49);
+lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_48 = lean_ctor_get(x_3, 0);
+x_49 = l___private_Lean_Elab_Match_38__elabMatchAux___closed__2;
+lean_inc(x_48);
+x_50 = l_Lean_Name_appendIndexAfter(x_49, x_48);
+x_51 = l_Lean_Name_append___main(x_1, x_50);
+x_52 = l_Lean_mkIdentFrom(x_9, x_51);
 lean_dec(x_9);
-x_51 = l___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux___lambda__1___closed__2;
-x_52 = lean_array_push(x_51, x_50);
-x_53 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_53, 0, x_10);
-lean_ctor_set(x_53, 1, x_52);
-x_54 = lean_unsigned_to_nat(1u);
-x_55 = lean_nat_add(x_46, x_54);
-lean_dec(x_46);
-lean_ctor_set(x_3, 0, x_55);
-x_56 = l_Lean_Syntax_setArg(x_7, x_8, x_53);
-x_57 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_57, 0, x_56);
-lean_ctor_set(x_57, 1, x_3);
-x_58 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_58, 0, x_57);
-lean_ctor_set(x_58, 1, x_5);
-return x_58;
+x_53 = l___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux___lambda__1___closed__2;
+x_54 = lean_array_push(x_53, x_52);
+x_55 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_55, 0, x_10);
+lean_ctor_set(x_55, 1, x_54);
+x_56 = lean_unsigned_to_nat(1u);
+x_57 = lean_nat_add(x_48, x_56);
+lean_dec(x_48);
+lean_ctor_set(x_3, 0, x_57);
+x_58 = l_Lean_Syntax_setArg(x_7, x_8, x_55);
+x_59 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_59, 0, x_58);
+lean_ctor_set(x_59, 1, x_3);
+x_60 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_60, 0, x_59);
+lean_ctor_set(x_60, 1, x_5);
+return x_60;
 }
 else
 {
-lean_object* x_59; lean_object* x_60; 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; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_59 = lean_ctor_get(x_3, 0);
-x_60 = lean_ctor_get(x_3, 1);
-lean_inc(x_60);
-lean_inc(x_59);
+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; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_61 = lean_ctor_get(x_3, 0);
+x_62 = lean_ctor_get(x_3, 1);
+lean_inc(x_62);
+lean_inc(x_61);
 lean_dec(x_3);
-x_61 = l___private_Lean_Elab_Match_39__elabMatchAux___closed__2;
-lean_inc(x_59);
-x_62 = l_Lean_Name_appendIndexAfter(x_61, x_59);
-x_63 = l_Lean_Name_append___main(x_1, x_62);
-x_64 = l_Lean_mkIdentFrom(x_9, x_63);
+x_63 = l___private_Lean_Elab_Match_38__elabMatchAux___closed__2;
+lean_inc(x_61);
+x_64 = l_Lean_Name_appendIndexAfter(x_63, x_61);
+x_65 = l_Lean_Name_append___main(x_1, x_64);
+x_66 = l_Lean_mkIdentFrom(x_9, x_65);
 lean_dec(x_9);
-x_65 = l___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux___lambda__1___closed__2;
-x_66 = lean_array_push(x_65, x_64);
-x_67 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_67, 0, x_10);
-lean_ctor_set(x_67, 1, x_66);
-x_68 = lean_unsigned_to_nat(1u);
-x_69 = lean_nat_add(x_59, x_68);
-lean_dec(x_59);
-x_70 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_70, 0, x_69);
-lean_ctor_set(x_70, 1, x_60);
-x_71 = l_Lean_Syntax_setArg(x_7, x_8, x_67);
+x_67 = l___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux___lambda__1___closed__2;
+x_68 = lean_array_push(x_67, x_66);
+x_69 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_69, 0, x_10);
+lean_ctor_set(x_69, 1, x_68);
+x_70 = lean_unsigned_to_nat(1u);
+x_71 = lean_nat_add(x_61, x_70);
+lean_dec(x_61);
 x_72 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_72, 0, x_71);
-lean_ctor_set(x_72, 1, x_70);
-x_73 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_73, 0, x_72);
-lean_ctor_set(x_73, 1, x_5);
-return x_73;
-}
-}
-}
-else
-{
-lean_object* x_74; lean_object* x_75; 
-lean_dec(x_9);
-lean_dec(x_4);
+lean_ctor_set(x_72, 1, x_62);
+x_73 = l_Lean_Syntax_setArg(x_7, x_8, x_69);
 x_74 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_74, 0, x_7);
-lean_ctor_set(x_74, 1, x_3);
+lean_ctor_set(x_74, 0, x_73);
+lean_ctor_set(x_74, 1, x_72);
 x_75 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_75, 0, x_74);
 lean_ctor_set(x_75, 1, x_5);
@ -410,6 +398,21 @@ return x_75;
 }
 }
 }
+else
+{
+lean_object* x_76; lean_object* x_77; 
+lean_dec(x_9);
+lean_dec(x_4);
+x_76 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_76, 0, x_7);
+lean_ctor_set(x_76, 1, x_3);
+x_77 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_77, 0, x_76);
+lean_ctor_set(x_77, 1, x_5);
+return x_77;
+}
+}
+}
 lean_object* l___private_Lean_Elab_Tactic_Match_1__mkAuxiliaryMatchTermAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@ -776,7 +779,7 @@ lean_inc(x_60);
 x_61 = lean_ctor_get(x_59, 1);
 lean_inc(x_61);
 lean_dec(x_59);
-x_62 = lean_ctor_get(x_60, 5);
+x_62 = lean_ctor_get(x_60, 3);
 lean_inc(x_62);
 lean_dec(x_60);
 x_63 = lean_ctor_get(x_8, 1);
@ -809,9 +812,9 @@ x_73 = !lean_is_exclusive(x_71);
 if (x_73 == 0)
 {
 lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_71, 5);
+x_74 = lean_ctor_get(x_71, 3);
 lean_dec(x_74);
-lean_ctor_set(x_71, 5, x_69);
+lean_ctor_set(x_71, 3, x_69);
 x_75 = lean_st_ref_set(x_5, x_71, x_72);
 x_76 = lean_ctor_get(x_75, 1);
 lean_inc(x_76);
@ -822,57 +825,51 @@ goto block_48;
 }
 else
 {
-lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
 x_77 = lean_ctor_get(x_71, 0);
 x_78 = lean_ctor_get(x_71, 1);
 x_79 = lean_ctor_get(x_71, 2);
-x_80 = lean_ctor_get(x_71, 3);
-x_81 = lean_ctor_get(x_71, 4);
-x_82 = lean_ctor_get(x_71, 6);
-lean_inc(x_82);
-lean_inc(x_81);
+x_80 = lean_ctor_get(x_71, 4);
 lean_inc(x_80);
 lean_inc(x_79);
 lean_inc(x_78);
 lean_inc(x_77);
 lean_dec(x_71);
-x_83 = lean_alloc_ctor(0, 7, 0);
-lean_ctor_set(x_83, 0, x_77);
-lean_ctor_set(x_83, 1, x_78);
-lean_ctor_set(x_83, 2, x_79);
-lean_ctor_set(x_83, 3, x_80);
-lean_ctor_set(x_83, 4, x_81);
-lean_ctor_set(x_83, 5, x_69);
-lean_ctor_set(x_83, 6, x_82);
-x_84 = lean_st_ref_set(x_5, x_83, x_72);
-x_85 = lean_ctor_get(x_84, 1);
-lean_inc(x_85);
-lean_dec(x_84);
+x_81 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_81, 0, x_77);
+lean_ctor_set(x_81, 1, x_78);
+lean_ctor_set(x_81, 2, x_79);
+lean_ctor_set(x_81, 3, x_69);
+lean_ctor_set(x_81, 4, x_80);
+x_82 = lean_st_ref_set(x_5, x_81, x_72);
+x_83 = lean_ctor_get(x_82, 1);
+lean_inc(x_83);
+lean_dec(x_82);
 x_11 = x_68;
-x_12 = x_85;
+x_12 = x_83;
 goto block_48;
 }
 }
 else
 {
-lean_object* x_86; 
+lean_object* x_84; 
 lean_dec(x_1);
-x_86 = lean_ctor_get(x_67, 0);
-lean_inc(x_86);
+x_84 = lean_ctor_get(x_67, 0);
+lean_inc(x_84);
 lean_dec(x_67);
-if (lean_obj_tag(x_86) == 0)
+if (lean_obj_tag(x_84) == 0)
 {
-lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; uint8_t x_92; 
-x_87 = lean_ctor_get(x_86, 0);
-lean_inc(x_87);
-x_88 = lean_ctor_get(x_86, 1);
-lean_inc(x_88);
-lean_dec(x_86);
-x_89 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_89, 0, x_88);
-x_90 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_90, 0, x_89);
-x_91 = l_Lean_throwErrorAt___at___private_Lean_Elab_Tactic_Basic_1__evalTacticUsing___main___spec__1___rarg(x_87, x_90, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_61);
+lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; uint8_t x_90; 
+x_85 = lean_ctor_get(x_84, 0);
+lean_inc(x_85);
+x_86 = lean_ctor_get(x_84, 1);
+lean_inc(x_86);
+lean_dec(x_84);
+x_87 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_87, 0, x_86);
+x_88 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_88, 0, x_87);
+x_89 = l_Lean_throwErrorAt___at___private_Lean_Elab_Tactic_Basic_1__evalTacticUsing___main___spec__1___rarg(x_85, x_88, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_61);
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@ -880,29 +877,29 @@ lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
-lean_dec(x_87);
-x_92 = !lean_is_exclusive(x_91);
-if (x_92 == 0)
+lean_dec(x_85);
+x_90 = !lean_is_exclusive(x_89);
+if (x_90 == 0)
 {
-return x_91;
+return x_89;
 }
 else
 {
-lean_object* x_93; lean_object* x_94; lean_object* x_95; 
-x_93 = lean_ctor_get(x_91, 0);
-x_94 = lean_ctor_get(x_91, 1);
-lean_inc(x_94);
-lean_inc(x_93);
-lean_dec(x_91);
-x_95 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_95, 0, x_93);
-lean_ctor_set(x_95, 1, x_94);
-return x_95;
+lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+x_91 = lean_ctor_get(x_89, 0);
+x_92 = lean_ctor_get(x_89, 1);
+lean_inc(x_92);
+lean_inc(x_91);
+lean_dec(x_89);
+x_93 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_93, 0, x_91);
+lean_ctor_set(x_93, 1, x_92);
+return x_93;
 }
 }
 else
 {
-lean_object* x_96; uint8_t x_97; 
+lean_object* x_94; uint8_t x_95; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@ -911,31 +908,31 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_96 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalMatch___spec__1___rarg(x_61);
-x_97 = !lean_is_exclusive(x_96);
-if (x_97 == 0)
+x_94 = l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalMatch___spec__1___rarg(x_61);
+x_95 = !lean_is_exclusive(x_94);
+if (x_95 == 0)
 {
-return x_96;
+return x_94;
 }
 else
 {
-lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_98 = lean_ctor_get(x_96, 0);
-x_99 = lean_ctor_get(x_96, 1);
-lean_inc(x_99);
-lean_inc(x_98);
-lean_dec(x_96);
-x_100 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_100, 0, x_98);
-lean_ctor_set(x_100, 1, x_99);
-return x_100;
+lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_96 = lean_ctor_get(x_94, 0);
+x_97 = lean_ctor_get(x_94, 1);
+lean_inc(x_97);
+lean_inc(x_96);
+lean_dec(x_94);
+x_98 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_98, 0, x_96);
+lean_ctor_set(x_98, 1, x_97);
+return x_98;
 }
 }
 }
 }
 else
 {
-uint8_t x_101; 
+uint8_t x_99; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
@ -945,23 +942,23 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_101 = !lean_is_exclusive(x_49);
-if (x_101 == 0)
+x_99 = !lean_is_exclusive(x_49);
+if (x_99 == 0)
 {
 return x_49;
 }
 else
 {
-lean_object* x_102; lean_object* x_103; lean_object* x_104; 
-x_102 = lean_ctor_get(x_49, 0);
-x_103 = lean_ctor_get(x_49, 1);
-lean_inc(x_103);
-lean_inc(x_102);
+lean_object* x_100; lean_object* x_101; lean_object* x_102; 
+x_100 = lean_ctor_get(x_49, 0);
+x_101 = lean_ctor_get(x_49, 1);
+lean_inc(x_101);
+lean_inc(x_100);
 lean_dec(x_49);
-x_104 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_104, 0, x_102);
-lean_ctor_set(x_104, 1, x_103);
-return x_104;
+x_102 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_102, 0, x_100);
+lean_ctor_set(x_102, 1, x_101);
+return x_102;
 }
 }
 block_48:
@ -1086,7 +1083,7 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_2 = l_Lean_Elab_Tactic_tacticElabAttribute;
-x_3 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__12;
+x_3 = l___private_Lean_Elab_Binders_16__expandMatchAltsIntoMatchAux___main___closed__10;
 x_4 = l___regBuiltin_Lean_Elab_Tactic_evalMatch___closed__1;
 x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
--- a/stage0/stdlib/Lean/Elab/Term.c
+++ b/stage0/stdlib/Lean/Elab/Term.c
--- a/stage0/stdlib/Lean/Parser/Tactic.c
+++ b/stage0/stdlib/Lean/Parser/Tactic.c