diff --git a/stage0/src/Init/Lean/Data/Occurrences.lean b/stage0/src/Init/Lean/Data/Occurrences.lean
new file mode 100644
index 0000000000..dc111cf5d7
--- /dev/null
+++ b/stage0/src/Init/Lean/Data/Occurrences.lean
@@ -0,0 +1,39 @@
+/-
+Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Author: Leonardo de Moura
+-/
+prelude
+import Init.Data.Nat
+
+namespace Lean
+
+inductive Occurrences
+| all
+| pos (idxs : List Nat)
+| neg (idxs : List Nat)
+
+namespace Occurrences
+
+instance : Inhabited Occurrences := ⟨all⟩
+
+def contains : Occurrences → Nat → Bool
+| all,      _   => true
+| pos idxs, idx => idxs.contains idx
+| neg idxs, idx => !idxs.contains idx
+
+def isAll : Occurrences → Bool
+| all => true
+| _   => false
+
+def beq : Occurrences → Occurrences → Bool
+| all,     all     => true
+| pos is₁, pos is₂ => is₁ == is₂
+| neg is₁, neg is₂ => is₁ == is₂
+| _,       _       => false
+
+instance : HasBeq Occurrences := ⟨beq⟩
+
+end Occurrences
+
+end Lean
diff --git a/stage0/src/Init/Lean/Elab/BuiltinNotation.lean b/stage0/src/Init/Lean/Elab/BuiltinNotation.lean
index e502678f04..d38cb54194 100644
--- a/stage0/src/Init/Lean/Elab/BuiltinNotation.lean
+++ b/stage0/src/Init/Lean/Elab/BuiltinNotation.lean
@@ -14,28 +14,28 @@ namespace Term
 @[builtinTermElab dollar] def elabDollar : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
 | `($f $ $a) => `($f $a)
-| _          => throwUnexpectedSyntax stx "application"
+| _          => throwUnsupportedSyntax
 
 @[builtinTermElab dollarProj] def elabDollarProj : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
 | `($term $.$field) => `($(term).$field)
-| _                 => throwUnexpectedSyntax stx "$."
+| _                 => throwUnsupportedSyntax
 
 @[builtinTermElab «if»] def elabIf : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
 | `(if $h : $cond then $t else $e) => let h := mkTermIdFromIdent h; `(dite $cond (fun $h => $t) (fun $h => $e))
 | `(if $cond then $t else $e)      => `(ite $cond $t $e)
-| _                                => throwUnexpectedSyntax stx "if-then-else"
+| _                                => throwUnsupportedSyntax
 
 @[builtinTermElab subtype] def elabSubtype : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
 | `({ $x : $type // $p }) => let x := mkTermIdFromIdent x; `(Subtype (fun ($x : $type) => $p))
 | `({ $x // $p })         => let x := mkTermIdFromIdent x; `(Subtype (fun ($x : _) => $p))
-| _                       => throwUnexpectedSyntax stx "subtype"
+| _                       => throwUnsupportedSyntax
 
 @[builtinTermElab anonymousCtor] def elabAnoymousCtor : TermElab :=
 fun stx expectedType? => do
-let ref := stx.val;
+let ref := stx;
 tryPostponeIfNoneOrMVar expectedType?;
 match expectedType? with
 | none              => throwError ref "invalid constructor ⟨...⟩, expected type must be known"
@@ -59,7 +59,7 @@ match expectedType? with
 @[builtinTermElab «show»] def elabShow : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
 | `(show $type from $val) => let thisId := mkTermId stx `this; `((fun ($thisId : $type) => $thisId) $val)
-| _                       => throwUnexpectedSyntax stx "show-from"
+| _                       => throwUnsupportedSyntax
 
 @[builtinTermElab «have»] def elabHave : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
@@ -67,7 +67,7 @@ adaptExpander $ fun stx => match_syntax stx with
 | `(have $type := $val; $body)        => let thisId := mkTermId stx `this; `((fun ($thisId : $type) => $body) $val)
 | `(have $x : $type from $val; $body) => let x := mkTermIdFromIdent x; `((fun ($x : $type) => $body) $val)
 | `(have $x : $type := $val; $body)   => let x := mkTermIdFromIdent x; `((fun ($x : $type) => $body) $val)
-| _                                   => throwUnexpectedSyntax stx "have"
+| _                                   => throwUnsupportedSyntax
 
 @[termElab «where»] def elabWhere : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
@@ -76,7 +76,7 @@ adaptExpander $ fun stx => match_syntax stx with
   decls.foldrM
     (fun decl body => `(let $decl; $body))
     body
-| _                      => throwUnexpectedSyntax stx "where"
+| _                      => throwUnsupportedSyntax
 
 @[termElab «parser!»] def elabParserMacro : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
@@ -90,7 +90,7 @@ adaptExpander $ fun stx => match_syntax stx with
     `(HasOrelse.orelse (Lean.Parser.mkAntiquot $s (some $kind) true) (Lean.Parser.leadingNode $kind $e))
   | none          => throwError stx "invalid `parser!` macro, it must be used in definitions"
   | _             => throwError stx "invalid `parser!` macro, unexpected declaration name"
-| _             => throwUnexpectedSyntax stx "parser!"
+| _             => throwUnsupportedSyntax
 
 @[termElab «tparser!»] def elabTParserMacro : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
@@ -99,7 +99,7 @@ adaptExpander $ fun stx => match_syntax stx with
   match declName? with
   | some declName => let kind := quote declName; `(Lean.Parser.trailingNode $kind $e)
   | none          => throwError stx "invalid `tparser!` macro, it must be used in definitions"
-| _             => throwUnexpectedSyntax stx "tparser!"
+| _             => throwUnsupportedSyntax
 
 def elabInfix (f : Syntax) : TermElab :=
 fun stx expectedType? => do
diff --git a/stage0/src/Init/Lean/Elab/Command.lean b/stage0/src/Init/Lean/Elab/Command.lean
index 3583f812f0..36160b2bdf 100644
--- a/stage0/src/Init/Lean/Elab/Command.lean
+++ b/stage0/src/Init/Lean/Elab/Command.lean
@@ -44,9 +44,11 @@ structure Context :=
 (macroStack     : List Syntax := [])
 (currMacroScope : MacroScope := 0)
 
+instance Exception.inhabited : Inhabited Exception := ⟨Exception.error $ arbitrary _⟩
+
 abbrev CommandElabCoreM (ε) := ReaderT Context (EIO ε)
 abbrev CommandElabM := CommandElabCoreM Exception
-abbrev CommandElab  := SyntaxNode → CommandElabM Unit
+abbrev CommandElab  := Syntax → CommandElabM Unit
 
 def mkMessageAux (ctx : Context) (ref : Syntax) (msgData : MessageData) (severity : MessageSeverity) : Message :=
 mkMessageCore ctx.fileName ctx.fileMap msgData severity (ref.getPos.getD ctx.cmdPos)
@@ -55,7 +57,7 @@ private def ioErrorToMessage (ctx : Context) (ref : Syntax) (err : IO.Error) : M
 mkMessageAux ctx ref (toString err) MessageSeverity.error
 
 @[inline] def liftIOCore {α} (ctx : Context) (ref : Syntax) (x : IO α) : EIO Exception α :=
-EIO.adaptExcept (ioErrorToMessage ctx ref) x
+EIO.adaptExcept (fun ex => Exception.error $ ioErrorToMessage ctx ref ex) x
 
 @[inline] def liftIO {α} (ref : Syntax) (x : IO α) : CommandElabM α :=
 fun ctx => liftIOCore ctx ref x
@@ -121,13 +123,7 @@ def throwError {α} (ref : Syntax) (msgData : MessageData) : CommandElabM α :=
 ref ← getBetterRef ref;
 msgData ← addMacroStack msgData;
 msg ← mkMessage msgData MessageSeverity.error ref;
-throw msg
-
-def throwUnexpectedSyntax {α} (ref : Syntax) (expectedMsg : Option String := none) : CommandElabM α := do
-refFmt ← prettyPrint ref;
-match expectedMsg with
-| none    => throwError ref ("unexpected syntax" ++ MessageData.nest 2 (Format.line ++ refFmt))
-| some ex => throwError ref ("unexpected syntax, expected '" ++ ex ++ "'" ++ MessageData.nest 2 (Format.line ++ refFmt))
+throw (Exception.error msg)
 
 protected def getCurrMacroScope : CommandElabM Nat := do
 ctx ← read;
@@ -184,16 +180,25 @@ def mkCommandElabAttribute : IO CommandElabAttribute :=
 mkElabAttribute CommandElab `commandElab `Lean.Parser.Command `Lean.Elab.Command.CommandElab "command" builtinCommandElabTable
 @[init mkCommandElabAttribute] constant commandElabAttribute : CommandElabAttribute := arbitrary _
 
+private def elabCommandUsing (stx : Syntax) : List CommandElab → CommandElabM Unit
+| []                => do
+  refFmt ← prettyPrint stx;
+  throwError stx ("unexpected syntax" ++ MessageData.nest 2 (Format.line ++ refFmt))
+| (elabFn::elabFns) => catch (elabFn stx)
+  (fun ex => match ex with
+    | Exception.error _           => throw ex
+    | Exception.unsupportedSyntax => elabCommandUsing elabFns)
+
 def elabCommand (stx : Syntax) : CommandElabM Unit :=
-stx.ifNode
-  (fun n => do
-    s ← get;
-    let table := (commandElabAttribute.ext.getState s.env).table;
-    let k := n.getKind;
-    match table.find? k with
-    | some elab => elab n
-    | none      => throwError stx ("command '" ++ toString k ++ "' has not been implemented"))
-  (fun _ => throwError stx ("unexpected command"))
+match stx with
+| Syntax.node _ _ => do
+  s ← get;
+  let table := (commandElabAttribute.ext.getState s.env).table;
+  let k := stx.getKind;
+  match table.find? k with
+  | some elabFns => elabCommandUsing stx elabFns
+  | none         => throwError stx ("command '" ++ toString k ++ "' has not been implemented")
+| _ => throwError stx "unexpected command"
 
 /- Elaborate `x` with `stx` on the macro stack -/
 @[inline] def withMacroExpansion {α} (stx : Syntax) (x : CommandElabM α) : CommandElabM α :=
@@ -201,8 +206,8 @@ adaptReader (fun (ctx : Context) => { macroStack := stx :: ctx.macroStack, .. ct
 
 /-- Adapt a syntax transformation to a regular, command-producing elaborator. -/
 def adaptExpander (exp : Syntax → CommandElabM Syntax) : CommandElab :=
-fun stx => withMacroExpansion stx.val $ do
-  stx ← exp stx.val;
+fun stx => withMacroExpansion stx $ do
+  stx ← exp stx;
   elabCommand stx
 
 private def mkTermContext (ctx : Context) (s : State) (declName? : Option Name) : Term.Context :=
@@ -228,9 +233,10 @@ s.scopes.head!.varDecls
 
 private def toCommandResult {α} (ctx : Context) (s : State) (result : EStateM.Result Term.Exception Term.State α) : EStateM.Result Exception State α :=
 match result with
-| EStateM.Result.ok a newS                            => EStateM.Result.ok a { env := newS.env, messages := newS.messages, nextMacroScope := newS.nextMacroScope, .. s }
-| EStateM.Result.error (Term.Exception.error ex) newS => EStateM.Result.error ex { env := newS.env, messages := newS.messages, nextMacroScope := newS.nextMacroScope, .. s }
-| EStateM.Result.error Term.Exception.postpone newS   => unreachable!
+| EStateM.Result.ok a newS => EStateM.Result.ok a { env := newS.env, messages := newS.messages, nextMacroScope := newS.nextMacroScope, .. s }
+| EStateM.Result.error (Term.Exception.ex ex) newS =>
+  EStateM.Result.error ex { env := newS.env, messages := newS.messages, nextMacroScope := newS.nextMacroScope, .. s }
+| EStateM.Result.error Term.Exception.postpone newS          => unreachable!
 
 instance CommandElabM.inhabited {α} : Inhabited (CommandElabM α) :=
 ⟨throw $ arbitrary _⟩
@@ -239,12 +245,14 @@ instance CommandElabM.inhabited {α} : Inhabited (CommandElabM α) :=
 ctx ← read;
 s ← get;
 match (Term.elabBinders (getVarDecls s) elab (mkTermContext ctx s declName?)).run (mkTermState s) with
-| EStateM.Result.ok a newS                            => do modify $ fun s => { env := newS.env, messages := newS.messages, .. s }; pure a
-| EStateM.Result.error (Term.Exception.error ex) newS => do modify $ fun s => { env := newS.env, messages := newS.messages, .. s }; throw ex
-| EStateM.Result.error Term.Exception.postpone newS   => unreachable!
+| EStateM.Result.ok a newS                          => do modify $ fun s => { env := newS.env, messages := newS.messages, .. s }; pure a
+| EStateM.Result.error (Term.Exception.ex ex) newS  => do modify $ fun s => { env := newS.env, messages := newS.messages, .. s }; throw ex
+| EStateM.Result.error Term.Exception.postpone newS => unreachable!
 
 @[inline] def withLogging (x : CommandElabM Unit) : CommandElabM Unit :=
-catch x (fun ex => do logMessage ex; pure ())
+catch x (fun ex => match ex with
+  | Exception.error ex          => do logMessage ex; pure ()
+  | Exception.unsupportedSyntax => unreachable!)
 
 @[inline] def catchExceptions (x : CommandElabM Unit) : CommandElabCoreM Empty Unit :=
 fun ctx => EIO.catchExceptions (withLogging x ctx) (fun _ => pure ())
@@ -276,15 +284,15 @@ private def addNamespace (ref : Syntax) (header : Name) : CommandElabM Unit :=
 addScopes ref "namespace" true header
 
 @[builtinCommandElab «namespace»] def elabNamespace : CommandElab :=
-fun stx => match_syntax stx.val with
-  | `(namespace $n) => addNamespace stx.val n.getId
-  | _               => throwUnexpectedSyntax stx.val "namespace"
+fun stx => match_syntax stx with
+  | `(namespace $n) => addNamespace stx n.getId
+  | _               => throw Exception.unsupportedSyntax
 
 @[builtinCommandElab «section»] def elabSection : CommandElab :=
-fun stx => match_syntax stx.val with
-  | `(section $header:ident) => addScopes stx.val "section" false header.getId
+fun stx => match_syntax stx with
+  | `(section $header:ident) => addScopes stx "section" false header.getId
   | `(section)               => do currNamespace ← getCurrNamespace; addScope "section" "" currNamespace
-  | _                        => throwUnexpectedSyntax stx.val "section"
+  | _                        => throw Exception.unsupportedSyntax
 
 def getScopes : CommandElabM (List Scope) := do
 s ← get; pure s.scopes
@@ -299,8 +307,8 @@ private def checkEndHeader : Name → List Scope → Bool
 | _,              _                             => false
 
 @[builtinCommandElab «end»] def elabEnd : CommandElab :=
-fun n => do
-  let header? := (n.getArg 1).getOptionalIdent?;
+fun stx => do
+  let header? := (stx.getArg 1).getOptionalIdent?;
   let endSize := match header? with
     | none   => 1
     | some n => n.getNumParts;
@@ -310,11 +318,11 @@ fun n => do
   else do {
     -- we keep "root" scope
     modify $ fun s => { scopes := s.scopes.drop (s.scopes.length - 1), .. s };
-    throwError n.val "invalid 'end', insufficient scopes"
+    throwError stx "invalid 'end', insufficient scopes"
   };
   match header? with
-  | none        => unless (checkAnonymousScope scopes) $ throwError n.val "invalid 'end', name is missing"
-  | some header => unless (checkEndHeader header scopes) $ throwError n.val "invalid 'end', name mismatch"
+  | none        => unless (checkAnonymousScope scopes) $ throwError stx "invalid 'end', name is missing"
+  | some header => unless (checkEndHeader header scopes) $ throwError stx "invalid 'end', name mismatch"
 
 @[inline] def withNamespace {α} (ref : Syntax) (ns : Name) (elab : CommandElabM α) : CommandElabM α := do
 addNamespace ref ns;
@@ -359,7 +367,7 @@ fun stx => do
   | Except.ok env   => setEnv env
   | Except.error ex => do
     opts ← getOptions;
-    throwError stx.val (ex.toMessageData opts)
+    throwError stx (ex.toMessageData opts)
 
 def getOpenDecls : CommandElabM (List OpenDecl) := do
 scope ← getScope; pure scope.openDecls
@@ -373,7 +381,7 @@ currNamespace ← getCurrNamespace;
 openDecls ← getOpenDecls;
 match Elab.resolveNamespace env currNamespace openDecls id with
 | some ns => pure ns
-| none    => throwErrorUsingCmdPos ("unknown namespace '" ++ toString id ++ "'")
+| none    => throw Exception.unsupportedSyntax
 
 @[builtinCommandElab «export»] def elabExport : CommandElab :=
 fun stx => do
@@ -381,7 +389,7 @@ fun stx => do
   let id  := stx.getIdAt 1;
   ns ← resolveNamespace id;
   currNamespace ← getCurrNamespace;
-  when (ns == currNamespace) $ throwError stx.val "invalid 'export', self export";
+  when (ns == currNamespace) $ throwError stx "invalid 'export', self export";
   env ← getEnv;
   let ids := (stx.getArg 3).getArgs;
   aliases ← ids.foldlM
@@ -493,20 +501,20 @@ fun stx => do
   runTermElabM none $ fun _ => do
     e    ← Term.elabTerm term none;
     Term.synthesizeSyntheticMVars false;
-    type ← Term.inferType stx.val e;
-    logInfo stx.val (e ++ " : " ++ type);
+    type ← Term.inferType stx e;
+    logInfo stx (e ++ " : " ++ type);
     pure ()
 
 @[builtinCommandElab «synth»] def elabSynth : CommandElab :=
 fun stx => do
-  let ref  := stx.val;
+  let ref  := stx;
   let term := stx.getArg 1;
   runTermElabM `_synth_cmd $ fun _ => do
     inst ← Term.elabTerm term none;
     Term.synthesizeSyntheticMVars false;
     inst ← Term.instantiateMVars ref inst;
     val  ← Term.liftMetaM ref $ Meta.synthInstance inst;
-    logInfo stx.val val;
+    logInfo stx val;
     pure ()
 
 def setOption (ref : Syntax) (optionName : Name) (val : DataValue) : CommandElabM Unit := do
@@ -517,7 +525,7 @@ modifyScope $ fun scope => { opts := scope.opts.insert optionName val, .. scope
 
 @[builtinCommandElab «set_option»] def elabSetOption : CommandElab :=
 fun stx => do
-  let ref        := stx.val;
+  let ref        := stx;
   let optionName := stx.getIdAt 1;
   let val        := stx.getArg 2;
   match val.isStrLit? with
diff --git a/stage0/src/Init/Lean/Elab/Declaration.lean b/stage0/src/Init/Lean/Elab/Declaration.lean
index 021c0c44a7..abf85a2bc7 100644
--- a/stage0/src/Init/Lean/Elab/Declaration.lean
+++ b/stage0/src/Init/Lean/Elab/Declaration.lean
@@ -153,7 +153,7 @@ fun stx => do
   else if declKind == `Lean.Parser.Command.structure then
     elabStructure modifiers decl
   else
-    throwError stx.val "unexpected declaration"
+    throwError stx "unexpected declaration"
 
 end Command
 end Elab
diff --git a/stage0/src/Init/Lean/Elab/Definition.lean b/stage0/src/Init/Lean/Elab/Definition.lean
index fab75a1d68..2cbfcc1814 100644
--- a/stage0/src/Init/Lean/Elab/Definition.lean
+++ b/stage0/src/Init/Lean/Elab/Definition.lean
@@ -123,7 +123,7 @@ if kind == `Lean.Parser.Command.declValSimple then
 else if kind == `Lean.Parser.Command.declValEqns then
   Term.throwError defVal "equations have not been implemented yet"
 else
-  Term.throwUnexpectedSyntax defVal "definition body"
+  Term.throwUnsupportedSyntax
 
 def elabDefLike (view : DefView) : CommandElabM Unit :=
 let ref := view.ref;
diff --git a/stage0/src/Init/Lean/Elab/Exception.lean b/stage0/src/Init/Lean/Elab/Exception.lean
index 3bcc81f81d..37654a4dd3 100644
--- a/stage0/src/Init/Lean/Elab/Exception.lean
+++ b/stage0/src/Init/Lean/Elab/Exception.lean
@@ -9,7 +9,16 @@ import Init.Lean.Meta
 namespace Lean
 namespace Elab
 
-abbrev Exception := Message
+inductive Exception
+| error             : Message → Exception
+| unsupportedSyntax : Exception
+
+instance Exception.inhabited : Inhabited Exception := ⟨Exception.error $ arbitrary _⟩
+
+instance Exception.hasToString : HasToString Exception :=
+⟨fun ex => match ex with
+ | Exception.error msg         => toString msg
+ | Exception.unsupportedSyntax => "unsupported syntax"⟩
 
 def mkMessageCore (fileName : String) (fileMap : FileMap) (msgData : MessageData) (severity : MessageSeverity) (pos : String.Pos) : Message :=
 let pos := fileMap.toPosition pos;
@@ -17,7 +26,7 @@ let pos := fileMap.toPosition pos;
 
 def mkExceptionCore (fileName : String) (fileMap : FileMap) (msgData : MessageData) (pos : String.Pos) : Exception :=
 let pos := fileMap.toPosition pos;
-{ fileName := fileName, pos := pos, data := msgData, severity := MessageSeverity.error }
+Exception.error { fileName := fileName, pos := pos, data := msgData, severity := MessageSeverity.error }
 
 end Elab
 end Lean
diff --git a/stage0/src/Init/Lean/Elab/Log.lean b/stage0/src/Init/Lean/Elab/Log.lean
index e536923f06..f6cbe1159d 100644
--- a/stage0/src/Init/Lean/Elab/Log.lean
+++ b/stage0/src/Init/Lean/Elab/Log.lean
@@ -68,12 +68,12 @@ def logInfo [MonadLog m] (stx : Syntax) (msgData : MessageData) : m Unit :=
 log stx MessageSeverity.information msgData
 
 def throwError {α} [MonadPosInfo m] [MonadExcept Exception m] (ref : Syntax) (msgData : MessageData) : m α := do
-msg ← mkMessage msgData MessageSeverity.error ref; throw msg
+msg ← mkMessage msgData MessageSeverity.error ref; throw (Exception.error msg)
 
 def throwErrorUsingCmdPos {α} [MonadPosInfo m] [MonadExcept Exception m] (msgData : MessageData) : m α := do
 cmdPos ← getCmdPos;
 msg ← mkMessageAt msgData MessageSeverity.error cmdPos;
-throw msg
+throw (Exception.error msg)
 
 end Elab
 end Lean
diff --git a/stage0/src/Init/Lean/Elab/Quotation.lean b/stage0/src/Init/Lean/Elab/Quotation.lean
index f498c6ff33..05074f950d 100644
--- a/stage0/src/Init/Lean/Elab/Quotation.lean
+++ b/stage0/src/Init/Lean/Elab/Quotation.lean
@@ -315,19 +315,19 @@ private def letBindRhss (cont : List Alt → TermElabM Syntax) : List Alt → Li
     stx ← withFreshMacroScope $ letBindRhss alts ((pats, rhs')::altsRev');
     `(let rhs := $rhs; $stx)
 
-def match_syntax.expand (stx : SyntaxNode) : TermElabM Syntax := do
+def match_syntax.expand (stx : Syntax) : TermElabM Syntax := do
 let discr := stx.getArg 1;
 let alts := stx.getArg 3;
 alts ← alts.getArgs.mapM $ fun alt => do {
   let pats := alt.getArg 1;
   pat ← if pats.getArgs.size == 1 then pure $ pats.getArg 0
-    else throwError stx.val "match_syntax: expected exactly one pattern per alternative";
+    else throwError stx "match_syntax: expected exactly one pattern per alternative";
   let pat := if pat.isOfKind `Lean.Parser.Term.stxQuot then pat.setArg 1 $ elimAntiquotChoices $ pat.getArg 1 else pat;
   let rhs := alt.getArg 3;
   pure ([pat], rhs)
 };
--- letBindRhss (compileStxMatch stx.val [discr]) alts.toList []
-compileStxMatch stx.val [discr] alts.toList
+-- letBindRhss (compileStxMatch stx [discr]) alts.toList []
+compileStxMatch stx [discr] alts.toList
 
 @[builtinTermElab «match_syntax»] def elabMatchSyntax : TermElab :=
 fun stx expectedType? => do
diff --git a/stage0/src/Init/Lean/Elab/Term.lean b/stage0/src/Init/Lean/Elab/Term.lean
index 108376f84e..c34aa18c84 100644
--- a/stage0/src/Init/Lean/Elab/Term.lean
+++ b/stage0/src/Init/Lean/Elab/Term.lean
@@ -61,12 +61,12 @@ instance State.inhabited : Inhabited State := ⟨{ env := arbitrary _ }⟩
 
   Remark: `Exception.postpone` is used only when `mayPostpone == true` in the `Context`. -/
 inductive Exception
-| error    : Elab.Exception → Exception
+| ex       : Elab.Exception → Exception
 | postpone : Exception
 
 instance Exception.inhabited : Inhabited Exception := ⟨Exception.postpone⟩
 instance Exception.hasToString : HasToString Exception :=
-⟨fun ex => match ex with | Exception.postpone => "postponed" | Exception.error ex => toString ex⟩
+⟨fun ex => match ex with | Exception.postpone => "postponed" | Exception.ex ex => toString ex⟩
 
 /-
   Term elaborator Monad. In principle, we could track statically which methods
@@ -74,12 +74,12 @@ instance Exception.hasToString : HasToString Exception :=
   `TermElabM`. This would be useful to ensure that `Exception.postpone` does not leak
   to `CommandElabM`, but we abandoned this design because it adds unnecessary complexity. -/
 abbrev TermElabM := ReaderT Context (EStateM Exception State)
-abbrev TermElab  := SyntaxNode → Option Expr → TermElabM Expr
+abbrev TermElab  := Syntax → Option Expr → TermElabM Expr
 
 instance TermElabM.inhabited {α} : Inhabited (TermElabM α) :=
 ⟨throw $ Exception.postpone⟩
 
-abbrev TermElabResult := EStateM.Result Elab.Exception State Expr
+abbrev TermElabResult := EStateM.Result Message State Expr
 instance TermElabResult.inhabited : Inhabited TermElabResult := ⟨EStateM.Result.ok (arbitrary _) (arbitrary _)⟩
 
 /--
@@ -89,17 +89,17 @@ instance TermElabResult.inhabited : Inhabited TermElabResult := ⟨EStateM.Resul
 @[inline] def observing (x : TermElabM Expr) : TermElabM TermElabResult :=
 fun ctx s =>
   match x ctx s with
-  | EStateM.Result.error Exception.postpone newS   => EStateM.Result.error Exception.postpone newS
-  | EStateM.Result.error (Exception.error ex) newS => EStateM.Result.ok (EStateM.Result.error ex newS) s
-  | EStateM.Result.ok e newS                       => EStateM.Result.ok (EStateM.Result.ok e newS) s
+  | EStateM.Result.error (Exception.ex (Elab.Exception.error errMsg)) newS => EStateM.Result.ok (EStateM.Result.error errMsg newS) s
+  | EStateM.Result.error ex newS                                           => EStateM.Result.error ex newS
+  | EStateM.Result.ok e newS                                               => EStateM.Result.ok (EStateM.Result.ok e newS) s
 
 /--
   Apply the result/exception and state captured with `observing`.
   We use this method to implement overloaded notation and symbols. -/
 def applyResult (result : TermElabResult) : TermElabM Expr :=
 match result with
-| EStateM.Result.ok e s     => do set s; pure e
-| EStateM.Result.error ex s => do set s; throw (Exception.error ex)
+| EStateM.Result.ok e s         => do set s; pure e
+| EStateM.Result.error errMsg s => do set s; throw (Exception.ex (Elab.Exception.error errMsg))
 
 def getEnv : TermElabM Environment := do s ← get; pure s.env
 def getMCtx : TermElabM MetavarContext := do s ← get; pure s.mctx
@@ -150,13 +150,10 @@ def throwError {α} (ref : Syntax) (msgData : MessageData) : TermElabM α := do
 ref ← getBetterRef ref;
 msgData ← addMacroStack msgData;
 msg ← mkMessage msgData MessageSeverity.error ref;
-throw (Exception.error msg)
+throw (Exception.ex (Elab.Exception.error msg))
 
-def throwUnexpectedSyntax {α} (ref : Syntax) (expectedMsg : Option String := none) : TermElabM α := do
-refFmt ← prettyPrint ref;
-match expectedMsg with
-| none    => throwError ref ("unexpected syntax" ++ MessageData.nest 2 (Format.line ++ refFmt))
-| some ex => throwError ref ("unexpected syntax, expected '" ++ ex ++ "'" ++ MessageData.nest 2 (Format.line ++ refFmt))
+def throwUnsupportedSyntax {α} : TermElabM α :=
+throw (Exception.ex Elab.Exception.unsupportedSyntax)
 
 protected def getCurrMacroScope : TermElabM MacroScope := do
 ctx ← read;
@@ -259,7 +256,7 @@ mkMessageCore ctx.fileName ctx.fileMap msgData severity (ref.getPos.getD ctx.cmd
 
 /-- Auxiliary function for `liftMetaM` -/
 private def fromMetaException (ctx : Context) (ref : Syntax) (ex : Meta.Exception) : Exception :=
-Exception.error $ mkMessageAux ctx ref ex.toMessageData MessageSeverity.error
+Exception.ex $ Elab.Exception.error $ mkMessageAux ctx ref ex.toMessageData MessageSeverity.error
 
 /-- Auxiliary function for `liftMetaM` -/
 private def fromMetaState (ref : Syntax) (ctx : Context) (s : State) (newS : Meta.State) (oldTraceState : TraceState) : State :=
@@ -310,7 +307,7 @@ def liftLevelM {α} (x : LevelElabM α) : TermElabM α :=
 fun ctx s =>
   match (x { .. ctx }).run { .. s } with
   | EStateM.Result.ok a newS     => EStateM.Result.ok a { mctx := newS.mctx, ngen := newS.ngen, .. s }
-  | EStateM.Result.error ex newS => EStateM.Result.error (Exception.error ex) s
+  | EStateM.Result.error ex newS => EStateM.Result.error (Exception.ex ex) s
 
 def elabLevel (stx : Syntax) : TermElabM Level :=
 liftLevelM $ Level.elabLevel stx
@@ -331,8 +328,10 @@ modify $ fun s => { syntheticMVars := { mvarId := mvarId, ref := ref, kind := ki
 @[inline] def withoutPostponing {α} (x : TermElabM α) : TermElabM α :=
 adaptReader (fun (ctx : Context) => { mayPostpone := false, .. ctx }) x
 
-@[inline] def withNode {α} (stx : Syntax) (x : SyntaxNode → TermElabM α) : TermElabM α :=
-stx.ifNode x (fun _ => throwError stx ("term elaborator failed, unexpected syntax: " ++ toString stx))
+@[inline] def withNode {α} (stx : Syntax) (x : Syntax → TermElabM α) : TermElabM α :=
+match stx with
+| Syntax.node _ _ => x stx
+| _               => throwError stx ("term elaborator failed, unexpected syntax: " ++ toString stx)
 
 /-- Creates syntax for `(` <ident> `:` <type> `)` -/
 def mkExplicitBinder (ident : Syntax) (type : Syntax) : Syntax :=
@@ -445,14 +444,14 @@ def expandCDot? : Syntax → TermElabM (Option Syntax)
     pure none
 | _ => pure none
 
-private def exceptionToSorry (ref : Syntax) (ex : Elab.Exception) (expectedType? : Option Expr) : TermElabM Expr := do
+private def exceptionToSorry (ref : Syntax) (errMsg : Message) (expectedType? : Option Expr) : TermElabM Expr := do
 expectedType : Expr ← match expectedType? with
   | none              => mkFreshTypeMVar ref
   | some expectedType => pure expectedType;
 u ← getLevel ref expectedType;
 -- TODO: should be `(sorryAx.{$u} $expectedType true) when we support antiquotations at that place
 let syntheticSorry := mkApp2 (mkConst `sorryAx [u]) expectedType (mkConst `Bool.true);
-unless ex.data.hasSyntheticSorry $ logMessage ex;
+unless errMsg.data.hasSyntheticSorry $ logMessage errMsg;
 pure syntheticSorry
 
 /-- If `mayPostpone == true`, throw `Expection.postpone`. -/
@@ -476,6 +475,39 @@ ctx ← read;
 registerSyntheticMVar stx mvar.mvarId! (SyntheticMVarKind.postponed ctx.macroStack);
 pure mvar
 
+/-
+  Helper function for `elabTerm` is tries the registered elaboration functions for `stxNode` kind until it finds one that supports the syntax or
+  an error is found. -/
+private def elabTermUsing (s : State) (stx : Syntax) (expectedType? : Option Expr) (errToSorry : Bool) (catchExPostpone : Bool)
+    : List TermElab → TermElabM Expr
+| []                => do
+  refFmt ← prettyPrint stx;
+  throwError stx ("unexpected syntax" ++ MessageData.nest 2 (Format.line ++ refFmt))
+| (elabFn::elabFns) => catch (elabFn stx expectedType?)
+  (fun ex => match ex with
+    | Exception.ex (Elab.Exception.error errMsg)    => if errToSorry then exceptionToSorry stx errMsg expectedType? else throw ex
+    | Exception.ex Elab.Exception.unsupportedSyntax => elabTermUsing elabFns
+    | Exception.postpone          =>
+      if catchExPostpone then do
+        /- If `elab` threw `Exception.postpone`, we reset any state modifications.
+           For example, we want to make sure pending synthetic metavariables created by `elab` before
+           it threw `Exception.postpone` are discarded.
+           Note that we are also discarding the messages created by `elab`.
+
+           For example, consider the expression.
+           `((f.x a1).x a2).x a3`
+           Now, suppose the elaboration of `f.x a1` produces an `Exception.postpone`.
+           Then, a new metavariable `?m` is created. Then, `?m.x a2` also throws `Exception.postpone`
+           because the type of `?m` is not yet known. Then another, metavariable `?n` is created, and
+          finally `?n.x a3` also throws `Exception.postpone`. If we did not restore the state, we would
+          keep "dead" metavariables `?m` and `?n` on the pending synthetic metavariable list. This is
+          wasteful because when we resume the elaboration of `((f.x a1).x a2).x a3`, we start it from scratch
+          and new metavariables are created for the nested functions. -/
+          set s;
+          postponeElabTerm stx expectedType?
+        else
+          throw ex)
+
 /--
   Main function for elaborating terms.
   It extracts the elaboration methods from the environment using the node kind.
@@ -496,32 +528,8 @@ withFreshMacroScope $ withNode stx $ fun node => do
   let table := (termElabAttribute.ext.getState s.env).table;
   let k := node.getKind;
   match table.find? k with
-  | some elab =>
-    catch
-      (elab node expectedType?)
-      (fun ex => match ex with
-        | Exception.error err => if errToSorry then exceptionToSorry stx err expectedType? else throw ex
-        | Exception.postpone =>
-          if catchExPostpone then do
-            /- If `elab` threw `Exception.postpone`, we reset any state modifications.
-               For example, we want to make sure pending synthetic metavariables created by `elab` before
-               it threw `Exception.postpone` are discarded.
-               Note that we are also discarding the messages created by `elab`.
-
-               For example, consider the expression.
-               `((f.x a1).x a2).x a3`
-               Now, suppose the elaboration of `f.x a1` produces an `Exception.postpone`.
-               Then, a new metavariable `?m` is created. Then, `?m.x a2` also throws `Exception.postpone`
-               because the type of `?m` is not yet known. Then another, metavariable `?n` is created, and
-               finally `?n.x a3` also throws `Exception.postpone`. If we did not restore the state, we would
-               keep "dead" metavariables `?m` and `?n` on the pending synthetic metavariable list. This is
-               wasteful because when we resume the elaboration of `((f.x a1).x a2).x a3`, we start it from scratch
-               and new metavariables are created for the nested functions. -/
-            set s;
-            postponeElabTerm stx expectedType?
-          else
-            throw ex)
-  | none      => throwError stx ("elaboration function for '" ++ toString k ++ "' has not been implemented")
+  | some elabFns => elabTermUsing s node expectedType? errToSorry catchExPostpone elabFns
+  | none         => throwError stx ("elaboration function for '" ++ toString k ++ "' has not been implemented")
 
 /-- Auxiliary function used to implement `synthesizeSyntheticMVars`. -/
 private def resumeElabTerm (stx : Syntax) (expectedType? : Option Expr) (errToSorry := true) : TermElabM Expr :=
@@ -529,8 +537,8 @@ elabTerm stx expectedType? false errToSorry
 
 /-- Adapt a syntax transformation to a regular, term-producing elaborator. -/
 def adaptExpander (exp : Syntax → TermElabM Syntax) : TermElab :=
-fun stx expectedType? => withMacroExpansion stx.val $ do
-  stx ← exp stx.val;
+fun stx expectedType? => withMacroExpansion stx $ do
+  stx ← exp stx;
   elabTerm stx expectedType?
 
 /--
@@ -594,8 +602,13 @@ withMVarContext mvarId $ do
       assignExprMVar mvarId result;
       pure true)
     (fun ex => match ex with
-      | Exception.postpone  => pure false
-      | Exception.error msg => if postponeOnError then do set s; pure false else do logMessage msg; pure true)
+      | Exception.postpone                            => pure false
+      | Exception.ex Elab.Exception.unsupportedSyntax => unreachable!
+      | Exception.ex (Elab.Exception.error msg)       =>
+        if postponeOnError then do
+          set s; pure false
+        else do
+          logMessage msg; pure true)
 
 /- Try to synthesize metavariable using type class resolution.
    This method assumes the local context and local instances of `instMVar` coincide
@@ -629,8 +642,8 @@ private def synthesizePendingInstMVar (ref : Syntax) (instMVar : MVarId) : TermE
 withMVarContext instMVar $ catch
   (synthesizeInstMVarCore ref instMVar)
   (fun ex => match ex with
-    | Exception.error ex => do logMessage ex; pure true
-    | Exception.postpone => unreachable!)
+    | Exception.ex (Elab.Exception.error errMsg) => do logMessage errMsg; pure true
+    | _ => unreachable!)
 
 /--
   Return `true` iff `mvarId` is assigned to a term whose the
@@ -749,19 +762,32 @@ synthesizeSyntheticMVarsAux mayPostpone ()
 
 /--
   If `expectedType?` is `some t`, then ensure `t` and `eType` are definitionally equal.
-  If they are not, then try coercions. -/
-def ensureHasType (ref : Syntax) (expectedType? : Option Expr) (eType : Expr) (e : Expr) : TermElabM Expr :=
+  If they are not, then try coercions.
+  Return `some e'` if successful, where `e'` may be different from `e` if coercions have been applied,
+  and `none` otherwise
+ -/
+def tryEnsureHasType? (ref : Syntax) (expectedType? : Option Expr) (eType : Expr) (e : Expr) : TermElabM (Option Expr) :=
 match expectedType? with
-| none              => pure e
+| none              => pure (some e)
 | some expectedType =>
   condM (isDefEq ref eType expectedType)
-    (pure e)
+    (pure (some e))
     -- TODO try `HasCoe`
-    (let msg : MessageData :=
-       "type mismatch" ++ indentExpr e
-       ++ Format.line ++ "has type" ++ indentExpr eType
-       ++ Format.line ++ "but it is expected to have type" ++ indentExpr expectedType;
-     throwError ref msg)
+    (pure none)
+
+/--
+  If `expectedType?` is `some t`, then ensure `t` and `eType` are definitionally equal.
+  If they are not, then try coercions. -/
+def ensureHasType (ref : Syntax) (expectedType? : Option Expr) (eType : Expr) (e : Expr) : TermElabM Expr := do
+e? ← tryEnsureHasType? ref expectedType? eType e;
+match e? with
+| some e => pure e
+| none   =>
+  let msg : MessageData :=
+    "type mismatch" ++ indentExpr e
+    ++ Format.line ++ "has type" ++ indentExpr eType
+    ++ Format.line ++ "but it is expected to have type" ++ indentExpr expectedType?.get!;
+  throwError ref msg
 
 def mkInstMVar (ref : Syntax) (type : Expr) : TermElabM Expr := do
 mvar ← mkFreshExprMVar ref type MetavarKind.synthetic;
@@ -784,7 +810,7 @@ fun _ _ => pure $ mkSort levelZero
 fun _ _ => pure $ mkSort levelOne
 
 @[builtinTermElab «hole»] def elabHole : TermElab :=
-fun stx expectedType? => mkFreshExprMVar stx.val expectedType?
+fun stx expectedType? => mkFreshExprMVar stx expectedType?
 
 /-- Main loop for `mkPairs`. -/
 private partial def mkPairsAux (elems : Array Syntax) : Nat → Syntax → TermElabM Syntax
@@ -817,7 +843,7 @@ match stx? with
 
 @[builtinTermElab paren] def elabParen : TermElab :=
 fun stx expectedType? =>
-  let ref := stx.val;
+  let ref := stx;
   match_syntax ref with
   | `(())           => pure $ Lean.mkConst `Unit.unit
   | `(($e : $type)) => do
@@ -828,8 +854,8 @@ fun stx expectedType? =>
   | `(($e))         => elabCDot e expectedType?
   | `(($e, $es*))   => do
     pairs ← mkPairs (#[e] ++ es.getEvenElems);
-    withMacroExpansion stx.val (elabTerm pairs expectedType?)
-  | _ => throwError stx.val "unexpected parentheses notation"
+    withMacroExpansion stx (elabTerm pairs expectedType?)
+  | _ => throwError stx "unexpected parentheses notation"
 
 @[builtinTermElab «listLit»] def elabListLit : TermElab :=
 fun stx expectedType? => do
@@ -843,11 +869,11 @@ fun stx expectedType? => do
 
 @[builtinTermElab «arrayLit»] def elabArrayLit : TermElab :=
 fun stx expectedType? => do
-  match_syntax stx.val with
+  match_syntax stx with
   | `(#[$args*]) => do
     newStx ← `(List.toArray [$args*]);
-    withMacroExpansion stx.val (elabTerm newStx expectedType?)
-  | _ => throwError stx.val "unexpected array literal syntax"
+    withMacroExpansion stx (elabTerm newStx expectedType?)
+  | _ => throwError stx "unexpected array literal syntax"
 
 private partial def resolveLocalNameAux (lctx : LocalContext) : Name → List String → Option (Expr × List String)
 | n, projs =>
@@ -918,20 +944,20 @@ match result? with
     process preresolved
 
 @[builtinTermElab cdot] def elabBadCDot : TermElab :=
-fun stx _ => throwError stx.val "invalid occurrence of `·` notation, it must be surrounded by parentheses (e.g. `(· + 1)`)"
+fun stx _ => throwError stx "invalid occurrence of `·` notation, it must be surrounded by parentheses (e.g. `(· + 1)`)"
 
 @[builtinTermElab str] def elabStr : TermElab :=
 fun stx _ => do
   match (stx.getArg 0).isStrLit? with
   | some val => pure $ mkStrLit val
-  | none     => throwError stx.val "ill-formed syntax"
+  | none     => throwError stx "ill-formed syntax"
 
 @[builtinTermElab num] def elabNum : TermElab :=
 fun stx expectedType? => do
-  let ref := stx.val;
+  let ref := stx;
   val ← match (stx.getArg 0).isNatLit? with
     | some val => pure (mkNatLit val)
-    | none     => throwError stx.val "ill-formed syntax";
+    | none     => throwError stx "ill-formed syntax";
   typeMVar ← mkFreshTypeMVar ref MetavarKind.synthetic;
   registerSyntheticMVar ref typeMVar.mvarId! (SyntheticMVarKind.withDefault (Lean.mkConst `Nat));
   match expectedType? with
@@ -946,7 +972,7 @@ fun stx expectedType? => do
 fun stx _ => do
   match (stx.getArg 0).isCharLit? with
   | some val => pure $ mkApp (Lean.mkConst `Char.ofNat) (mkNatLit val.toNat)
-  | none     => throwError stx.val "ill-formed syntax"
+  | none     => throwError stx "ill-formed syntax"
 
 end Term
 
diff --git a/stage0/src/Init/Lean/Elab/TermApp.lean b/stage0/src/Init/Lean/Elab/TermApp.lean
index 6cffc3475b..59d839787a 100644
--- a/stage0/src/Init/Lean/Elab/TermApp.lean
+++ b/stage0/src/Init/Lean/Elab/TermApp.lean
@@ -45,15 +45,21 @@ instMVars.forM $ fun mvarId =>
   unlessM (synthesizeInstMVarCore ref mvarId) $
     registerSyntheticMVar ref mvarId SyntheticMVarKind.typeClass
 
-private def elabArg (ref : Syntax) (arg : Arg) (expectedType : Expr) : TermElabM Expr :=
+private def ensureArgType (ref : Syntax) (f : Expr) (arg : Expr) (expectedType : Expr) : TermElabM Expr := do
+argType ← inferType ref arg;
+arg? ← tryEnsureHasType? ref expectedType argType arg;
+match arg? with
+| some arg => pure arg
+| none     => do
+  env ← getEnv; mctx ← getMCtx; lctx ← getLCtx; opts ← getOptions;
+  throwError ref $ Meta.Exception.mkAppTypeMismatchMessage f arg { env := env, mctx := mctx, lctx := lctx, opts := opts }
+
+private def elabArg (ref : Syntax) (f : Expr) (arg : Arg) (expectedType : Expr) : TermElabM Expr :=
 match arg with
-| Arg.expr val => do
-  valType ← inferType ref val;
-  ensureHasType ref expectedType valType val
+| Arg.expr val => ensureArgType ref f val expectedType
 | Arg.stx val  => do
   val ← elabTerm val expectedType;
-  valType ← inferType ref val;
-  ensureHasType ref expectedType valType val
+  ensureArgType ref f val expectedType
 
 private partial def elabAppArgsAux (ref : Syntax) (args : Array Arg) (expectedType? : Option Expr) (explicit : Bool)
     : Nat → Array NamedArg → Array MVarId → Expr → Expr → TermElabM Expr
@@ -71,12 +77,12 @@ private partial def elabAppArgsAux (ref : Syntax) (args : Array Arg) (expectedTy
     | some idx => do
       let arg := namedArgs.get! idx;
       let namedArgs := namedArgs.eraseIdx idx;
-      argElab ← elabArg ref arg.val d;
+      argElab ← elabArg ref e arg.val d;
       elabAppArgsAux argIdx namedArgs instMVars (b.instantiate1 argElab) (mkApp e argElab)
     | none =>
       let processExplictArg : Unit → TermElabM Expr := fun _ => do {
         if h : argIdx < args.size then do
-          argElab ← elabArg ref (args.get ⟨argIdx, h⟩) d;
+          argElab ← elabArg ref e (args.get ⟨argIdx, h⟩) d;
           elabAppArgsAux (argIdx + 1) namedArgs instMVars (b.instantiate1 argElab) (mkApp e argElab)
         else match d.getOptParamDefault? with
           | some defVal => elabAppArgsAux argIdx namedArgs instMVars (b.instantiate1 defVal) (mkApp e defVal)
@@ -183,22 +189,23 @@ match eType.getAppFn, lval with
 | _, _ =>
   throwLValError ref e eType "invalid field notation, type is not of the form (C ...) where C is a constant"
 
-private partial def resolveLValLoop (ref : Syntax) (e : Expr) (lval : LVal) : Expr → Array Elab.Exception → TermElabM LValResolution
+private partial def resolveLValLoop (ref : Syntax) (e : Expr) (lval : LVal) : Expr → Array Message → TermElabM LValResolution
 | eType, previousExceptions => do
   eType ← whnfCore ref eType;
   tryPostponeIfMVar eType;
   catch (resolveLValAux ref e eType lval)
     (fun ex =>
       match ex with
-      | Exception.postpone => throw ex
-      | Exception.error ex => do
+      | Exception.postpone                            => throw ex
+      | Exception.ex Elab.Exception.unsupportedSyntax => throw ex
+      | Exception.ex (Elab.Exception.error errMsg)    => do
         eType? ← unfoldDefinition? ref eType;
         match eType? with
-        | some eType => resolveLValLoop eType (previousExceptions.push ex)
+        | some eType => resolveLValLoop eType (previousExceptions.push errMsg)
         | none       => do
           previousExceptions.forM $ fun ex =>
-            logMessage ex;
-          throw (Exception.error ex))
+            logMessage errMsg;
+          throw (Exception.ex (Elab.Exception.error errMsg)))
 
 private def resolveLVal (ref : Syntax) (e : Expr) (lval : LVal) : TermElabM LValResolution := do
 eType ← inferType ref e;
@@ -325,7 +332,7 @@ private partial def elabAppFn (ref : Syntax) : Syntax → List LVal → Array Na
           s ← observing $ elabAppLVals ref f (lvals' ++ lvals) namedArgs args expectedType? explicit;
           pure $ acc.push s)
         acc
-    | _ => throwUnexpectedSyntax id "identifier"
+    | _ => throwUnsupportedSyntax
   | _ => do
     f ← elabTerm f none;
     s ← observing $ elabAppLVals ref f lvals namedArgs args expectedType? explicit;
@@ -347,8 +354,8 @@ else
 private def mergeFailures {α} (failures : Array TermElabResult) (stx : Syntax) : TermElabM α := do
 msgs ← failures.mapM $ fun failure =>
   match failure with
-  | EStateM.Result.ok _ _     => unreachable!
-  | EStateM.Result.error ex s => toMessageData ex stx;
+  | EStateM.Result.ok _ _         => unreachable!
+  | EStateM.Result.error errMsg s => toMessageData errMsg stx;
 throwError stx ("overloaded, errors " ++ MessageData.ofArray msgs)
 
 private def elabAppAux (ref : Syntax) (f : Syntax) (namedArgs : Array NamedArg) (args : Array Arg) (expectedType? : Option Expr) : TermElabM Expr := do
@@ -388,8 +395,8 @@ private partial def expandApp : Syntax → TermElabM (Syntax × Array NamedArg 
 
 @[builtinTermElab app] def elabApp : TermElab :=
 fun stx expectedType? => do
-  (f, namedArgs, args) ← expandApp stx.val;
-  elabAppAux stx.val f namedArgs args expectedType?
+  (f, namedArgs, args) ← expandApp stx;
+  elabAppAux stx f namedArgs args expectedType?
 
 @[builtinTermElab «id»] def elabId : TermElab := elabApp
 @[builtinTermElab explicit] def elabExplicit : TermElab := elabApp
diff --git a/stage0/src/Init/Lean/Elab/TermBinders.lean b/stage0/src/Init/Lean/Elab/TermBinders.lean
index c6bdc543f2..ebb38fd52f 100644
--- a/stage0/src/Init/Lean/Elab/TermBinders.lean
+++ b/stage0/src/Init/Lean/Elab/TermBinders.lean
@@ -36,6 +36,25 @@ else
 structure BinderView :=
 (id : Syntax) (type : Syntax) (bi : BinderInfo)
 
+
+/-
+Expand `optional (binderDefault <|> binderTactic)`
+def binderDefault := parser! " := " >> termParser
+def binderTactic  := parser! " . " >> termParser
+-/
+private def expandBinderModifier (type : Syntax) (optBinderModifier : Syntax) : TermElabM Syntax :=
+if optBinderModifier.isNone then pure type
+else
+  let modifier := optBinderModifier.getArg 0;
+  let kind     := modifier.getKind;
+  if kind == `Lean.Parser.Term.binderDefault then do
+    let defaultVal := modifier.getArg 1;
+    `(optParam $type $defaultVal)
+  else if kind == `Lean.Parser.Term.binderTactic then do
+    throwError modifier "not implemented yet"
+  else
+    throwUnsupportedSyntax
+
 private def matchBinder (stx : Syntax) : TermElabM (Array BinderView) :=
 withNode stx $ fun node => do
   let k := node.getKind;
@@ -44,11 +63,12 @@ withNode stx $ fun node => do
     let ids  := (node.getArg 0).getArgs;
     let type := mkHole stx;
     ids.mapM $ fun id => do id ← expandBinderIdent id; pure { id := id, type := type, bi := BinderInfo.default }
-  else if k == `Lean.Parser.Term.explicitBinder then
+  else if k == `Lean.Parser.Term.explicitBinder then do
     -- `(` binderIdent+ binderType (binderDefault <|> binderTactic)? `)`
-    let ids  := (node.getArg 1).getArgs;
-    let type := expandBinderType (node.getArg 2);
-    -- TODO handle `binderDefault` and `binderTactic`
+    let ids         := (node.getArg 1).getArgs;
+    let type        := expandBinderType (node.getArg 2);
+    let optModifier := node.getArg 3;
+    type ← expandBinderModifier type optModifier;
     ids.mapM $ fun id => do id ← expandBinderIdent id; pure { id := id, type := type, bi := BinderInfo.default }
   else if k == `Lean.Parser.Term.implicitBinder then
     -- `{` binderIdent+ binderType `}`
@@ -118,17 +138,17 @@ else do
 elabBinders #[binder] (fun fvars => x (fvars.get! 1))
 
 @[builtinTermElab «forall»] def elabForall : TermElab :=
-fun stx _ => match_syntax stx.val with
+fun stx _ => match_syntax stx with
 | `(forall $binders*, $term) =>
   elabBinders binders $ fun xs => do
     e ← elabType term;
-    mkForall stx.val xs e
-| _ => throwUnexpectedSyntax stx.val "forall"
+    mkForall stx xs e
+| _ => throwUnsupportedSyntax
 
 @[builtinTermElab arrow] def elabArrow : TermElab :=
 adaptExpander $ fun stx => match_syntax stx with
 | `($dom:term -> $rng) => `(forall (a : $dom), $rng)
-| _                    => throwUnexpectedSyntax stx "->"
+| _                    => throwUnsupportedSyntax
 
 @[builtinTermElab depArrow] def elabDepArrow : TermElab :=
 fun stx _ =>
@@ -137,7 +157,7 @@ fun stx _ =>
   let term   := stx.getArg 2;
   elabBinders #[binder] $ fun xs => do
     e ← elabType term;
-    mkForall stx.val xs e
+    mkForall stx xs e
 
 /-- Main loop `getFunBinderIds?` -/
 private partial def getFunBinderIdsAux? : Bool → Syntax → Array Syntax → TermElabM (Option (Array Syntax))
@@ -231,7 +251,7 @@ fun stx expectedType? => do
   elabBinders binders $ fun xs => do
     -- TODO: expected type
     e ← elabTerm body none;
-    mkLambda stx.val xs e
+    mkLambda stx xs e
 
 def withLetDecl {α} (ref : Syntax) (n : Name) (type : Expr) (val : Expr) (k : Expr → TermElabM α) : TermElabM α := do
 fvarId ← mkFreshFVarId;
@@ -284,7 +304,7 @@ throwError decl "not implemented yet"
 @[builtinTermElab «let»] def elabLet : TermElab :=
 fun stx expectedType? => do
   -- `let` decl `;` body
-  let ref      := stx.val;
+  let ref      := stx;
   let decl     := stx.getArg 1;
   let body     := stx.getArg 3;
   let declKind := decl.getKind;
diff --git a/stage0/src/Init/Lean/Elab/Util.lean b/stage0/src/Init/Lean/Elab/Util.lean
index 661004f48b..910238afa6 100644
--- a/stage0/src/Init/Lean/Elab/Util.lean
+++ b/stage0/src/Init/Lean/Elab/Util.lean
@@ -37,7 +37,12 @@ structure ElabAttributeOLeanEntry :=
 structure ElabAttributeEntry (γ : Type) extends ElabAttributeOLeanEntry :=
 (elabFn   : γ)
 
-abbrev ElabFnTable (γ : Type) := SMap SyntaxNodeKind γ
+abbrev ElabFnTable (γ : Type) := SMap SyntaxNodeKind (List γ)
+
+def ElabFnTable.insert {γ} (table : ElabFnTable γ) (k : SyntaxNodeKind) (f : γ) : ElabFnTable γ :=
+match table.find? k with
+| some fs => table.insert k (f::fs)
+| none    => table.insert k [f]
 
 structure ElabAttributeExtensionState (γ : Type) :=
 (newEntries : List ElabAttributeOLeanEntry := [])
@@ -75,8 +80,8 @@ match env.find? constName with
 @[implementedBy mkElabFnOfConstantUnsafe]
 constant mkElabFnOfConstant (γ : Type) (env : Environment) (typeName : Name) (constName : Name) : ExceptT String Id γ := throw ""
 
-private def ElabAttribute.addImportedParsers {γ} (typeName : Name) (builtinTableRef : IO.Ref (ElabFnTable γ)) (env : Environment) (es : Array (Array ElabAttributeOLeanEntry))
-    : IO (ElabAttributeExtensionState γ) := do
+private def ElabAttribute.addImportedParsers {γ} (typeName : Name) (builtinTableRef : IO.Ref (ElabFnTable γ))
+    (env : Environment) (es : Array (Array ElabAttributeOLeanEntry)) : IO (ElabAttributeExtensionState γ) := do
 table ← builtinTableRef.get;
 table ← es.foldlM
   (fun table entries =>
diff --git a/stage0/src/Init/Lean/HeadIndex.lean b/stage0/src/Init/Lean/HeadIndex.lean
new file mode 100644
index 0000000000..173acb64a4
--- /dev/null
+++ b/stage0/src/Init/Lean/HeadIndex.lean
@@ -0,0 +1,84 @@
+/-
+Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Author: Leonardo de Moura
+-/
+prelude
+import Init.Lean.Expr
+
+namespace Lean
+
+inductive HeadIndex
+| fvar (fvarId : FVarId)
+| mvar (mvarId : MVarId)
+| const (constName : Name)
+| proj (structName : Name) (idx : Nat)
+| lit (litVal : Literal)
+| sort
+| lam
+| forallE
+
+namespace HeadIndex
+
+instance : Inhabited HeadIndex := ⟨sort⟩
+
+def HeadIndex.hash : HeadIndex → USize
+| fvar fvarId         => mixHash 11 $ hash fvarId
+| mvar mvarId         => mixHash 13 $ hash mvarId
+| const constName     => mixHash 17 $ hash constName
+| proj structName idx => mixHash 19 $ mixHash (hash structName) (hash idx)
+| lit litVal          => mixHash 23 $ hash litVal
+| sort                => 29
+| lam                 => 31
+| forallE             => 37
+
+instance : Hashable HeadIndex := ⟨HeadIndex.hash⟩
+
+def HeadIndex.beq : HeadIndex → HeadIndex → Bool
+| fvar id₁,   fvar id₂   => id₁ == id₂
+| mvar id₁,   mvar id₂   => id₁ == id₂
+| const id₁,  const id₂  => id₁ == id₂
+| proj s₁ i₁, proj s₂ i₂ => s₁ == s₂ && i₁ == i₂
+| lit v₁,     lit v₂     => v₁ == v₂
+| sort,       sort       => true
+| lam,        lam        => true
+| forallE,    forallE    => true
+| _,          _          => false
+
+instance : HasBeq HeadIndex := ⟨HeadIndex.beq⟩
+
+end HeadIndex
+
+namespace Expr
+
+def head : Expr → Expr
+| app f _ _      => head f
+| letE _ _ _ b _ => head b
+| mdata _ e _    => head e
+| e              => e
+
+private def headNumArgsAux : Expr → Nat → Nat
+| app f _ _, n      => headNumArgsAux f (n + 1)
+| letE _ _ _ b _, n => headNumArgsAux b n
+| mdata _ e _, n    => headNumArgsAux e n
+| _, n              => n
+
+def headNumArgs (e : Expr) : Nat :=
+headNumArgsAux e 0
+
+def toHeadIndex : Expr → HeadIndex
+| mvar mvarId _           => HeadIndex.mvar mvarId
+| fvar fvarId _           => HeadIndex.fvar fvarId
+| const constName _ _     => HeadIndex.const constName
+| proj structName idx _ _ => HeadIndex.proj structName idx
+| sort _ _                => HeadIndex.sort
+| lam _ _ _ _             => HeadIndex.lam
+| forallE _ _ _ _         => HeadIndex.forallE
+| lit v _                 => HeadIndex.lit v
+| app f _ _               => toHeadIndex f
+| letE _ _ _ b _          => toHeadIndex b
+| mdata _ e _             => toHeadIndex e
+| _                       => panic! "unexpected expression kind"
+
+end Expr
+end Lean
diff --git a/stage0/src/Init/Lean/Linter.lean b/stage0/src/Init/Lean/Linter.lean
index e2535572ca..2a1c51e64e 100644
--- a/stage0/src/Init/Lean/Linter.lean
+++ b/stage0/src/Init/Lean/Linter.lean
@@ -7,7 +7,7 @@ prelude
 import Init.System.IO
 import Init.Lean.Attributes
 import Init.Lean.Syntax
-import Init.Lean.Util.Message
+import Init.Lean.Message
 
 namespace Lean
 
diff --git a/stage0/src/Init/Lean/Util/Message.lean b/stage0/src/Init/Lean/Message.lean
similarity index 100%
rename from stage0/src/Init/Lean/Util/Message.lean
rename to stage0/src/Init/Lean/Message.lean
diff --git a/stage0/src/Init/Lean/Meta.lean b/stage0/src/Init/Lean/Meta.lean
index c16a7731a6..2d7e6c5059 100644
--- a/stage0/src/Init/Lean/Meta.lean
+++ b/stage0/src/Init/Lean/Meta.lean
@@ -18,6 +18,7 @@ import Init.Lean.Meta.SynthInstance
 import Init.Lean.Meta.AppBuilder
 import Init.Lean.Meta.Tactic
 import Init.Lean.Meta.Message
+import Init.Lean.Meta.KAbstract
 
 namespace Lean
 export Meta (MetaM)
diff --git a/stage0/src/Init/Lean/Meta/Basic.lean b/stage0/src/Init/Lean/Meta/Basic.lean
index ef4f33ffad..6ec524f3ee 100644
--- a/stage0/src/Init/Lean/Meta/Basic.lean
+++ b/stage0/src/Init/Lean/Meta/Basic.lean
@@ -251,7 +251,7 @@ ctx ← read; pure $ ctx.config.transparency == TransparencyMode.reducible
 @[inline] def getTransparency : MetaM TransparencyMode := do
 ctx ← read; pure $ ctx.config.transparency
 
-@[inline] private def getOptions : MetaM Options := do
+@[inline] def getOptions : MetaM Options := do
 ctx ← read; pure ctx.config.opts
 
 -- Remark: wanted to use `private`, but in C++ parser, `private` declarations do not shadow outer public ones.
diff --git a/stage0/src/Init/Lean/Meta/DiscrTree.lean b/stage0/src/Init/Lean/Meta/DiscrTree.lean
index f7e2a11f30..96f47a7762 100644
--- a/stage0/src/Init/Lean/Meta/DiscrTree.lean
+++ b/stage0/src/Init/Lean/Meta/DiscrTree.lean
@@ -42,7 +42,7 @@ namespace DiscrTree
   That is, we don't reduce `HasAdd.add Nat Nat.HasAdd a b` into `Nat.add a b`.
   We say the `HasAdd.add` applications are the de-facto canonical forms in
   the metaprogramming framework.
-  Moreover, it is the metaprammer resposability to re-pack applications such as
+  Moreover, it is the metaprogrammer's responsibility to re-pack applications such as
   `Nat.add a b` into `HasAdd.add Nat Nat.hasAdd a b`.
 
   Remark: we store the arity in the keys
diff --git a/stage0/src/Init/Lean/Meta/Exception.lean b/stage0/src/Init/Lean/Meta/Exception.lean
index bc739fe88b..09c3a158ad 100644
--- a/stage0/src/Init/Lean/Meta/Exception.lean
+++ b/stage0/src/Init/Lean/Meta/Exception.lean
@@ -6,7 +6,7 @@ Authors: Leonardo de Moura
 prelude
 import Init.Lean.Environment
 import Init.Lean.MetavarContext
-import Init.Lean.Util.Message
+import Init.Lean.Message
 
 namespace Lean
 namespace Meta
diff --git a/stage0/src/Init/Lean/Meta/KAbstract.lean b/stage0/src/Init/Lean/Meta/KAbstract.lean
new file mode 100644
index 0000000000..cff69caae1
--- /dev/null
+++ b/stage0/src/Init/Lean/Meta/KAbstract.lean
@@ -0,0 +1,42 @@
+/-
+Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Author: Leonardo de Moura
+-/
+prelude
+import Init.Lean.Data.Occurrences
+import Init.Lean.HeadIndex
+import Init.Lean.Meta.ExprDefEq
+
+namespace Lean
+namespace Meta
+
+private partial def kabstractAux (occs : Occurrences) (p : Expr) (pHeadIdx : HeadIndex) (pNumArgs : Nat) : Expr → Nat → StateT Nat MetaM Expr
+| e, offset =>
+  let visitChildren : Unit → StateT Nat MetaM Expr := fun _ =>
+    match e with
+    | Expr.app f a _       => do f ← kabstractAux f offset; a ← kabstractAux a offset; pure $ e.updateApp! f a
+    | Expr.mdata _ b _     => do b ← kabstractAux b offset; pure $ e.updateMData! b
+    | Expr.proj _ _ b _    => do b ← kabstractAux b offset; pure $ e.updateProj! b
+    | Expr.letE _ t v b _  => do t ← kabstractAux t offset; v ← kabstractAux v offset; b ← kabstractAux b (offset+1); pure $ e.updateLet! t v b
+    | Expr.lam _ d b _     => do d ← kabstractAux d offset; b ← kabstractAux b (offset+1); pure $ e.updateLambdaE! d b
+    | Expr.forallE _ d b _ => do d ← kabstractAux d offset; b ← kabstractAux b (offset+1); pure $ e.updateForallE! d b
+    | e                    => pure e;
+  if e.hasLooseBVars then visitChildren ()
+  else if e.toHeadIndex == pHeadIdx && e.headNumArgs == pNumArgs then
+    condM (liftM $ isDefEq e p)
+      (do i ← get;
+          set (i+1);
+          if occs.contains i then
+            pure (mkBVar offset)
+          else
+            visitChildren ())
+      (visitChildren ())
+  else
+    visitChildren ()
+
+def kabstract (e : Expr) (p : Expr) (occs : Occurrences := Occurrences.all) : MetaM Expr :=
+(kabstractAux occs p p.toHeadIndex p.headNumArgs e 0).run' 1
+
+end Meta
+end Lean
diff --git a/stage0/src/Init/Lean/Meta/Offset.lean b/stage0/src/Init/Lean/Meta/Offset.lean
index 7d5b539053..29f96ca65b 100644
--- a/stage0/src/Init/Lean/Meta/Offset.lean
+++ b/stage0/src/Init/Lean/Meta/Offset.lean
@@ -51,31 +51,29 @@ partial def evalNat : Expr → Option Nat
 | _ => none
 
 /- Quick function for converting `e` into `s + k` s.t. `e` is definitionally equal to `Nat.add s k`. -/
-private partial def getOffset : Expr → Expr × Nat
-| e@(Expr.app _ a _) =>
+private partial def getOffsetAux : Expr → Bool → Option (Expr × Nat)
+| e@(Expr.app _ a _), top =>
   let fn := e.getAppFn;
   match fn with
   | Expr.const c _ _ =>
     let nargs := e.getAppNumArgs;
-    if c == `Nat.succ && nargs == 1 then
-      let (s, k) := getOffset a;
-      (s, k+1)
-    else if c == `Nat.add && nargs == 2 then
-      match evalNat (e.getArg! 1) with
-      | none   => (e, 0)
-      | some v =>
-        let (s, k) := getOffset (e.getArg! 0);
-        (s, k+v)
-    else if c == `HasAdd.add && nargs == 4 then
-      match evalNat (e.getArg! 3) with
-      | none   => (e, 0)
-      | some v =>
-        let (s, k) := getOffset (e.getArg! 0);
-        (s, k+v)
-    else
-       (e, 0)
-  | _ => (e, 0)
-| e => (e, 0)
+    if c == `Nat.succ && nargs == 1 then do
+      (s, k) ← getOffsetAux a false;
+      pure (s, k+1)
+    else if c == `Nat.add && nargs == 2 then do
+      v      ← evalNat (e.getArg! 1);
+      (s, k) ← getOffsetAux (e.getArg! 0) false;
+      pure (s, k+v)
+    else if c == `HasAdd.add && nargs == 4 then do
+      v      ← evalNat (e.getArg! 3);
+      (s, k) ← getOffsetAux (e.getArg! 2) false;
+      pure (s, k+v)
+    else if top then none else pure (e, 0)
+  | _ => if top then none else pure (e, 0)
+| e, top => if top then none else pure (e, 0)
+
+private def getOffset (e : Expr) : Option (Expr × Nat) :=
+getOffsetAux e true
 
 private partial def isOffset : Expr → Option (Expr × Nat)
 | e@(Expr.app _ a _) =>
@@ -84,7 +82,7 @@ private partial def isOffset : Expr → Option (Expr × Nat)
   | Expr.const c _ _ =>
     let nargs := e.getAppNumArgs;
     if (c == `Nat.succ && nargs == 1) || (c == `Nat.add && nargs == 2) || (c == `HasAdd.add && nargs == 4) then
-      some (getOffset e)
+      getOffset e
     else none
   | _ => none
 | _ => none
diff --git a/stage0/src/Init/Lean/Meta/SynthInstance.lean b/stage0/src/Init/Lean/Meta/SynthInstance.lean
index 1a45d9750f..8d7b92926c 100644
--- a/stage0/src/Init/Lean/Meta/SynthInstance.lean
+++ b/stage0/src/Init/Lean/Meta/SynthInstance.lean
@@ -324,7 +324,7 @@ def wakeUp (answer : Answer) : Waiter → SynthM Unit
 
 def isNewAnswer (oldAnswers : Array Answer) (answer : Answer) : Bool :=
 oldAnswers.all $ fun oldAnswer => do
-  -- Remark: isDefEq here is too expensive. TODO: if `==` is to imprecise, add some light normalization to `resultType` at `addAnswer`
+  -- Remark: isDefEq here is too expensive. TODO: if `==` is too imprecise, add some light normalization to `resultType` at `addAnswer`
   -- iseq ← isDefEq oldAnswer.resultType answer.resultType; pure (!iseq)
   oldAnswer.resultType != answer.resultType
 
@@ -421,15 +421,16 @@ else pure false
 def getResult : SynthM (Option Expr) := do
 s ← get; pure s.result
 
-partial def synth : Nat → SynthM (Option Expr)
+def synth : Nat → SynthM (Option Expr)
 | 0   => do
   trace! `Meta.synthInstance "synthInstance is out of fuel";
   pure none
-| n+1 => do
+| fuel+1 => do
+  trace! `Meta.synthInstance ("remaining fuel " ++ toString fuel);
   condM step
     (do result? ← getResult;
         match result? with
-        | none        => synth n
+        | none        => synth fuel
         | some result => pure result)
     (do trace! `Meta.synthInstance "failed";
         pure none)
@@ -511,7 +512,16 @@ forallTelescope type $ fun xs typeBody =>
         pure type
   | _ => pure type
 
-def synthInstance? (type : Expr) (fuel : Nat := 10000) : MetaM (Option Expr) := do
+
+@[init] def maxStepsOption : IO Unit :=
+registerOption `synthInstance.maxSteps { defValue := (10000 : Nat), group := "", descr := "maximum steps for the type class instance synthesis procedure" }
+
+private def getMaxSteps (opts : Options) : Nat :=
+opts.getNat `synthInstance.maxSteps 10000
+
+def synthInstance? (type : Expr) : MetaM (Option Expr) := do
+opts ← getOptions;
+let fuel := getMaxSteps opts;
 inputConfig ← getConfig;
 withConfig (fun config => { transparency := TransparencyMode.reducible, foApprox := true, ctxApprox := true, .. config }) $ do
   type ← instantiateMVars type;
@@ -543,17 +553,17 @@ withConfig (fun config => { transparency := TransparencyMode.reducible, foApprox
 /--
   Return `LOption.some r` if succeeded, `LOption.none` if it failed, and `LOption.undef` if
   instance cannot be synthesized right now because `type` contains metavariables. -/
-def trySynthInstance (type : Expr) (fuel : Nat := 10000) : MetaM (LOption Expr) :=
+def trySynthInstance (type : Expr) : MetaM (LOption Expr) :=
 adaptReader (fun (ctx : Context) => { config := { isDefEqStuckEx := true, .. ctx.config }, .. ctx }) $
   catch
-    (toLOptionM $ synthInstance? type fuel)
+    (toLOptionM $ synthInstance? type)
     (fun ex => match ex with
       | Exception.isExprDefEqStuck _ _ _  => pure LOption.undef
       | Exception.isLevelDefEqStuck _ _ _ => pure LOption.undef
       | _                                 => throw ex)
 
-def synthInstance (type : Expr) (fuel : Nat := 10000) : MetaM Expr := do
-result? ← synthInstance? type fuel;
+def synthInstance (type : Expr) : MetaM Expr := do
+result? ← synthInstance? type;
 match result? with
 | some result => pure result
 | none        => throwEx $ Exception.synthInstance type
diff --git a/stage0/src/Init/Lean/Parser/Module.lean b/stage0/src/Init/Lean/Parser/Module.lean
index f958cc8302..fda6197cf1 100644
--- a/stage0/src/Init/Lean/Parser/Module.lean
+++ b/stage0/src/Init/Lean/Parser/Module.lean
@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura, Sebastian Ullrich
 -/
 prelude
-import Init.Lean.Util.Message
+import Init.Lean.Message
 import Init.Lean.Parser.Command
 
 namespace Lean
diff --git a/stage0/src/Init/Lean/Parser/Parser.lean b/stage0/src/Init/Lean/Parser/Parser.lean
index c46ccf1cc3..bd8bb126c0 100644
--- a/stage0/src/Init/Lean/Parser/Parser.lean
+++ b/stage0/src/Init/Lean/Parser/Parser.lean
@@ -10,7 +10,7 @@ import Init.Lean.Syntax
 import Init.Lean.ToExpr
 import Init.Lean.Environment
 import Init.Lean.Attributes
-import Init.Lean.Util.Message
+import Init.Lean.Message
 import Init.Lean.Parser.Identifier
 import Init.Lean.Compiler.InitAttr
 
diff --git a/stage0/src/Init/Lean/Util/Sorry.lean b/stage0/src/Init/Lean/Util/Sorry.lean
index c3e8300d2f..2cb9764e3f 100644
--- a/stage0/src/Init/Lean/Util/Sorry.lean
+++ b/stage0/src/Init/Lean/Util/Sorry.lean
@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 prelude
-import Init.Lean.Util.Message
+import Init.Lean.Message
 
 namespace Lean
 
diff --git a/stage0/src/Init/Lean/Util/Trace.lean b/stage0/src/Init/Lean/Util/Trace.lean
index f08ed718c5..055d087fb6 100644
--- a/stage0/src/Init/Lean/Util/Trace.lean
+++ b/stage0/src/Init/Lean/Util/Trace.lean
@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Sebastian Ullrich, Leonardo de Moura
 -/
 prelude
-import Init.Lean.Util.Message
+import Init.Lean.Message
 universe u
 
 namespace Lean
diff --git a/stage0/stdlib/CMakeLists.txt b/stage0/stdlib/CMakeLists.txt
index a397a31786..6782f2a7d5 100644
--- a/stage0/stdlib/CMakeLists.txt
+++ b/stage0/stdlib/CMakeLists.txt
@@ -1 +1 @@
-add_library (stage0 OBJECT Init/./Coe.c Init/./Control.c Init/./Control/Alternative.c Init/./Control/Applicative.c Init/./Control/Conditional.c Init/./Control/EState.c Init/./Control/Except.c Init/./Control/Functor.c Init/./Control/Id.c Init/./Control/Lift.c Init/./Control/Monad.c Init/./Control/MonadFail.c Init/./Control/Option.c Init/./Control/Reader.c Init/./Control/State.c Init/./Core.c Init/./Data.c Init/./Data/Array.c Init/./Data/Array/Basic.c Init/./Data/Array/BinSearch.c Init/./Data/Array/QSort.c Init/./Data/AssocList.c Init/./Data/Basic.c Init/./Data/BinomialHeap.c Init/./Data/BinomialHeap/Basic.c Init/./Data/ByteArray.c Init/./Data/ByteArray/Basic.c Init/./Data/Char.c Init/./Data/Char/Basic.c Init/./Data/DList.c Init/./Data/Fin.c Init/./Data/Fin/Basic.c Init/./Data/HashMap.c Init/./Data/HashMap/Basic.c Init/./Data/HashSet.c Init/./Data/Hashable.c Init/./Data/Int.c Init/./Data/Int/Basic.c Init/./Data/List.c Init/./Data/List/Basic.c Init/./Data/List/BasicAux.c Init/./Data/List/Control.c Init/./Data/List/Instances.c Init/./Data/Nat.c Init/./Data/Nat/Basic.c Init/./Data/Nat/Bitwise.c Init/./Data/Nat/Control.c Init/./Data/Nat/Div.c Init/./Data/Option.c Init/./Data/Option/Basic.c Init/./Data/Option/BasicAux.c Init/./Data/Option/Instances.c Init/./Data/PersistentArray.c Init/./Data/PersistentArray/Basic.c Init/./Data/PersistentHashMap.c Init/./Data/PersistentHashMap/Basic.c Init/./Data/PersistentHashSet.c Init/./Data/Queue.c Init/./Data/Queue/Basic.c Init/./Data/RBMap.c Init/./Data/RBMap/Basic.c Init/./Data/RBMap/BasicAux.c Init/./Data/RBTree.c Init/./Data/RBTree/Basic.c Init/./Data/Random.c Init/./Data/Repr.c Init/./Data/Stack.c Init/./Data/Stack/Basic.c Init/./Data/String.c Init/./Data/String/Basic.c Init/./Data/ToString.c Init/./Data/UInt.c Init/./Default.c Init/./Fix.c Init/./Lean.c Init/./Lean/Attributes.c Init/./Lean/AuxRecursor.c Init/./Lean/Class.c Init/./Lean/Compiler.c Init/./Lean/Compiler/ClosedTermCache.c Init/./Lean/Compiler/ConstFolding.c Init/./Lean/Compiler/ExportAttr.c Init/./Lean/Compiler/ExternAttr.c Init/./Lean/Compiler/IR.c Init/./Lean/Compiler/IR/Basic.c Init/./Lean/Compiler/IR/Borrow.c Init/./Lean/Compiler/IR/Boxing.c Init/./Lean/Compiler/IR/Checker.c Init/./Lean/Compiler/IR/CompilerM.c Init/./Lean/Compiler/IR/CtorLayout.c Init/./Lean/Compiler/IR/ElimDeadBranches.c Init/./Lean/Compiler/IR/ElimDeadVars.c Init/./Lean/Compiler/IR/EmitC.c Init/./Lean/Compiler/IR/EmitUtil.c Init/./Lean/Compiler/IR/ExpandResetReuse.c Init/./Lean/Compiler/IR/Format.c Init/./Lean/Compiler/IR/FreeVars.c Init/./Lean/Compiler/IR/LiveVars.c Init/./Lean/Compiler/IR/NormIds.c Init/./Lean/Compiler/IR/PushProj.c Init/./Lean/Compiler/IR/RC.c Init/./Lean/Compiler/IR/ResetReuse.c Init/./Lean/Compiler/IR/SimpCase.c Init/./Lean/Compiler/IR/UnboxResult.c Init/./Lean/Compiler/ImplementedByAttr.c Init/./Lean/Compiler/InitAttr.c Init/./Lean/Compiler/InlineAttrs.c Init/./Lean/Compiler/NameMangling.c Init/./Lean/Compiler/NeverExtractAttr.c Init/./Lean/Compiler/Specialize.c Init/./Lean/Compiler/Util.c Init/./Lean/Data/Format.c Init/./Lean/Data/KVMap.c Init/./Lean/Data/LBool.c Init/./Lean/Data/LOption.c Init/./Lean/Data/Name.c Init/./Lean/Data/NameGenerator.c Init/./Lean/Data/Options.c Init/./Lean/Data/Position.c Init/./Lean/Data/SMap.c Init/./Lean/Data/Trie.c Init/./Lean/Declaration.c Init/./Lean/Elab.c Init/./Lean/Elab/Alias.c Init/./Lean/Elab/BuiltinNotation.c Init/./Lean/Elab/Command.c Init/./Lean/Elab/DeclModifiers.c Init/./Lean/Elab/Declaration.c Init/./Lean/Elab/Definition.c Init/./Lean/Elab/ElabStrategyAttrs.c Init/./Lean/Elab/Exception.c Init/./Lean/Elab/Frontend.c Init/./Lean/Elab/Import.c Init/./Lean/Elab/Level.c Init/./Lean/Elab/Log.c Init/./Lean/Elab/Quotation.c Init/./Lean/Elab/ResolveName.c Init/./Lean/Elab/Term.c Init/./Lean/Elab/TermApp.c Init/./Lean/Elab/TermBinders.c Init/./Lean/Elab/Util.c Init/./Lean/Environment.c Init/./Lean/EqnCompiler.c Init/./Lean/EqnCompiler/MatchPattern.c Init/./Lean/Eval.c Init/./Lean/Expr.c Init/./Lean/Hygiene.c Init/./Lean/Level.c Init/./Lean/Linter.c Init/./Lean/LocalContext.c Init/./Lean/Meta.c Init/./Lean/Meta/AbstractMVars.c Init/./Lean/Meta/AppBuilder.c Init/./Lean/Meta/Basic.c Init/./Lean/Meta/Check.c Init/./Lean/Meta/DiscrTree.c Init/./Lean/Meta/DiscrTreeTypes.c Init/./Lean/Meta/Exception.c Init/./Lean/Meta/ExprDefEq.c Init/./Lean/Meta/FunInfo.c Init/./Lean/Meta/InferType.c Init/./Lean/Meta/Instances.c Init/./Lean/Meta/LevelDefEq.c Init/./Lean/Meta/Message.c Init/./Lean/Meta/Offset.c Init/./Lean/Meta/Reduce.c Init/./Lean/Meta/SynthInstance.c Init/./Lean/Meta/Tactic.c Init/./Lean/Meta/Tactic/Assumption.c Init/./Lean/Meta/Tactic/Intro.c Init/./Lean/Meta/Tactic/Util.c Init/./Lean/Meta/WHNF.c Init/./Lean/MetavarContext.c Init/./Lean/Modifiers.c Init/./Lean/Parser.c Init/./Lean/Parser/Command.c Init/./Lean/Parser/Identifier.c Init/./Lean/Parser/Level.c Init/./Lean/Parser/Module.c Init/./Lean/Parser/Parser.c Init/./Lean/Parser/Term.c Init/./Lean/Parser/Transform.c Init/./Lean/ProjFns.c Init/./Lean/ReducibilityAttrs.c Init/./Lean/Runtime.c Init/./Lean/Scopes.c Init/./Lean/Structure.c Init/./Lean/Syntax.c Init/./Lean/ToExpr.c Init/./Lean/Util/CollectFVars.c Init/./Lean/Util/CollectLevelParams.c Init/./Lean/Util/Message.c Init/./Lean/Util/MonadCache.c Init/./Lean/Util/Path.c Init/./Lean/Util/Profile.c Init/./Lean/Util/Sorry.c Init/./Lean/Util/Trace.c Init/./Lean/Util/WHNF.c Init/./LeanExt.c Init/./System.c Init/./System/FilePath.c Init/./System/IO.c Init/./System/Platform.c Init/./Util.c Init/./WF.c)
+add_library (stage0 OBJECT Init/./Coe.c Init/./Control.c Init/./Control/Alternative.c Init/./Control/Applicative.c Init/./Control/Conditional.c Init/./Control/EState.c Init/./Control/Except.c Init/./Control/Functor.c Init/./Control/Id.c Init/./Control/Lift.c Init/./Control/Monad.c Init/./Control/MonadFail.c Init/./Control/Option.c Init/./Control/Reader.c Init/./Control/State.c Init/./Core.c Init/./Data.c Init/./Data/Array.c Init/./Data/Array/Basic.c Init/./Data/Array/BinSearch.c Init/./Data/Array/QSort.c Init/./Data/AssocList.c Init/./Data/Basic.c Init/./Data/BinomialHeap.c Init/./Data/BinomialHeap/Basic.c Init/./Data/ByteArray.c Init/./Data/ByteArray/Basic.c Init/./Data/Char.c Init/./Data/Char/Basic.c Init/./Data/DList.c Init/./Data/Fin.c Init/./Data/Fin/Basic.c Init/./Data/HashMap.c Init/./Data/HashMap/Basic.c Init/./Data/HashSet.c Init/./Data/Hashable.c Init/./Data/Int.c Init/./Data/Int/Basic.c Init/./Data/List.c Init/./Data/List/Basic.c Init/./Data/List/BasicAux.c Init/./Data/List/Control.c Init/./Data/List/Instances.c Init/./Data/Nat.c Init/./Data/Nat/Basic.c Init/./Data/Nat/Bitwise.c Init/./Data/Nat/Control.c Init/./Data/Nat/Div.c Init/./Data/Option.c Init/./Data/Option/Basic.c Init/./Data/Option/BasicAux.c Init/./Data/Option/Instances.c Init/./Data/PersistentArray.c Init/./Data/PersistentArray/Basic.c Init/./Data/PersistentHashMap.c Init/./Data/PersistentHashMap/Basic.c Init/./Data/PersistentHashSet.c Init/./Data/Queue.c Init/./Data/Queue/Basic.c Init/./Data/RBMap.c Init/./Data/RBMap/Basic.c Init/./Data/RBMap/BasicAux.c Init/./Data/RBTree.c Init/./Data/RBTree/Basic.c Init/./Data/Random.c Init/./Data/Repr.c Init/./Data/Stack.c Init/./Data/Stack/Basic.c Init/./Data/String.c Init/./Data/String/Basic.c Init/./Data/ToString.c Init/./Data/UInt.c Init/./Default.c Init/./Fix.c Init/./Lean.c Init/./Lean/Attributes.c Init/./Lean/AuxRecursor.c Init/./Lean/Class.c Init/./Lean/Compiler.c Init/./Lean/Compiler/ClosedTermCache.c Init/./Lean/Compiler/ConstFolding.c Init/./Lean/Compiler/ExportAttr.c Init/./Lean/Compiler/ExternAttr.c Init/./Lean/Compiler/IR.c Init/./Lean/Compiler/IR/Basic.c Init/./Lean/Compiler/IR/Borrow.c Init/./Lean/Compiler/IR/Boxing.c Init/./Lean/Compiler/IR/Checker.c Init/./Lean/Compiler/IR/CompilerM.c Init/./Lean/Compiler/IR/CtorLayout.c Init/./Lean/Compiler/IR/ElimDeadBranches.c Init/./Lean/Compiler/IR/ElimDeadVars.c Init/./Lean/Compiler/IR/EmitC.c Init/./Lean/Compiler/IR/EmitUtil.c Init/./Lean/Compiler/IR/ExpandResetReuse.c Init/./Lean/Compiler/IR/Format.c Init/./Lean/Compiler/IR/FreeVars.c Init/./Lean/Compiler/IR/LiveVars.c Init/./Lean/Compiler/IR/NormIds.c Init/./Lean/Compiler/IR/PushProj.c Init/./Lean/Compiler/IR/RC.c Init/./Lean/Compiler/IR/ResetReuse.c Init/./Lean/Compiler/IR/SimpCase.c Init/./Lean/Compiler/IR/UnboxResult.c Init/./Lean/Compiler/ImplementedByAttr.c Init/./Lean/Compiler/InitAttr.c Init/./Lean/Compiler/InlineAttrs.c Init/./Lean/Compiler/NameMangling.c Init/./Lean/Compiler/NeverExtractAttr.c Init/./Lean/Compiler/Specialize.c Init/./Lean/Compiler/Util.c Init/./Lean/Data/Format.c Init/./Lean/Data/KVMap.c Init/./Lean/Data/LBool.c Init/./Lean/Data/LOption.c Init/./Lean/Data/Name.c Init/./Lean/Data/NameGenerator.c Init/./Lean/Data/Occurrences.c Init/./Lean/Data/Options.c Init/./Lean/Data/Position.c Init/./Lean/Data/SMap.c Init/./Lean/Data/Trie.c Init/./Lean/Declaration.c Init/./Lean/Elab.c Init/./Lean/Elab/Alias.c Init/./Lean/Elab/BuiltinNotation.c Init/./Lean/Elab/Command.c Init/./Lean/Elab/DeclModifiers.c Init/./Lean/Elab/Declaration.c Init/./Lean/Elab/Definition.c Init/./Lean/Elab/ElabStrategyAttrs.c Init/./Lean/Elab/Exception.c Init/./Lean/Elab/Frontend.c Init/./Lean/Elab/Import.c Init/./Lean/Elab/Level.c Init/./Lean/Elab/Log.c Init/./Lean/Elab/Quotation.c Init/./Lean/Elab/ResolveName.c Init/./Lean/Elab/Term.c Init/./Lean/Elab/TermApp.c Init/./Lean/Elab/TermBinders.c Init/./Lean/Elab/Util.c Init/./Lean/Environment.c Init/./Lean/EqnCompiler.c Init/./Lean/EqnCompiler/MatchPattern.c Init/./Lean/Eval.c Init/./Lean/Expr.c Init/./Lean/HeadIndex.c Init/./Lean/Hygiene.c Init/./Lean/Level.c Init/./Lean/Linter.c Init/./Lean/LocalContext.c Init/./Lean/Message.c Init/./Lean/Meta.c Init/./Lean/Meta/AbstractMVars.c Init/./Lean/Meta/AppBuilder.c Init/./Lean/Meta/Basic.c Init/./Lean/Meta/Check.c Init/./Lean/Meta/DiscrTree.c Init/./Lean/Meta/DiscrTreeTypes.c Init/./Lean/Meta/Exception.c Init/./Lean/Meta/ExprDefEq.c Init/./Lean/Meta/FunInfo.c Init/./Lean/Meta/InferType.c Init/./Lean/Meta/Instances.c Init/./Lean/Meta/KAbstract.c Init/./Lean/Meta/LevelDefEq.c Init/./Lean/Meta/Message.c Init/./Lean/Meta/Offset.c Init/./Lean/Meta/Reduce.c Init/./Lean/Meta/SynthInstance.c Init/./Lean/Meta/Tactic.c Init/./Lean/Meta/Tactic/Assumption.c Init/./Lean/Meta/Tactic/Intro.c Init/./Lean/Meta/Tactic/Util.c Init/./Lean/Meta/WHNF.c Init/./Lean/MetavarContext.c Init/./Lean/Modifiers.c Init/./Lean/Parser.c Init/./Lean/Parser/Command.c Init/./Lean/Parser/Identifier.c Init/./Lean/Parser/Level.c Init/./Lean/Parser/Module.c Init/./Lean/Parser/Parser.c Init/./Lean/Parser/Term.c Init/./Lean/Parser/Transform.c Init/./Lean/ProjFns.c Init/./Lean/ReducibilityAttrs.c Init/./Lean/Runtime.c Init/./Lean/Scopes.c Init/./Lean/Structure.c Init/./Lean/Syntax.c Init/./Lean/ToExpr.c Init/./Lean/Util/CollectFVars.c Init/./Lean/Util/CollectLevelParams.c Init/./Lean/Util/MonadCache.c Init/./Lean/Util/Path.c Init/./Lean/Util/Profile.c Init/./Lean/Util/Sorry.c Init/./Lean/Util/Trace.c Init/./Lean/Util/WHNF.c Init/./LeanExt.c Init/./System.c Init/./System/FilePath.c Init/./System/IO.c Init/./System/Platform.c Init/./Util.c Init/./WF.c)
diff --git a/stage0/stdlib/Init/Lean/Data/Occurrences.c b/stage0/stdlib/Init/Lean/Data/Occurrences.c
new file mode 100644
index 0000000000..814098a50c
--- /dev/null
+++ b/stage0/stdlib/Init/Lean/Data/Occurrences.c
@@ -0,0 +1,317 @@
+// Lean compiler output
+// Module: Init.Lean.Data.Occurrences
+// Imports: Init.Data.Nat
+#include "runtime/lean.h"
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-label"
+#elif defined(__GNUC__) && !defined(__CLANG__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+lean_object* l_Lean_Occurrences_contains___boxed(lean_object*, lean_object*);
+uint8_t l_List_elem___main___at_Lean_Occurrences_contains___spec__1(lean_object*, lean_object*);
+uint8_t l_Lean_Occurrences_beq(lean_object*, lean_object*);
+uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
+lean_object* l_Lean_Occurrences_HasBeq;
+uint8_t l_Lean_Occurrences_contains(lean_object*, lean_object*);
+uint8_t l_List_beq___main___at_Lean_Occurrences_beq___spec__1(lean_object*, lean_object*);
+lean_object* l_Lean_Occurrences_beq___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_Occurrences_Inhabited;
+lean_object* l_Lean_Occurrences_HasBeq___closed__1;
+lean_object* l_List_elem___main___at_Lean_Occurrences_contains___spec__1___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_Occurrences_isAll___boxed(lean_object*);
+uint8_t l_Lean_Occurrences_isAll(lean_object*);
+lean_object* l_List_beq___main___at_Lean_Occurrences_beq___spec__1___boxed(lean_object*, lean_object*);
+lean_object* _init_l_Lean_Occurrences_Inhabited() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_box(0);
+return x_1;
+}
+}
+uint8_t l_List_elem___main___at_Lean_Occurrences_contains___spec__1(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+uint8_t x_3; 
+x_3 = 0;
+return x_3;
+}
+else
+{
+lean_object* x_4; lean_object* x_5; uint8_t x_6; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 1);
+x_6 = lean_nat_dec_eq(x_1, x_4);
+if (x_6 == 0)
+{
+x_2 = x_5;
+goto _start;
+}
+else
+{
+uint8_t x_8; 
+x_8 = 1;
+return x_8;
+}
+}
+}
+}
+uint8_t l_Lean_Occurrences_contains(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+switch (lean_obj_tag(x_1)) {
+case 0:
+{
+uint8_t x_3; 
+x_3 = 1;
+return x_3;
+}
+case 1:
+{
+lean_object* x_4; uint8_t x_5; 
+x_4 = lean_ctor_get(x_1, 0);
+x_5 = l_List_elem___main___at_Lean_Occurrences_contains___spec__1(x_2, x_4);
+return x_5;
+}
+default: 
+{
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_ctor_get(x_1, 0);
+x_7 = l_List_elem___main___at_Lean_Occurrences_contains___spec__1(x_2, x_6);
+if (x_7 == 0)
+{
+uint8_t x_8; 
+x_8 = 1;
+return x_8;
+}
+else
+{
+uint8_t x_9; 
+x_9 = 0;
+return x_9;
+}
+}
+}
+}
+}
+lean_object* l_List_elem___main___at_Lean_Occurrences_contains___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_List_elem___main___at_Lean_Occurrences_contains___spec__1(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+lean_object* l_Lean_Occurrences_contains___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_Lean_Occurrences_contains(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+uint8_t l_Lean_Occurrences_isAll(lean_object* x_1) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+uint8_t x_2; 
+x_2 = 1;
+return x_2;
+}
+else
+{
+uint8_t x_3; 
+x_3 = 0;
+return x_3;
+}
+}
+}
+lean_object* l_Lean_Occurrences_isAll___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = l_Lean_Occurrences_isAll(x_1);
+lean_dec(x_1);
+x_3 = lean_box(x_2);
+return x_3;
+}
+}
+uint8_t l_List_beq___main___at_Lean_Occurrences_beq___spec__1(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+if (lean_obj_tag(x_2) == 0)
+{
+uint8_t x_3; 
+x_3 = 1;
+return x_3;
+}
+else
+{
+uint8_t x_4; 
+x_4 = 0;
+return x_4;
+}
+}
+else
+{
+if (lean_obj_tag(x_2) == 0)
+{
+uint8_t x_5; 
+x_5 = 0;
+return x_5;
+}
+else
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_6 = lean_ctor_get(x_1, 0);
+x_7 = lean_ctor_get(x_1, 1);
+x_8 = lean_ctor_get(x_2, 0);
+x_9 = lean_ctor_get(x_2, 1);
+x_10 = lean_nat_dec_eq(x_6, x_8);
+if (x_10 == 0)
+{
+uint8_t x_11; 
+x_11 = 0;
+return x_11;
+}
+else
+{
+x_1 = x_7;
+x_2 = x_9;
+goto _start;
+}
+}
+}
+}
+}
+uint8_t l_Lean_Occurrences_beq(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+switch (lean_obj_tag(x_1)) {
+case 0:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+uint8_t x_3; 
+x_3 = 1;
+return x_3;
+}
+else
+{
+uint8_t x_4; 
+x_4 = 0;
+return x_4;
+}
+}
+case 1:
+{
+if (lean_obj_tag(x_2) == 1)
+{
+lean_object* x_5; lean_object* x_6; uint8_t x_7; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_ctor_get(x_2, 0);
+x_7 = l_List_beq___main___at_Lean_Occurrences_beq___spec__1(x_5, x_6);
+return x_7;
+}
+else
+{
+uint8_t x_8; 
+x_8 = 0;
+return x_8;
+}
+}
+default: 
+{
+if (lean_obj_tag(x_2) == 2)
+{
+lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+x_9 = lean_ctor_get(x_1, 0);
+x_10 = lean_ctor_get(x_2, 0);
+x_11 = l_List_beq___main___at_Lean_Occurrences_beq___spec__1(x_9, x_10);
+return x_11;
+}
+else
+{
+uint8_t x_12; 
+x_12 = 0;
+return x_12;
+}
+}
+}
+}
+}
+lean_object* l_List_beq___main___at_Lean_Occurrences_beq___spec__1___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_List_beq___main___at_Lean_Occurrences_beq___spec__1(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+lean_object* l_Lean_Occurrences_beq___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_Lean_Occurrences_beq(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+lean_object* _init_l_Lean_Occurrences_HasBeq___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_Occurrences_beq___boxed), 2, 0);
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Occurrences_HasBeq() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_Occurrences_HasBeq___closed__1;
+return x_1;
+}
+}
+lean_object* initialize_Init_Data_Nat(lean_object*);
+static bool _G_initialized = false;
+lean_object* initialize_Init_Lean_Data_Occurrences(lean_object* w) {
+lean_object * res;
+if (_G_initialized) return lean_mk_io_result(lean_box(0));
+_G_initialized = true;
+res = initialize_Init_Data_Nat(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+l_Lean_Occurrences_Inhabited = _init_l_Lean_Occurrences_Inhabited();
+lean_mark_persistent(l_Lean_Occurrences_Inhabited);
+l_Lean_Occurrences_HasBeq___closed__1 = _init_l_Lean_Occurrences_HasBeq___closed__1();
+lean_mark_persistent(l_Lean_Occurrences_HasBeq___closed__1);
+l_Lean_Occurrences_HasBeq = _init_l_Lean_Occurrences_HasBeq();
+lean_mark_persistent(l_Lean_Occurrences_HasBeq);
+return lean_mk_io_result(lean_box(0));
+}
+#ifdef __cplusplus
+}
+#endif
diff --git a/stage0/stdlib/Init/Lean/Elab/BuiltinNotation.c b/stage0/stdlib/Init/Lean/Elab/BuiltinNotation.c
index 326badc799..6be9bce338 100644
--- a/stage0/stdlib/Init/Lean/Elab/BuiltinNotation.c
+++ b/stage0/stdlib/Init/Lean/Elab/BuiltinNotation.c
@@ -13,6 +13,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+lean_object* l_Lean_Elab_Term_elabShow___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabModN___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProd___closed__3;
 lean_object* l_Lean_Elab_Term_elabBAnd___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -28,7 +29,6 @@ lean_object* l_Lean_Elab_Term_elabAdd___boxed(lean_object*, lean_object*, lean_o
 lean_object* l_Lean_Elab_Term_elabShow___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabseqLeft___closed__1;
 lean_object* l_Lean_Elab_Term_elabBind___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_elabShow___lambda__1___closed__4;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabShow___closed__1;
 lean_object* l_Lean_Elab_Term_elabAdd___closed__1;
 extern lean_object* l_Lean_Parser_Term_andthen___elambda__1___closed__2;
@@ -37,7 +37,6 @@ lean_object* l_Lean_Elab_Term_elabModN___closed__1;
 lean_object* l_Lean_Elab_Term_elabIff(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_andthen___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabBAnd___closed__1;
-lean_object* l_Lean_Elab_Term_elabIf___lambda__1___closed__10;
 lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__13;
 extern lean_object* l_Lean_Expr_eq_x3f___closed__2;
 extern lean_object* l_Lean_Parser_declareLeadingBuiltinParser___closed__1;
@@ -45,7 +44,6 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabIff___closed__3;
 extern lean_object* l_Lean_Elab_Term_stxQuot_expand___closed__7;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabDiv(lean_object*);
 extern lean_object* l_Lean_Parser_declareBuiltinParser___closed__8;
-lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__41;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBEq(lean_object*);
 lean_object* l_Lean_Elab_Term_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__23;
@@ -78,10 +76,10 @@ lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__14;
 lean_object* l_Lean_Elab_Term_elabBOr___closed__1;
 lean_object* l_Lean_Elab_Term_elabMul___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSub___closed__1;
-extern lean_object* l_Lean_Parser_Term_parser_x21___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabAnoymousCtor___closed__5;
 lean_object* l_Lean_Elab_Term_elabAnoymousCtor___closed__14;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabShow___closed__2;
+lean_object* l_Lean_Elab_Term_elabDollar___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_seqLeft___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabseqLeft___closed__3;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabAnd(lean_object*);
@@ -91,7 +89,6 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSubtype___closed__1;
 extern lean_object* l_Lean_Parser_Term_seqLeft___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabIf___lambda__1(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_show___elambda__1___closed__2;
-extern lean_object* l_Lean_stxInh;
 lean_object* l_Lean_Elab_Term_elabSubtype___lambda__1___closed__9;
 lean_object* l_Lean_Elab_Term_elabMul___closed__2;
 extern lean_object* l_Lean_Parser_Term_anonymousCtor___elambda__1___closed__2;
@@ -129,6 +126,7 @@ lean_object* l_Lean_Elab_Term_elabseq(lean_object*, lean_object*, lean_object*,
 lean_object* l_Lean_Elab_Term_elabEq___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_seqRight___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabAndThen(lean_object*);
+lean_object* l_Lean_Elab_Term_elabSubtype___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabCons___closed__1;
 extern lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
 lean_object* lean_array_push(lean_object*, lean_object*);
@@ -184,7 +182,6 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabAdd___closed__3;
 extern lean_object* l_Lean_Parser_Term_subtype___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Term_prod___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabMapConst___closed__1;
-extern lean_object* l_Lean_Parser_Term_dollarProj___elambda__1___closed__3;
 extern lean_object* l_Lean_Parser_Term_or___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabseq___closed__1;
 lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__19;
@@ -198,7 +195,6 @@ extern lean_object* l_Lean_Parser_Term_dollarProj___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabOr___closed__2;
 lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__9;
 lean_object* l_Lean_Elab_Term_elabAnoymousCtor___closed__8;
-lean_object* l_Lean_Elab_Term_elabIf___lambda__1___closed__11;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabLT___closed__3;
 lean_object* l_Lean_Elab_Term_elabMul___closed__3;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabIff(lean_object*);
@@ -220,7 +216,6 @@ lean_object* l_Lean_Elab_Term_elabShow___lambda__1(lean_object*, lean_object*, l
 lean_object* l_Lean_Elab_Term_elabseq___closed__2;
 extern lean_object* l_Lean_Parser_Term_band___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabseqRight___closed__3;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabHEq___closed__1;
 extern lean_object* l_Lean_Parser_Term_id___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSub(lean_object*);
@@ -229,6 +224,8 @@ lean_object* l_Lean_Elab_Term_elabAppend(lean_object*, lean_object*, lean_object
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProd___closed__2;
 extern lean_object* l_Lean_Parser_Term_or___elambda__1___closed__1;
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__5;
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabseqLeft___closed__1;
 extern lean_object* l_Lean_Parser_Term_ne___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabLE(lean_object*);
@@ -238,7 +235,6 @@ lean_object* l_Lean_Elab_Term_elabMapConst(lean_object*, lean_object*, lean_obje
 lean_object* l_Lean_Elab_Term_elabSubtype___lambda__1___closed__12;
 extern lean_object* l_Lean_Parser_Term_mul___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabSubtype(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_Parser_Term_subtype___elambda__1___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabMapConst___closed__2;
 extern lean_object* l_Lean_Parser_Term_div___elambda__1___closed__1;
 extern lean_object* l_Lean_Parser_Term_tparser_x21___elambda__1___closed__2;
@@ -262,7 +258,6 @@ extern lean_object* l_Lean_Parser_Term_seq___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__10;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabEq(lean_object*);
 lean_object* l_Lean_Elab_Term_elabLE___closed__1;
-lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabOrM___closed__1;
 lean_object* l_Lean_Elab_Term_ElabFComp___closed__4;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBAnd___closed__2;
@@ -291,7 +286,6 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabOrM___closed__2;
 lean_object* l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__7;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProd___closed__1;
 extern lean_object* l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-lean_object* l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__27;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabHave___closed__1;
 lean_object* l_Lean_Elab_Term_elabSub(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -307,8 +301,8 @@ lean_object* l_Lean_Elab_Term_elabseqRight___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBOr___closed__3;
 lean_object* l_Lean_Elab_Term_elabAnoymousCtor___closed__4;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_elabDollarProj___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_Parser_Term_tparser_x21___elambda__1___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBEq___closed__2;
 lean_object* l_Lean_Elab_Term_elabIff___closed__2;
 lean_object* l_Lean_Elab_Term_elabHEq(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -339,10 +333,8 @@ extern lean_object* l_Lean_Parser_Term_beq___elambda__1___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabAndThen___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabDollar___closed__2;
 lean_object* l_Lean_Elab_Term_elabAppend___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_elabDollar___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabSubtype___lambda__1___closed__7;
 lean_object* l_Lean_Elab_Term_elabPow___closed__2;
-extern lean_object* l_Lean_Parser_Term_have___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabInfixOp___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBOr___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSub___closed__3;
@@ -354,7 +346,6 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabMod___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabMapRev(lean_object*);
 extern lean_object* l_List_head_x21___rarg___closed__2;
 extern lean_object* l_Lean_Parser_Term_mapConstRev___elambda__1___closed__1;
-lean_object* l_Lean_Elab_Term_elabDollar___lambda__1___closed__1;
 extern lean_object* l_Lean_Parser_Term_beq___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBEq___closed__1;
 extern lean_object* l_Lean_Parser_Term_bor___elambda__1___closed__2;
@@ -363,6 +354,7 @@ lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lea
 lean_object* l_Lean_Elab_Term_elabCons___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBOr___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabAppend___closed__2;
+lean_object* l_Lean_Elab_Term_elabWhere___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabPow___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabMapConst___closed__3;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabModN___closed__3;
@@ -377,7 +369,6 @@ lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__26;
 lean_object* l_Lean_Elab_Term_elabAnd___closed__2;
 extern lean_object* l_Lean_Parser_Term_mapConstRev___elambda__1___closed__2;
 extern lean_object* l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__3___closed__1;
-lean_object* l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__11;
 lean_object* l_Lean_Elab_Term_elabIf___lambda__1___closed__8;
 lean_object* l_Lean_Elab_Term_elabMapConstRev___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabPow___closed__1;
@@ -447,7 +438,6 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabEq___closed__1;
 lean_object* l_Lean_Elab_Term_elabLT(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBEq___closed__3;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabseqLeft___closed__3;
-extern lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__5;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBOr(lean_object*);
 extern lean_object* l_Lean_Parser_Term_let___elambda__1___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabAndThen___closed__2;
@@ -473,7 +463,6 @@ lean_object* l_Lean_Elab_Term_elabIf___lambda__1___closed__1;
 extern lean_object* l_Lean_Parser_Term_append___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabMul(lean_object*);
 lean_object* l_Lean_Elab_Term_elabGE___closed__1;
-extern lean_object* l_Lean_Parser_Term_where___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__10;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBNe___closed__2;
 lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__32;
@@ -546,6 +535,7 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabNe___closed__2;
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabLT___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabModN___closed__2;
+lean_object* l_Lean_Elab_Term_elabIf___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProd(lean_object*);
 extern lean_object* l_Lean_Parser_Term_bne___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Term_typeSpec___elambda__1___closed__2;
@@ -556,7 +546,6 @@ lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__37;
 lean_object* l_Lean_Elab_Term_elabMod(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabSubtype___lambda__1___closed__14;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabAnoymousCtor___closed__3;
-lean_object* l_Lean_Elab_Term_elabWhere___lambda__1___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabOr___closed__1;
 extern lean_object* l_Lean_Parser_Term_map___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabAnoymousCtor___closed__10;
@@ -573,9 +562,9 @@ lean_object* l_Lean_Elab_Term_elabBNe___boxed(lean_object*, lean_object*, lean_o
 lean_object* l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabSub___closed__1;
 lean_object* l_Lean_Elab_Term_elabMap(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabDiv___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBNe___closed__1;
+lean_object* l_Lean_Elab_Term_elabHave___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
 lean_object* l_Lean_Elab_Term_elabseqRight___closed__3;
 lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__29;
@@ -589,7 +578,6 @@ extern lean_object* l_Lean_Parser_Term_map___elambda__1___closed__1;
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_Elab_Term_elabWhere___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabAndThen(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_ElabFComp___closed__3;
-lean_object* l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
 extern lean_object* l_Lean_Parser_Term_bindOp___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabIf(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabIf___closed__3;
@@ -631,7 +619,6 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabLE___closed__2;
 extern lean_object* l_Lean_Parser_Term_mod___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabAndM___closed__2;
 lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__22;
-lean_object* l_Lean_Elab_Term_elabSubtype___lambda__1___closed__15;
 extern lean_object* l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__1___closed__4;
 lean_object* l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__9;
 lean_object* l_Lean_Elab_Term_elabAnoymousCtor___closed__7;
@@ -640,24 +627,6 @@ lean_object* l_Lean_Elab_Term_elabAdd(lean_object*, lean_object*, lean_object*,
 lean_object* l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__8;
 lean_object* l_Lean_Elab_Term_elabAndM___closed__1;
 lean_object* l_Lean_Elab_Term_elabAndM___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* _init_l_Lean_Elab_Term_elabDollar___lambda__1___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("application");
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabDollar___lambda__1___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabDollar___lambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
 lean_object* l_Lean_Elab_Term_elabDollar___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -667,70 +636,69 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabDollar___lambda__1___closed__2;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
-lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(3u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabDollar___lambda__1___closed__2;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(0u);
-x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = lean_unsigned_to_nat(2u);
-x_17 = l_Lean_Syntax_getArg(x_1, x_16);
+lean_object* x_6; 
 lean_dec(x_1);
-x_18 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_19 = !lean_is_exclusive(x_18);
-if (x_19 == 0)
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
-x_20 = lean_ctor_get(x_18, 0);
-lean_dec(x_20);
-x_21 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_22 = lean_array_push(x_21, x_15);
-x_23 = lean_array_push(x_22, x_17);
-x_24 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_25 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_25, 0, x_24);
-lean_ctor_set(x_25, 1, x_23);
-lean_ctor_set(x_18, 0, x_25);
-return x_18;
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
 }
 else
 {
-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; 
-x_26 = lean_ctor_get(x_18, 1);
-lean_inc(x_26);
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(3u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
+lean_dec(x_8);
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_12 = lean_unsigned_to_nat(0u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = lean_unsigned_to_nat(2u);
+x_15 = l_Lean_Syntax_getArg(x_1, x_14);
+lean_dec(x_1);
+x_16 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_18 = lean_ctor_get(x_16, 0);
 lean_dec(x_18);
-x_27 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_28 = lean_array_push(x_27, x_15);
-x_29 = lean_array_push(x_28, x_17);
-x_30 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-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_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_31);
-lean_ctor_set(x_32, 1, x_26);
-return x_32;
+x_19 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_20 = lean_array_push(x_19, x_13);
+x_21 = lean_array_push(x_20, x_15);
+x_22 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_22);
+lean_ctor_set(x_23, 1, x_21);
+lean_ctor_set(x_16, 0, x_23);
+return x_16;
+}
+else
+{
+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; 
+x_24 = lean_ctor_get(x_16, 1);
+lean_inc(x_24);
+lean_dec(x_16);
+x_25 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_26 = lean_array_push(x_25, x_13);
+x_27 = lean_array_push(x_26, x_15);
+x_28 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_28);
+lean_ctor_set(x_29, 1, x_27);
+x_30 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 1, x_24);
+return x_30;
 }
 }
 }
@@ -740,7 +708,7 @@ lean_object* _init_l_Lean_Elab_Term_elabDollar___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabDollar___lambda__1), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabDollar___lambda__1___boxed), 3, 0);
 return x_1;
 }
 }
@@ -753,6 +721,15 @@ x_6 = l_Lean_Elab_Term_adaptExpander(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
+lean_object* l_Lean_Elab_Term_elabDollar___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Term_elabDollar___lambda__1(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
 lean_object* _init_l___regBuiltinTermElab_Lean_Elab_Term_elabDollar___closed__1() {
 _start:
 {
@@ -793,16 +770,6 @@ return x_5;
 lean_object* _init_l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__1() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_dollarProj___elambda__1___closed__3;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__2() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l_Lean_Name_toString___closed__1;
@@ -821,74 +788,73 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__1;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
-lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(3u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__1;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(0u);
-x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = lean_unsigned_to_nat(2u);
-x_17 = l_Lean_Syntax_getArg(x_1, x_16);
+lean_object* x_6; 
 lean_dec(x_1);
-x_18 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_19 = !lean_is_exclusive(x_18);
-if (x_19 == 0)
-{
-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; 
-x_20 = lean_ctor_get(x_18, 0);
-lean_dec(x_20);
-x_21 = l_Lean_Parser_declareBuiltinParser___closed__8;
-x_22 = lean_array_push(x_21, x_15);
-x_23 = l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__2;
-x_24 = lean_array_push(x_22, x_23);
-x_25 = lean_array_push(x_24, x_17);
-x_26 = l_Lean_Parser_Term_proj___elambda__1___closed__2;
-x_27 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_27, 0, x_26);
-lean_ctor_set(x_27, 1, x_25);
-lean_ctor_set(x_18, 0, x_27);
-return x_18;
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
 }
 else
 {
-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; 
-x_28 = lean_ctor_get(x_18, 1);
-lean_inc(x_28);
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(3u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
+lean_dec(x_8);
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_12 = lean_unsigned_to_nat(0u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = lean_unsigned_to_nat(2u);
+x_15 = l_Lean_Syntax_getArg(x_1, x_14);
+lean_dec(x_1);
+x_16 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_18 = lean_ctor_get(x_16, 0);
 lean_dec(x_18);
-x_29 = l_Lean_Parser_declareBuiltinParser___closed__8;
-x_30 = lean_array_push(x_29, x_15);
-x_31 = l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__2;
-x_32 = lean_array_push(x_30, x_31);
-x_33 = lean_array_push(x_32, x_17);
-x_34 = l_Lean_Parser_Term_proj___elambda__1___closed__2;
-x_35 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_35, 0, x_34);
-lean_ctor_set(x_35, 1, x_33);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_28);
-return x_36;
+x_19 = l_Lean_Parser_declareBuiltinParser___closed__8;
+x_20 = lean_array_push(x_19, x_13);
+x_21 = l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__1;
+x_22 = lean_array_push(x_20, x_21);
+x_23 = lean_array_push(x_22, x_15);
+x_24 = l_Lean_Parser_Term_proj___elambda__1___closed__2;
+x_25 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_25, 0, x_24);
+lean_ctor_set(x_25, 1, x_23);
+lean_ctor_set(x_16, 0, x_25);
+return x_16;
+}
+else
+{
+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; 
+x_26 = lean_ctor_get(x_16, 1);
+lean_inc(x_26);
+lean_dec(x_16);
+x_27 = l_Lean_Parser_declareBuiltinParser___closed__8;
+x_28 = lean_array_push(x_27, x_13);
+x_29 = l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__1;
+x_30 = lean_array_push(x_28, x_29);
+x_31 = lean_array_push(x_30, x_15);
+x_32 = l_Lean_Parser_Term_proj___elambda__1___closed__2;
+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_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_26);
+return x_34;
 }
 }
 }
@@ -898,7 +864,7 @@ lean_object* _init_l_Lean_Elab_Term_elabDollarProj___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabDollarProj___lambda__1), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabDollarProj___lambda__1___boxed), 3, 0);
 return x_1;
 }
 }
@@ -911,6 +877,15 @@ x_6 = l_Lean_Elab_Term_adaptExpander(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
+lean_object* l_Lean_Elab_Term_elabDollarProj___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Term_elabDollarProj___lambda__1(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
 lean_object* _init_l___regBuiltinTermElab_Lean_Elab_Term_elabDollarProj___closed__1() {
 _start:
 {
@@ -951,24 +926,6 @@ return x_5;
 lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__1() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("if-then-else");
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabIf___lambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__3() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__3___closed__1;
@@ -976,31 +933,31 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__4() {
+lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__3;
+x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__1;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__5() {
+lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__4;
+x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__2;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__6() {
+lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -1008,22 +965,22 @@ x_1 = lean_mk_string("dite");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__7() {
+lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabIf___lambda__1___closed__6;
+x_1 = l_Lean_Elab_Term_elabIf___lambda__1___closed__4;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__8() {
+lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Term_elabIf___lambda__1___closed__6;
+x_1 = l_Lean_Elab_Term_elabIf___lambda__1___closed__4;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Term_elabIf___lambda__1___closed__7;
+x_3 = l_Lean_Elab_Term_elabIf___lambda__1___closed__5;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -1031,34 +988,34 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__9() {
+lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__6;
+x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__10() {
+lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__9;
+x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__7;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__11() {
+lean_object* _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__10;
+x_2 = l_Lean_Elab_Term_elabIf___lambda__1___closed__8;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
@@ -1074,355 +1031,353 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabIf___lambda__1___closed__2;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
-lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(7u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabIf___lambda__1___closed__2;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = l_Lean_nullKind___closed__2;
-lean_inc(x_15);
-x_17 = l_Lean_Syntax_isOfKind(x_15, x_16);
-if (x_17 == 0)
-{
-lean_object* x_18; lean_object* x_19; 
-lean_dec(x_15);
-x_18 = l_Lean_Elab_Term_elabIf___lambda__1___closed__2;
-x_19 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_18, x_2, x_3);
-return x_19;
-}
-else
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
-x_20 = l_Lean_Syntax_getArgs(x_15);
-x_21 = lean_array_get_size(x_20);
-lean_dec(x_20);
-x_22 = lean_unsigned_to_nat(2u);
-x_23 = lean_nat_dec_eq(x_21, x_22);
-if (x_23 == 0)
-{
-lean_object* x_24; uint8_t x_25; 
-lean_dec(x_15);
-x_24 = lean_unsigned_to_nat(0u);
-x_25 = lean_nat_dec_eq(x_21, x_24);
-lean_dec(x_21);
-if (x_25 == 0)
-{
-lean_object* x_26; lean_object* x_27; 
-x_26 = l_Lean_Elab_Term_elabIf___lambda__1___closed__2;
-x_27 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_26, x_2, x_3);
-return x_27;
-}
-else
-{
-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_28 = l_Lean_Syntax_getArg(x_1, x_22);
-x_29 = lean_unsigned_to_nat(4u);
-x_30 = l_Lean_Syntax_getArg(x_1, x_29);
-x_31 = lean_unsigned_to_nat(6u);
-x_32 = l_Lean_Syntax_getArg(x_1, x_31);
+lean_object* x_6; 
 lean_dec(x_1);
-x_33 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_34 = !lean_is_exclusive(x_33);
-if (x_34 == 0)
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
+}
+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_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; 
-x_35 = lean_ctor_get(x_33, 0);
-x_36 = lean_box(0);
-x_37 = l_Lean_Elab_Term_elabIf___lambda__1___closed__3;
-x_38 = lean_name_mk_numeral(x_37, x_35);
-x_39 = l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__3___closed__3;
-x_40 = l_Lean_Elab_Term_elabIf___lambda__1___closed__5;
-x_41 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_41, 0, x_36);
-lean_ctor_set(x_41, 1, x_39);
-lean_ctor_set(x_41, 2, x_38);
-lean_ctor_set(x_41, 3, x_40);
-x_42 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_43 = lean_array_push(x_42, x_41);
-x_44 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_45 = lean_array_push(x_43, x_44);
-x_46 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(7u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
+lean_dec(x_8);
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = l_Lean_nullKind___closed__2;
+lean_inc(x_13);
+x_15 = l_Lean_Syntax_isOfKind(x_13, x_14);
+if (x_15 == 0)
+{
+lean_object* x_16; 
+lean_dec(x_13);
+lean_dec(x_1);
+x_16 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_16;
+}
+else
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+x_17 = l_Lean_Syntax_getArgs(x_13);
+x_18 = lean_array_get_size(x_17);
+lean_dec(x_17);
+x_19 = lean_unsigned_to_nat(2u);
+x_20 = lean_nat_dec_eq(x_18, x_19);
+if (x_20 == 0)
+{
+lean_object* x_21; uint8_t x_22; 
+lean_dec(x_13);
+x_21 = lean_unsigned_to_nat(0u);
+x_22 = lean_nat_dec_eq(x_18, x_21);
+lean_dec(x_18);
+if (x_22 == 0)
+{
+lean_object* x_23; 
+lean_dec(x_1);
+x_23 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_23;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; 
+x_24 = l_Lean_Syntax_getArg(x_1, x_19);
+x_25 = lean_unsigned_to_nat(4u);
+x_26 = l_Lean_Syntax_getArg(x_1, x_25);
+x_27 = lean_unsigned_to_nat(6u);
+x_28 = l_Lean_Syntax_getArg(x_1, x_27);
+lean_dec(x_1);
+x_29 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_30 = !lean_is_exclusive(x_29);
+if (x_30 == 0)
+{
+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; 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_52; lean_object* x_53; 
+x_31 = lean_ctor_get(x_29, 0);
+x_32 = lean_box(0);
+x_33 = l_Lean_Elab_Term_elabIf___lambda__1___closed__1;
+x_34 = lean_name_mk_numeral(x_33, x_31);
+x_35 = l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__3___closed__3;
+x_36 = l_Lean_Elab_Term_elabIf___lambda__1___closed__3;
+x_37 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_37, 0, x_32);
+lean_ctor_set(x_37, 1, x_35);
+lean_ctor_set(x_37, 2, x_34);
+lean_ctor_set(x_37, 3, x_36);
+x_38 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_39 = lean_array_push(x_38, x_37);
+x_40 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_41 = lean_array_push(x_39, x_40);
+x_42 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_42);
+lean_ctor_set(x_43, 1, x_41);
+x_44 = lean_array_push(x_38, x_43);
+x_45 = lean_array_push(x_44, x_24);
+x_46 = l_Lean_Parser_Term_app___elambda__1___closed__2;
 x_47 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_47, 0, x_46);
 lean_ctor_set(x_47, 1, x_45);
-x_48 = lean_array_push(x_42, x_47);
-x_49 = lean_array_push(x_48, x_28);
-x_50 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_51 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_49);
-x_52 = lean_array_push(x_42, x_51);
-x_53 = lean_array_push(x_52, x_30);
-x_54 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_54, 0, x_50);
-lean_ctor_set(x_54, 1, x_53);
-x_55 = lean_array_push(x_42, x_54);
-x_56 = lean_array_push(x_55, x_32);
-x_57 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_57, 0, x_50);
-lean_ctor_set(x_57, 1, x_56);
-lean_ctor_set(x_33, 0, x_57);
-return x_33;
+x_48 = lean_array_push(x_38, x_47);
+x_49 = lean_array_push(x_48, x_26);
+x_50 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_50, 0, x_46);
+lean_ctor_set(x_50, 1, x_49);
+x_51 = lean_array_push(x_38, x_50);
+x_52 = lean_array_push(x_51, x_28);
+x_53 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_53, 0, x_46);
+lean_ctor_set(x_53, 1, x_52);
+lean_ctor_set(x_29, 0, x_53);
+return x_29;
 }
 else
 {
-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; 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; 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; 
-x_58 = lean_ctor_get(x_33, 0);
-x_59 = lean_ctor_get(x_33, 1);
-lean_inc(x_59);
-lean_inc(x_58);
-lean_dec(x_33);
-x_60 = lean_box(0);
-x_61 = l_Lean_Elab_Term_elabIf___lambda__1___closed__3;
-x_62 = lean_name_mk_numeral(x_61, x_58);
-x_63 = l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__3___closed__3;
-x_64 = l_Lean_Elab_Term_elabIf___lambda__1___closed__5;
-x_65 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_65, 0, x_60);
-lean_ctor_set(x_65, 1, x_63);
-lean_ctor_set(x_65, 2, x_62);
-lean_ctor_set(x_65, 3, x_64);
-x_66 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_67 = lean_array_push(x_66, x_65);
-x_68 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_69 = lean_array_push(x_67, x_68);
-x_70 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+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; 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; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_54 = lean_ctor_get(x_29, 0);
+x_55 = lean_ctor_get(x_29, 1);
+lean_inc(x_55);
+lean_inc(x_54);
+lean_dec(x_29);
+x_56 = lean_box(0);
+x_57 = l_Lean_Elab_Term_elabIf___lambda__1___closed__1;
+x_58 = lean_name_mk_numeral(x_57, x_54);
+x_59 = l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__3___closed__3;
+x_60 = l_Lean_Elab_Term_elabIf___lambda__1___closed__3;
+x_61 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_61, 0, x_56);
+lean_ctor_set(x_61, 1, x_59);
+lean_ctor_set(x_61, 2, x_58);
+lean_ctor_set(x_61, 3, x_60);
+x_62 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_63 = lean_array_push(x_62, x_61);
+x_64 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_65 = lean_array_push(x_63, x_64);
+x_66 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_66);
+lean_ctor_set(x_67, 1, x_65);
+x_68 = lean_array_push(x_62, x_67);
+x_69 = lean_array_push(x_68, x_24);
+x_70 = l_Lean_Parser_Term_app___elambda__1___closed__2;
 x_71 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_71, 0, x_70);
 lean_ctor_set(x_71, 1, x_69);
-x_72 = lean_array_push(x_66, x_71);
-x_73 = lean_array_push(x_72, x_28);
-x_74 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_75 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_75, 0, x_74);
-lean_ctor_set(x_75, 1, x_73);
-x_76 = lean_array_push(x_66, x_75);
-x_77 = lean_array_push(x_76, x_30);
-x_78 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_78, 0, x_74);
-lean_ctor_set(x_78, 1, x_77);
-x_79 = lean_array_push(x_66, x_78);
-x_80 = lean_array_push(x_79, x_32);
-x_81 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_81, 0, x_74);
-lean_ctor_set(x_81, 1, x_80);
-x_82 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_82, 0, x_81);
-lean_ctor_set(x_82, 1, x_59);
-return x_82;
+x_72 = lean_array_push(x_62, x_71);
+x_73 = lean_array_push(x_72, x_26);
+x_74 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_74, 0, x_70);
+lean_ctor_set(x_74, 1, x_73);
+x_75 = lean_array_push(x_62, x_74);
+x_76 = lean_array_push(x_75, x_28);
+x_77 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_77, 0, x_70);
+lean_ctor_set(x_77, 1, x_76);
+x_78 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_78, 0, x_77);
+lean_ctor_set(x_78, 1, x_55);
+return x_78;
 }
 }
 }
 else
 {
-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; lean_object* x_91; uint8_t x_92; 
-lean_dec(x_21);
-x_83 = lean_unsigned_to_nat(0u);
-x_84 = l_Lean_Syntax_getArg(x_15, x_83);
-lean_dec(x_15);
-x_85 = l_Lean_Syntax_getArg(x_1, x_22);
-x_86 = lean_unsigned_to_nat(4u);
-x_87 = l_Lean_Syntax_getArg(x_1, x_86);
-x_88 = lean_unsigned_to_nat(6u);
-x_89 = l_Lean_Syntax_getArg(x_1, x_88);
+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; uint8_t x_88; 
+lean_dec(x_18);
+x_79 = lean_unsigned_to_nat(0u);
+x_80 = l_Lean_Syntax_getArg(x_13, x_79);
+lean_dec(x_13);
+x_81 = l_Lean_Syntax_getArg(x_1, x_19);
+x_82 = lean_unsigned_to_nat(4u);
+x_83 = l_Lean_Syntax_getArg(x_1, x_82);
+x_84 = lean_unsigned_to_nat(6u);
+x_85 = l_Lean_Syntax_getArg(x_1, x_84);
 lean_dec(x_1);
-x_90 = l_Lean_Elab_Term_mkTermIdFromIdent(x_84);
-x_91 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_92 = !lean_is_exclusive(x_91);
-if (x_92 == 0)
+x_86 = l_Lean_Elab_Term_mkTermIdFromIdent(x_80);
+x_87 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_88 = !lean_is_exclusive(x_87);
+if (x_88 == 0)
 {
-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; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 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_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; 
-x_93 = lean_ctor_get(x_91, 0);
-x_94 = lean_box(0);
-x_95 = l_Lean_Elab_Term_elabIf___lambda__1___closed__9;
-x_96 = lean_name_mk_numeral(x_95, x_93);
-x_97 = l_Lean_Elab_Term_elabIf___lambda__1___closed__8;
-x_98 = l_Lean_Elab_Term_elabIf___lambda__1___closed__11;
-x_99 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_99, 0, x_94);
-lean_ctor_set(x_99, 1, x_97);
-lean_ctor_set(x_99, 2, x_96);
-lean_ctor_set(x_99, 3, x_98);
-x_100 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_101 = lean_array_push(x_100, x_99);
-x_102 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_103 = lean_array_push(x_101, x_102);
-x_104 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+lean_object* x_89; 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; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 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_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; 
+x_89 = lean_ctor_get(x_87, 0);
+x_90 = lean_box(0);
+x_91 = l_Lean_Elab_Term_elabIf___lambda__1___closed__7;
+x_92 = lean_name_mk_numeral(x_91, x_89);
+x_93 = l_Lean_Elab_Term_elabIf___lambda__1___closed__6;
+x_94 = l_Lean_Elab_Term_elabIf___lambda__1___closed__9;
+x_95 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_95, 0, x_90);
+lean_ctor_set(x_95, 1, x_93);
+lean_ctor_set(x_95, 2, x_92);
+lean_ctor_set(x_95, 3, x_94);
+x_96 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_97 = lean_array_push(x_96, x_95);
+x_98 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_99 = lean_array_push(x_97, x_98);
+x_100 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_101 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_101, 0, x_100);
+lean_ctor_set(x_101, 1, x_99);
+x_102 = lean_array_push(x_96, x_101);
+x_103 = lean_array_push(x_102, x_81);
+x_104 = l_Lean_Parser_Term_app___elambda__1___closed__2;
 x_105 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_105, 0, x_104);
 lean_ctor_set(x_105, 1, x_103);
-x_106 = lean_array_push(x_100, x_105);
-x_107 = lean_array_push(x_106, x_85);
-x_108 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_109 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_109, 0, x_108);
-lean_ctor_set(x_109, 1, x_107);
-x_110 = l_Lean_mkOptionalNode___closed__1;
-x_111 = lean_array_push(x_110, x_90);
-x_112 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_112, 0, x_16);
-lean_ctor_set(x_112, 1, x_111);
-x_113 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_114 = lean_array_push(x_113, x_112);
-x_115 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_116 = lean_array_push(x_114, x_115);
-lean_inc(x_116);
-x_117 = lean_array_push(x_116, x_87);
-x_118 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_119 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_119, 0, x_118);
-lean_ctor_set(x_119, 1, x_117);
-x_120 = lean_array_push(x_100, x_119);
-x_121 = lean_array_push(x_120, x_102);
-x_122 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_122, 0, x_16);
-lean_ctor_set(x_122, 1, x_121);
-x_123 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_124 = lean_array_push(x_123, x_122);
-x_125 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_126 = lean_array_push(x_124, x_125);
-x_127 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_128 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_128, 0, x_127);
-lean_ctor_set(x_128, 1, x_126);
-x_129 = lean_array_push(x_100, x_109);
-x_130 = lean_array_push(x_129, x_128);
-x_131 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_131, 0, x_108);
-lean_ctor_set(x_131, 1, x_130);
-x_132 = lean_array_push(x_116, x_89);
-x_133 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_133, 0, x_118);
-lean_ctor_set(x_133, 1, x_132);
-x_134 = lean_array_push(x_100, x_133);
-x_135 = lean_array_push(x_134, x_102);
-x_136 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_136, 0, x_16);
-lean_ctor_set(x_136, 1, x_135);
-x_137 = lean_array_push(x_123, x_136);
-x_138 = lean_array_push(x_137, x_125);
-x_139 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_139, 0, x_127);
-lean_ctor_set(x_139, 1, x_138);
-x_140 = lean_array_push(x_100, x_131);
-x_141 = lean_array_push(x_140, x_139);
-x_142 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_142, 0, x_108);
-lean_ctor_set(x_142, 1, x_141);
-lean_ctor_set(x_91, 0, x_142);
-return x_91;
+x_106 = l_Lean_mkOptionalNode___closed__1;
+x_107 = lean_array_push(x_106, x_86);
+x_108 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_108, 0, x_14);
+lean_ctor_set(x_108, 1, x_107);
+x_109 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_110 = lean_array_push(x_109, x_108);
+x_111 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_112 = lean_array_push(x_110, x_111);
+lean_inc(x_112);
+x_113 = lean_array_push(x_112, x_83);
+x_114 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_115 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_115, 0, x_114);
+lean_ctor_set(x_115, 1, x_113);
+x_116 = lean_array_push(x_96, x_115);
+x_117 = lean_array_push(x_116, x_98);
+x_118 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_118, 0, x_14);
+lean_ctor_set(x_118, 1, x_117);
+x_119 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_120 = lean_array_push(x_119, x_118);
+x_121 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_122 = lean_array_push(x_120, x_121);
+x_123 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_124 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_124, 0, x_123);
+lean_ctor_set(x_124, 1, x_122);
+x_125 = lean_array_push(x_96, x_105);
+x_126 = lean_array_push(x_125, x_124);
+x_127 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_127, 0, x_104);
+lean_ctor_set(x_127, 1, x_126);
+x_128 = lean_array_push(x_112, x_85);
+x_129 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_129, 0, x_114);
+lean_ctor_set(x_129, 1, x_128);
+x_130 = lean_array_push(x_96, x_129);
+x_131 = lean_array_push(x_130, x_98);
+x_132 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_132, 0, x_14);
+lean_ctor_set(x_132, 1, x_131);
+x_133 = lean_array_push(x_119, x_132);
+x_134 = lean_array_push(x_133, x_121);
+x_135 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_135, 0, x_123);
+lean_ctor_set(x_135, 1, x_134);
+x_136 = lean_array_push(x_96, x_127);
+x_137 = lean_array_push(x_136, x_135);
+x_138 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_138, 0, x_104);
+lean_ctor_set(x_138, 1, x_137);
+lean_ctor_set(x_87, 0, x_138);
+return x_87;
 }
 else
 {
-lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 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_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 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_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; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; 
-x_143 = lean_ctor_get(x_91, 0);
-x_144 = lean_ctor_get(x_91, 1);
-lean_inc(x_144);
-lean_inc(x_143);
-lean_dec(x_91);
-x_145 = lean_box(0);
-x_146 = l_Lean_Elab_Term_elabIf___lambda__1___closed__9;
-x_147 = lean_name_mk_numeral(x_146, x_143);
-x_148 = l_Lean_Elab_Term_elabIf___lambda__1___closed__8;
-x_149 = l_Lean_Elab_Term_elabIf___lambda__1___closed__11;
-x_150 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_150, 0, x_145);
-lean_ctor_set(x_150, 1, x_148);
-lean_ctor_set(x_150, 2, x_147);
-lean_ctor_set(x_150, 3, x_149);
-x_151 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_152 = lean_array_push(x_151, x_150);
-x_153 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_154 = lean_array_push(x_152, x_153);
-x_155 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 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_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 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_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; 
+x_139 = lean_ctor_get(x_87, 0);
+x_140 = lean_ctor_get(x_87, 1);
+lean_inc(x_140);
+lean_inc(x_139);
+lean_dec(x_87);
+x_141 = lean_box(0);
+x_142 = l_Lean_Elab_Term_elabIf___lambda__1___closed__7;
+x_143 = lean_name_mk_numeral(x_142, x_139);
+x_144 = l_Lean_Elab_Term_elabIf___lambda__1___closed__6;
+x_145 = l_Lean_Elab_Term_elabIf___lambda__1___closed__9;
+x_146 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_146, 0, x_141);
+lean_ctor_set(x_146, 1, x_144);
+lean_ctor_set(x_146, 2, x_143);
+lean_ctor_set(x_146, 3, x_145);
+x_147 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_148 = lean_array_push(x_147, x_146);
+x_149 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_150 = lean_array_push(x_148, x_149);
+x_151 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_152 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_152, 0, x_151);
+lean_ctor_set(x_152, 1, x_150);
+x_153 = lean_array_push(x_147, x_152);
+x_154 = lean_array_push(x_153, x_81);
+x_155 = l_Lean_Parser_Term_app___elambda__1___closed__2;
 x_156 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_156, 0, x_155);
 lean_ctor_set(x_156, 1, x_154);
-x_157 = lean_array_push(x_151, x_156);
-x_158 = lean_array_push(x_157, x_85);
-x_159 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_160 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_160, 0, x_159);
-lean_ctor_set(x_160, 1, x_158);
-x_161 = l_Lean_mkOptionalNode___closed__1;
-x_162 = lean_array_push(x_161, x_90);
-x_163 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_163, 0, x_16);
-lean_ctor_set(x_163, 1, x_162);
-x_164 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_165 = lean_array_push(x_164, x_163);
-x_166 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_167 = lean_array_push(x_165, x_166);
-lean_inc(x_167);
-x_168 = lean_array_push(x_167, x_87);
-x_169 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_170 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_170, 0, x_169);
-lean_ctor_set(x_170, 1, x_168);
-x_171 = lean_array_push(x_151, x_170);
-x_172 = lean_array_push(x_171, x_153);
-x_173 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_173, 0, x_16);
-lean_ctor_set(x_173, 1, x_172);
-x_174 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_175 = lean_array_push(x_174, x_173);
-x_176 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_177 = lean_array_push(x_175, x_176);
-x_178 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_179 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_179, 0, x_178);
-lean_ctor_set(x_179, 1, x_177);
-x_180 = lean_array_push(x_151, x_160);
-x_181 = lean_array_push(x_180, x_179);
-x_182 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_182, 0, x_159);
-lean_ctor_set(x_182, 1, x_181);
-x_183 = lean_array_push(x_167, x_89);
-x_184 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_184, 0, x_169);
-lean_ctor_set(x_184, 1, x_183);
-x_185 = lean_array_push(x_151, x_184);
-x_186 = lean_array_push(x_185, x_153);
-x_187 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_187, 0, x_16);
-lean_ctor_set(x_187, 1, x_186);
-x_188 = lean_array_push(x_174, x_187);
-x_189 = lean_array_push(x_188, x_176);
-x_190 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_190, 0, x_178);
-lean_ctor_set(x_190, 1, x_189);
-x_191 = lean_array_push(x_151, x_182);
-x_192 = lean_array_push(x_191, x_190);
-x_193 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_193, 0, x_159);
-lean_ctor_set(x_193, 1, x_192);
-x_194 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_194, 0, x_193);
-lean_ctor_set(x_194, 1, x_144);
-return x_194;
+x_157 = l_Lean_mkOptionalNode___closed__1;
+x_158 = lean_array_push(x_157, x_86);
+x_159 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_159, 0, x_14);
+lean_ctor_set(x_159, 1, x_158);
+x_160 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_161 = lean_array_push(x_160, x_159);
+x_162 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_163 = lean_array_push(x_161, x_162);
+lean_inc(x_163);
+x_164 = lean_array_push(x_163, x_83);
+x_165 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_166 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_166, 0, x_165);
+lean_ctor_set(x_166, 1, x_164);
+x_167 = lean_array_push(x_147, x_166);
+x_168 = lean_array_push(x_167, x_149);
+x_169 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_169, 0, x_14);
+lean_ctor_set(x_169, 1, x_168);
+x_170 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_171 = lean_array_push(x_170, x_169);
+x_172 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_173 = lean_array_push(x_171, x_172);
+x_174 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_175 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_175, 0, x_174);
+lean_ctor_set(x_175, 1, x_173);
+x_176 = lean_array_push(x_147, x_156);
+x_177 = lean_array_push(x_176, x_175);
+x_178 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_178, 0, x_155);
+lean_ctor_set(x_178, 1, x_177);
+x_179 = lean_array_push(x_163, x_85);
+x_180 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_180, 0, x_165);
+lean_ctor_set(x_180, 1, x_179);
+x_181 = lean_array_push(x_147, x_180);
+x_182 = lean_array_push(x_181, x_149);
+x_183 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_183, 0, x_14);
+lean_ctor_set(x_183, 1, x_182);
+x_184 = lean_array_push(x_170, x_183);
+x_185 = lean_array_push(x_184, x_172);
+x_186 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_186, 0, x_174);
+lean_ctor_set(x_186, 1, x_185);
+x_187 = lean_array_push(x_147, x_178);
+x_188 = lean_array_push(x_187, x_186);
+x_189 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_189, 0, x_155);
+lean_ctor_set(x_189, 1, x_188);
+x_190 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_190, 0, x_189);
+lean_ctor_set(x_190, 1, x_140);
+return x_190;
 }
 }
 }
@@ -1434,7 +1389,7 @@ lean_object* _init_l_Lean_Elab_Term_elabIf___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabIf___lambda__1), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabIf___lambda__1___boxed), 3, 0);
 return x_1;
 }
 }
@@ -1447,6 +1402,15 @@ x_6 = l_Lean_Elab_Term_adaptExpander(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
+lean_object* l_Lean_Elab_Term_elabIf___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Term_elabIf___lambda__1(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
 lean_object* _init_l___regBuiltinTermElab_Lean_Elab_Term_elabIf___closed__1() {
 _start:
 {
@@ -1487,37 +1451,27 @@ return x_5;
 lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_subtype___elambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__2() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("Subtype");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__3() {
+lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__2;
+x_1 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4() {
+lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__2;
+x_1 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__3;
+x_3 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -1525,13 +1479,25 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
+lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
 lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__2;
-x_3 = lean_name_mk_string(x_1, x_2);
+x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
@@ -1541,25 +1507,13 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__5;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__7() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__6;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__8() {
+lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -1571,7 +1525,7 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__9() {
+lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -1581,24 +1535,34 @@ x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__10() {
+lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Term_hole___elambda__1___closed__1;
-x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__9;
+x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__8;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
+lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__10() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__7;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
 lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__8;
+x_1 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__10;
+x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__9;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -1607,9 +1571,11 @@ lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__11;
-x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__10;
-x_3 = lean_array_push(x_1, x_2);
+x_1 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__11;
+x_3 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_3, 0, x_1);
+lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
@@ -1617,11 +1583,9 @@ lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_1 = l_Lean_mkOptionalNode___closed__1;
 x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__12;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_1);
-lean_ctor_set(x_3, 1, x_2);
+x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
@@ -1629,18 +1593,8 @@ lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__14() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_mkOptionalNode___closed__1;
-x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__13;
-x_3 = lean_array_push(x_1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__15() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_nullKind___closed__2;
-x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__14;
+x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__13;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -1656,433 +1610,431 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
+lean_object* x_6; 
+lean_dec(x_1);
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(6u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
 lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(6u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
+if (x_10 == 0)
 {
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
+lean_object* x_11; 
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = lean_unsigned_to_nat(2u);
 x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = lean_unsigned_to_nat(2u);
-x_17 = l_Lean_Syntax_getArg(x_1, x_16);
-x_18 = l_Lean_nullKind___closed__2;
-lean_inc(x_17);
-x_19 = l_Lean_Syntax_isOfKind(x_17, x_18);
-if (x_19 == 0)
+x_16 = l_Lean_nullKind___closed__2;
+lean_inc(x_15);
+x_17 = l_Lean_Syntax_isOfKind(x_15, x_16);
+if (x_17 == 0)
 {
-lean_object* x_20; lean_object* x_21; 
-lean_dec(x_17);
+lean_object* x_18; 
 lean_dec(x_15);
-x_20 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1;
-x_21 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_20, x_2, x_3);
-return x_21;
+lean_dec(x_13);
+lean_dec(x_1);
+x_18 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_18;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; uint8_t x_24; 
-x_22 = l_Lean_Syntax_getArgs(x_17);
-x_23 = lean_array_get_size(x_22);
-lean_dec(x_22);
-x_24 = lean_nat_dec_eq(x_23, x_14);
-if (x_24 == 0)
+lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+x_19 = l_Lean_Syntax_getArgs(x_15);
+x_20 = lean_array_get_size(x_19);
+lean_dec(x_19);
+x_21 = lean_nat_dec_eq(x_20, x_12);
+if (x_21 == 0)
 {
-lean_object* x_25; uint8_t x_26; 
-lean_dec(x_17);
-x_25 = lean_unsigned_to_nat(0u);
-x_26 = lean_nat_dec_eq(x_23, x_25);
-lean_dec(x_23);
-if (x_26 == 0)
-{
-lean_object* x_27; lean_object* x_28; 
+lean_object* x_22; uint8_t x_23; 
 lean_dec(x_15);
-x_27 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1;
-x_28 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_27, x_2, x_3);
+x_22 = lean_unsigned_to_nat(0u);
+x_23 = lean_nat_dec_eq(x_20, x_22);
+lean_dec(x_20);
+if (x_23 == 0)
+{
+lean_object* x_24; 
+lean_dec(x_13);
+lean_dec(x_1);
+x_24 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_24;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
+x_25 = lean_unsigned_to_nat(4u);
+x_26 = l_Lean_Syntax_getArg(x_1, x_25);
+lean_dec(x_1);
+x_27 = l_Lean_Elab_Term_mkTermIdFromIdent(x_13);
+x_28 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_29 = !lean_is_exclusive(x_28);
+if (x_29 == 0)
+{
+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; 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_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; 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; 
+x_30 = lean_ctor_get(x_28, 0);
+x_31 = lean_box(0);
+x_32 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4;
+x_33 = lean_name_mk_numeral(x_32, x_30);
+x_34 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__3;
+x_35 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__6;
+x_36 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_36, 0, x_31);
+lean_ctor_set(x_36, 1, x_34);
+lean_ctor_set(x_36, 2, x_33);
+lean_ctor_set(x_36, 3, x_35);
+x_37 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_38 = lean_array_push(x_37, x_36);
+x_39 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_40 = lean_array_push(x_38, x_39);
+x_41 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 1, x_40);
+x_43 = lean_array_push(x_37, x_27);
+x_44 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__14;
+x_45 = lean_array_push(x_43, x_44);
+x_46 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_46, 0, x_16);
+lean_ctor_set(x_46, 1, x_45);
+x_47 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_48 = lean_array_push(x_47, x_46);
+x_49 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_50 = lean_array_push(x_48, x_49);
+x_51 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_52 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_52, 0, x_51);
+lean_ctor_set(x_52, 1, x_50);
+x_53 = l_Lean_mkOptionalNode___closed__1;
+x_54 = lean_array_push(x_53, x_52);
+x_55 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_55, 0, x_16);
+lean_ctor_set(x_55, 1, x_54);
+x_56 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_57 = lean_array_push(x_56, x_55);
+x_58 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_59 = lean_array_push(x_57, x_58);
+x_60 = lean_array_push(x_59, x_26);
+x_61 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_61);
+lean_ctor_set(x_62, 1, x_60);
+x_63 = lean_array_push(x_37, x_62);
+x_64 = lean_array_push(x_63, x_39);
+x_65 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_65, 0, x_16);
+lean_ctor_set(x_65, 1, x_64);
+x_66 = lean_array_push(x_47, x_65);
+x_67 = lean_array_push(x_66, x_49);
+x_68 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_68, 0, x_51);
+lean_ctor_set(x_68, 1, x_67);
+x_69 = lean_array_push(x_37, x_42);
+x_70 = lean_array_push(x_69, x_68);
+x_71 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_72 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_72, 0, x_71);
+lean_ctor_set(x_72, 1, x_70);
+lean_ctor_set(x_28, 0, x_72);
 return x_28;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-x_29 = lean_unsigned_to_nat(4u);
-x_30 = l_Lean_Syntax_getArg(x_1, x_29);
-lean_dec(x_1);
-x_31 = l_Lean_Elab_Term_mkTermIdFromIdent(x_15);
-x_32 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_33 = !lean_is_exclusive(x_32);
-if (x_33 == 0)
-{
-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_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; 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; lean_object* x_76; 
-x_34 = lean_ctor_get(x_32, 0);
-x_35 = lean_box(0);
-x_36 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__5;
-x_37 = lean_name_mk_numeral(x_36, x_34);
-x_38 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4;
-x_39 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__7;
-x_40 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_40, 0, x_35);
-lean_ctor_set(x_40, 1, x_38);
-lean_ctor_set(x_40, 2, x_37);
-lean_ctor_set(x_40, 3, x_39);
-x_41 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_42 = lean_array_push(x_41, x_40);
-x_43 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_44 = lean_array_push(x_42, x_43);
-x_45 = l_Lean_Parser_Term_id___elambda__1___closed__2;
-x_46 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_46, 0, x_45);
-lean_ctor_set(x_46, 1, x_44);
-x_47 = lean_array_push(x_41, x_31);
-x_48 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__15;
-x_49 = lean_array_push(x_47, x_48);
-x_50 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_50, 0, x_18);
-lean_ctor_set(x_50, 1, x_49);
-x_51 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_52 = lean_array_push(x_51, x_50);
-x_53 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_54 = lean_array_push(x_52, x_53);
-x_55 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_56 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_56, 0, x_55);
-lean_ctor_set(x_56, 1, x_54);
-x_57 = l_Lean_mkOptionalNode___closed__1;
-x_58 = lean_array_push(x_57, x_56);
-x_59 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_59, 0, x_18);
-lean_ctor_set(x_59, 1, x_58);
-x_60 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_61 = lean_array_push(x_60, x_59);
-x_62 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_63 = lean_array_push(x_61, x_62);
-x_64 = lean_array_push(x_63, x_30);
-x_65 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_66 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_66, 0, x_65);
-lean_ctor_set(x_66, 1, x_64);
-x_67 = lean_array_push(x_41, x_66);
-x_68 = lean_array_push(x_67, x_43);
-x_69 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_69, 0, x_18);
-lean_ctor_set(x_69, 1, x_68);
-x_70 = lean_array_push(x_51, x_69);
-x_71 = lean_array_push(x_70, x_53);
-x_72 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_72, 0, x_55);
-lean_ctor_set(x_72, 1, x_71);
-x_73 = lean_array_push(x_41, x_46);
-x_74 = lean_array_push(x_73, x_72);
-x_75 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_76 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_76, 0, x_75);
-lean_ctor_set(x_76, 1, x_74);
-lean_ctor_set(x_32, 0, x_76);
-return x_32;
-}
-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_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 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; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 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_119; lean_object* x_120; lean_object* x_121; 
-x_77 = lean_ctor_get(x_32, 0);
-x_78 = lean_ctor_get(x_32, 1);
-lean_inc(x_78);
-lean_inc(x_77);
-lean_dec(x_32);
-x_79 = lean_box(0);
-x_80 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__5;
-x_81 = lean_name_mk_numeral(x_80, x_77);
-x_82 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4;
-x_83 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__7;
-x_84 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_84, 0, x_79);
-lean_ctor_set(x_84, 1, x_82);
-lean_ctor_set(x_84, 2, x_81);
-lean_ctor_set(x_84, 3, x_83);
-x_85 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_86 = lean_array_push(x_85, x_84);
-x_87 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_88 = lean_array_push(x_86, x_87);
-x_89 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+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; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 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; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 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; 
+x_73 = lean_ctor_get(x_28, 0);
+x_74 = lean_ctor_get(x_28, 1);
+lean_inc(x_74);
+lean_inc(x_73);
+lean_dec(x_28);
+x_75 = lean_box(0);
+x_76 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4;
+x_77 = lean_name_mk_numeral(x_76, x_73);
+x_78 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__3;
+x_79 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__6;
+x_80 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_80, 0, x_75);
+lean_ctor_set(x_80, 1, x_78);
+lean_ctor_set(x_80, 2, x_77);
+lean_ctor_set(x_80, 3, x_79);
+x_81 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_82 = lean_array_push(x_81, x_80);
+x_83 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_84 = lean_array_push(x_82, x_83);
+x_85 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_86 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_86, 0, x_85);
+lean_ctor_set(x_86, 1, x_84);
+x_87 = lean_array_push(x_81, x_27);
+x_88 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__14;
+x_89 = lean_array_push(x_87, x_88);
 x_90 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_90, 0, x_89);
-lean_ctor_set(x_90, 1, x_88);
-x_91 = lean_array_push(x_85, x_31);
-x_92 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__15;
-x_93 = lean_array_push(x_91, x_92);
-x_94 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_94, 0, x_18);
-lean_ctor_set(x_94, 1, x_93);
-x_95 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_96 = lean_array_push(x_95, x_94);
-x_97 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_98 = lean_array_push(x_96, x_97);
-x_99 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_100 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_100, 0, x_99);
-lean_ctor_set(x_100, 1, x_98);
-x_101 = l_Lean_mkOptionalNode___closed__1;
-x_102 = lean_array_push(x_101, x_100);
-x_103 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_103, 0, x_18);
-lean_ctor_set(x_103, 1, x_102);
-x_104 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_105 = lean_array_push(x_104, x_103);
-x_106 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_107 = lean_array_push(x_105, x_106);
-x_108 = lean_array_push(x_107, x_30);
-x_109 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_110 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_110, 0, x_109);
-lean_ctor_set(x_110, 1, x_108);
-x_111 = lean_array_push(x_85, x_110);
-x_112 = lean_array_push(x_111, x_87);
-x_113 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_113, 0, x_18);
-lean_ctor_set(x_113, 1, x_112);
-x_114 = lean_array_push(x_95, x_113);
-x_115 = lean_array_push(x_114, x_97);
+lean_ctor_set(x_90, 0, x_16);
+lean_ctor_set(x_90, 1, x_89);
+x_91 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_92 = lean_array_push(x_91, x_90);
+x_93 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_94 = lean_array_push(x_92, x_93);
+x_95 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_96 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_96, 0, x_95);
+lean_ctor_set(x_96, 1, x_94);
+x_97 = l_Lean_mkOptionalNode___closed__1;
+x_98 = lean_array_push(x_97, x_96);
+x_99 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_99, 0, x_16);
+lean_ctor_set(x_99, 1, x_98);
+x_100 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_101 = lean_array_push(x_100, x_99);
+x_102 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_103 = lean_array_push(x_101, x_102);
+x_104 = lean_array_push(x_103, x_26);
+x_105 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_106 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_106, 0, x_105);
+lean_ctor_set(x_106, 1, x_104);
+x_107 = lean_array_push(x_81, x_106);
+x_108 = lean_array_push(x_107, x_83);
+x_109 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_109, 0, x_16);
+lean_ctor_set(x_109, 1, x_108);
+x_110 = lean_array_push(x_91, x_109);
+x_111 = lean_array_push(x_110, x_93);
+x_112 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_112, 0, x_95);
+lean_ctor_set(x_112, 1, x_111);
+x_113 = lean_array_push(x_81, x_86);
+x_114 = lean_array_push(x_113, x_112);
+x_115 = l_Lean_Parser_Term_app___elambda__1___closed__2;
 x_116 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_116, 0, x_99);
-lean_ctor_set(x_116, 1, x_115);
-x_117 = lean_array_push(x_85, x_90);
-x_118 = lean_array_push(x_117, x_116);
-x_119 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_120 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_120, 0, x_119);
-lean_ctor_set(x_120, 1, x_118);
-x_121 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_121, 0, x_120);
-lean_ctor_set(x_121, 1, x_78);
-return x_121;
+lean_ctor_set(x_116, 0, x_115);
+lean_ctor_set(x_116, 1, x_114);
+x_117 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_117, 0, x_116);
+lean_ctor_set(x_117, 1, x_74);
+return x_117;
 }
 }
 }
 else
 {
-lean_object* x_122; lean_object* x_123; lean_object* x_124; uint8_t x_125; 
-lean_dec(x_23);
-x_122 = lean_unsigned_to_nat(0u);
-x_123 = l_Lean_Syntax_getArg(x_17, x_122);
-lean_dec(x_17);
-x_124 = l_Lean_Parser_Term_typeSpec___elambda__1___closed__2;
-lean_inc(x_123);
-x_125 = l_Lean_Syntax_isOfKind(x_123, x_124);
+lean_object* x_118; lean_object* x_119; lean_object* x_120; uint8_t x_121; 
+lean_dec(x_20);
+x_118 = lean_unsigned_to_nat(0u);
+x_119 = l_Lean_Syntax_getArg(x_15, x_118);
+lean_dec(x_15);
+x_120 = l_Lean_Parser_Term_typeSpec___elambda__1___closed__2;
+lean_inc(x_119);
+x_121 = l_Lean_Syntax_isOfKind(x_119, x_120);
+if (x_121 == 0)
+{
+lean_object* x_122; 
+lean_dec(x_119);
+lean_dec(x_13);
+lean_dec(x_1);
+x_122 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_122;
+}
+else
+{
+lean_object* x_123; lean_object* x_124; uint8_t x_125; 
+x_123 = l_Lean_Syntax_getArgs(x_119);
+x_124 = lean_array_get_size(x_123);
+lean_dec(x_123);
+x_125 = lean_nat_dec_eq(x_124, x_14);
+lean_dec(x_124);
 if (x_125 == 0)
 {
-lean_object* x_126; lean_object* x_127; 
-lean_dec(x_123);
-lean_dec(x_15);
-x_126 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1;
-x_127 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_126, x_2, x_3);
-return x_127;
-}
-else
-{
-lean_object* x_128; lean_object* x_129; uint8_t x_130; 
-x_128 = l_Lean_Syntax_getArgs(x_123);
-x_129 = lean_array_get_size(x_128);
-lean_dec(x_128);
-x_130 = lean_nat_dec_eq(x_129, x_16);
-lean_dec(x_129);
-if (x_130 == 0)
-{
-lean_object* x_131; lean_object* x_132; 
-lean_dec(x_123);
-lean_dec(x_15);
-x_131 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__1;
-x_132 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_131, x_2, x_3);
-return x_132;
-}
-else
-{
-lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; uint8_t x_138; 
-x_133 = l_Lean_Syntax_getArg(x_123, x_14);
-lean_dec(x_123);
-x_134 = lean_unsigned_to_nat(4u);
-x_135 = l_Lean_Syntax_getArg(x_1, x_134);
+lean_object* x_126; 
+lean_dec(x_119);
+lean_dec(x_13);
 lean_dec(x_1);
-x_136 = l_Lean_Elab_Term_mkTermIdFromIdent(x_15);
-x_137 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_138 = !lean_is_exclusive(x_137);
-if (x_138 == 0)
-{
-lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 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_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 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_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; 
-x_139 = lean_ctor_get(x_137, 0);
-x_140 = lean_box(0);
-x_141 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__5;
-x_142 = lean_name_mk_numeral(x_141, x_139);
-x_143 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4;
-x_144 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__7;
-x_145 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_145, 0, x_140);
-lean_ctor_set(x_145, 1, x_143);
-lean_ctor_set(x_145, 2, x_142);
-lean_ctor_set(x_145, 3, x_144);
-x_146 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_147 = lean_array_push(x_146, x_145);
-x_148 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_149 = lean_array_push(x_147, x_148);
-x_150 = l_Lean_Parser_Term_id___elambda__1___closed__2;
-x_151 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_151, 0, x_150);
-lean_ctor_set(x_151, 1, x_149);
-x_152 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__11;
-x_153 = lean_array_push(x_152, x_133);
-x_154 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
-x_155 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_155, 0, x_154);
-lean_ctor_set(x_155, 1, x_153);
-x_156 = l_Lean_mkOptionalNode___closed__1;
-x_157 = lean_array_push(x_156, x_155);
-x_158 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_158, 0, x_18);
-lean_ctor_set(x_158, 1, x_157);
-x_159 = lean_array_push(x_146, x_136);
-x_160 = lean_array_push(x_159, x_158);
-x_161 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_161, 0, x_18);
-lean_ctor_set(x_161, 1, x_160);
-x_162 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_163 = lean_array_push(x_162, x_161);
-x_164 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_165 = lean_array_push(x_163, x_164);
-x_166 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_167 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_167, 0, x_166);
-lean_ctor_set(x_167, 1, x_165);
-x_168 = lean_array_push(x_156, x_167);
-x_169 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_169, 0, x_18);
-lean_ctor_set(x_169, 1, x_168);
-x_170 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_171 = lean_array_push(x_170, x_169);
-x_172 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_173 = lean_array_push(x_171, x_172);
-x_174 = lean_array_push(x_173, x_135);
-x_175 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_176 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_176, 0, x_175);
-lean_ctor_set(x_176, 1, x_174);
-x_177 = lean_array_push(x_146, x_176);
-x_178 = lean_array_push(x_177, x_148);
-x_179 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_179, 0, x_18);
-lean_ctor_set(x_179, 1, x_178);
-x_180 = lean_array_push(x_162, x_179);
-x_181 = lean_array_push(x_180, x_164);
-x_182 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_182, 0, x_166);
-lean_ctor_set(x_182, 1, x_181);
-x_183 = lean_array_push(x_146, x_151);
-x_184 = lean_array_push(x_183, x_182);
-x_185 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_186 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_186, 0, x_185);
-lean_ctor_set(x_186, 1, x_184);
-lean_ctor_set(x_137, 0, x_186);
-return x_137;
+x_126 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_126;
 }
 else
 {
-lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* 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; 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; 
-x_187 = lean_ctor_get(x_137, 0);
-x_188 = lean_ctor_get(x_137, 1);
-lean_inc(x_188);
-lean_inc(x_187);
-lean_dec(x_137);
-x_189 = lean_box(0);
-x_190 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__5;
-x_191 = lean_name_mk_numeral(x_190, x_187);
-x_192 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4;
-x_193 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__7;
-x_194 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_194, 0, x_189);
+lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; uint8_t x_132; 
+x_127 = l_Lean_Syntax_getArg(x_119, x_12);
+lean_dec(x_119);
+x_128 = lean_unsigned_to_nat(4u);
+x_129 = l_Lean_Syntax_getArg(x_1, x_128);
+lean_dec(x_1);
+x_130 = l_Lean_Elab_Term_mkTermIdFromIdent(x_13);
+x_131 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_132 = !lean_is_exclusive(x_131);
+if (x_132 == 0)
+{
+lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 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_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 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_133 = lean_ctor_get(x_131, 0);
+x_134 = lean_box(0);
+x_135 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4;
+x_136 = lean_name_mk_numeral(x_135, x_133);
+x_137 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__3;
+x_138 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__6;
+x_139 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_139, 0, x_134);
+lean_ctor_set(x_139, 1, x_137);
+lean_ctor_set(x_139, 2, x_136);
+lean_ctor_set(x_139, 3, x_138);
+x_140 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_141 = lean_array_push(x_140, x_139);
+x_142 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_143 = lean_array_push(x_141, x_142);
+x_144 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_145 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_145, 0, x_144);
+lean_ctor_set(x_145, 1, x_143);
+x_146 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__10;
+x_147 = lean_array_push(x_146, x_127);
+x_148 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_149 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_149, 0, x_148);
+lean_ctor_set(x_149, 1, x_147);
+x_150 = l_Lean_mkOptionalNode___closed__1;
+x_151 = lean_array_push(x_150, x_149);
+x_152 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_152, 0, x_16);
+lean_ctor_set(x_152, 1, x_151);
+x_153 = lean_array_push(x_140, x_130);
+x_154 = lean_array_push(x_153, x_152);
+x_155 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_155, 0, x_16);
+lean_ctor_set(x_155, 1, x_154);
+x_156 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_157 = lean_array_push(x_156, x_155);
+x_158 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_159 = lean_array_push(x_157, x_158);
+x_160 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_161 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_161, 0, x_160);
+lean_ctor_set(x_161, 1, x_159);
+x_162 = lean_array_push(x_150, x_161);
+x_163 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_163, 0, x_16);
+lean_ctor_set(x_163, 1, x_162);
+x_164 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_165 = lean_array_push(x_164, x_163);
+x_166 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_167 = lean_array_push(x_165, x_166);
+x_168 = lean_array_push(x_167, x_129);
+x_169 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_170 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_170, 0, x_169);
+lean_ctor_set(x_170, 1, x_168);
+x_171 = lean_array_push(x_140, x_170);
+x_172 = lean_array_push(x_171, x_142);
+x_173 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_173, 0, x_16);
+lean_ctor_set(x_173, 1, x_172);
+x_174 = lean_array_push(x_156, x_173);
+x_175 = lean_array_push(x_174, x_158);
+x_176 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_176, 0, x_160);
+lean_ctor_set(x_176, 1, x_175);
+x_177 = lean_array_push(x_140, x_145);
+x_178 = lean_array_push(x_177, x_176);
+x_179 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_180 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_180, 0, x_179);
+lean_ctor_set(x_180, 1, x_178);
+lean_ctor_set(x_131, 0, x_180);
+return x_131;
+}
+else
+{
+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; lean_object* x_189; lean_object* x_190; lean_object* 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; 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; 
+x_181 = lean_ctor_get(x_131, 0);
+x_182 = lean_ctor_get(x_131, 1);
+lean_inc(x_182);
+lean_inc(x_181);
+lean_dec(x_131);
+x_183 = lean_box(0);
+x_184 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__4;
+x_185 = lean_name_mk_numeral(x_184, x_181);
+x_186 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__3;
+x_187 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__6;
+x_188 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_188, 0, x_183);
+lean_ctor_set(x_188, 1, x_186);
+lean_ctor_set(x_188, 2, x_185);
+lean_ctor_set(x_188, 3, x_187);
+x_189 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_190 = lean_array_push(x_189, x_188);
+x_191 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_192 = lean_array_push(x_190, x_191);
+x_193 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_194 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_194, 0, x_193);
 lean_ctor_set(x_194, 1, x_192);
-lean_ctor_set(x_194, 2, x_191);
-lean_ctor_set(x_194, 3, x_193);
-x_195 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_196 = lean_array_push(x_195, x_194);
-x_197 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_198 = lean_array_push(x_196, x_197);
-x_199 = l_Lean_Parser_Term_id___elambda__1___closed__2;
-x_200 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_200, 0, x_199);
-lean_ctor_set(x_200, 1, x_198);
-x_201 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__11;
-x_202 = lean_array_push(x_201, x_133);
-x_203 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_195 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__10;
+x_196 = lean_array_push(x_195, x_127);
+x_197 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_198 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_198, 0, x_197);
+lean_ctor_set(x_198, 1, x_196);
+x_199 = l_Lean_mkOptionalNode___closed__1;
+x_200 = lean_array_push(x_199, x_198);
+x_201 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_201, 0, x_16);
+lean_ctor_set(x_201, 1, x_200);
+x_202 = lean_array_push(x_189, x_130);
+x_203 = lean_array_push(x_202, x_201);
 x_204 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_204, 0, x_203);
-lean_ctor_set(x_204, 1, x_202);
-x_205 = l_Lean_mkOptionalNode___closed__1;
+lean_ctor_set(x_204, 0, x_16);
+lean_ctor_set(x_204, 1, x_203);
+x_205 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
 x_206 = lean_array_push(x_205, x_204);
-x_207 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_207, 0, x_18);
-lean_ctor_set(x_207, 1, x_206);
-x_208 = lean_array_push(x_195, x_136);
-x_209 = lean_array_push(x_208, x_207);
+x_207 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_208 = lean_array_push(x_206, x_207);
+x_209 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_210 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_210, 0, x_18);
-lean_ctor_set(x_210, 1, x_209);
-x_211 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_212 = lean_array_push(x_211, x_210);
-x_213 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_214 = lean_array_push(x_212, x_213);
-x_215 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_216 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_216, 0, x_215);
-lean_ctor_set(x_216, 1, x_214);
-x_217 = lean_array_push(x_205, x_216);
-x_218 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_218, 0, x_18);
-lean_ctor_set(x_218, 1, x_217);
-x_219 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_220 = lean_array_push(x_219, x_218);
-x_221 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_222 = lean_array_push(x_220, x_221);
-x_223 = lean_array_push(x_222, x_135);
-x_224 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+lean_ctor_set(x_210, 0, x_209);
+lean_ctor_set(x_210, 1, x_208);
+x_211 = lean_array_push(x_199, x_210);
+x_212 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_212, 0, x_16);
+lean_ctor_set(x_212, 1, x_211);
+x_213 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_214 = lean_array_push(x_213, x_212);
+x_215 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_216 = lean_array_push(x_214, x_215);
+x_217 = lean_array_push(x_216, x_129);
+x_218 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_219 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_219, 0, x_218);
+lean_ctor_set(x_219, 1, x_217);
+x_220 = lean_array_push(x_189, x_219);
+x_221 = lean_array_push(x_220, x_191);
+x_222 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_222, 0, x_16);
+lean_ctor_set(x_222, 1, x_221);
+x_223 = lean_array_push(x_205, x_222);
+x_224 = lean_array_push(x_223, x_207);
 x_225 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_225, 0, x_224);
-lean_ctor_set(x_225, 1, x_223);
-x_226 = lean_array_push(x_195, x_225);
-x_227 = lean_array_push(x_226, x_197);
-x_228 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_228, 0, x_18);
-lean_ctor_set(x_228, 1, x_227);
-x_229 = lean_array_push(x_211, x_228);
-x_230 = lean_array_push(x_229, x_213);
-x_231 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_231, 0, x_215);
-lean_ctor_set(x_231, 1, x_230);
-x_232 = lean_array_push(x_195, x_200);
-x_233 = lean_array_push(x_232, x_231);
-x_234 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_235 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_235, 0, x_234);
-lean_ctor_set(x_235, 1, x_233);
-x_236 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_236, 0, x_235);
-lean_ctor_set(x_236, 1, x_188);
-return x_236;
+lean_ctor_set(x_225, 0, x_209);
+lean_ctor_set(x_225, 1, x_224);
+x_226 = lean_array_push(x_189, x_194);
+x_227 = lean_array_push(x_226, x_225);
+x_228 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_229 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_229, 0, x_228);
+lean_ctor_set(x_229, 1, x_227);
+x_230 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_230, 0, x_229);
+lean_ctor_set(x_230, 1, x_182);
+return x_230;
 }
 }
 }
@@ -2096,7 +2048,7 @@ lean_object* _init_l_Lean_Elab_Term_elabSubtype___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabSubtype___lambda__1), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabSubtype___lambda__1___boxed), 3, 0);
 return x_1;
 }
 }
@@ -2109,6 +2061,15 @@ x_6 = l_Lean_Elab_Term_adaptExpander(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
+lean_object* l_Lean_Elab_Term_elabSubtype___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Term_elabSubtype___lambda__1(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
 lean_object* _init_l___regBuiltinTermElab_Lean_Elab_Term_elabSubtype___closed__1() {
 _start:
 {
@@ -2404,53 +2365,47 @@ return x_49;
 }
 else
 {
-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; uint8_t x_60; 
+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; uint8_t x_58; 
 lean_dec(x_23);
-x_50 = lean_ctor_get(x_1, 1);
-lean_inc(x_50);
-x_51 = l_List_head_x21___at_Lean_Elab_Term_elabAnoymousCtor___spec__1(x_39);
+x_50 = l_List_head_x21___at_Lean_Elab_Term_elabAnoymousCtor___spec__1(x_39);
 lean_dec(x_39);
-x_52 = l_Lean_Elab_Term_mkTermId(x_1, x_51);
-x_53 = l_Lean_stxInh;
-x_54 = lean_array_get(x_53, x_50, x_42);
-lean_dec(x_50);
-x_55 = l_Lean_Syntax_getArgs(x_54);
-lean_dec(x_54);
-x_56 = lean_unsigned_to_nat(2u);
-x_57 = l_Array_empty___closed__1;
-x_58 = l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(x_56, x_55, x_40, x_57);
-lean_dec(x_55);
-x_59 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1(x_58, x_58, x_40, x_52);
-lean_dec(x_58);
-x_60 = !lean_is_exclusive(x_3);
-if (x_60 == 0)
+x_51 = l_Lean_Elab_Term_mkTermId(x_1, x_50);
+x_52 = l_Lean_Syntax_getArg(x_1, x_42);
+x_53 = l_Lean_Syntax_getArgs(x_52);
+lean_dec(x_52);
+x_54 = lean_unsigned_to_nat(2u);
+x_55 = l_Array_empty___closed__1;
+x_56 = l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(x_54, x_53, x_40, x_55);
+lean_dec(x_53);
+x_57 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1(x_56, x_56, x_40, x_51);
+lean_dec(x_56);
+x_58 = !lean_is_exclusive(x_3);
+if (x_58 == 0)
 {
-lean_object* x_61; lean_object* x_62; uint8_t x_63; lean_object* x_64; 
-x_61 = lean_ctor_get(x_3, 8);
-x_62 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_62, 0, x_1);
-lean_ctor_set(x_62, 1, x_61);
-lean_ctor_set(x_3, 8, x_62);
-x_63 = 1;
-x_64 = l_Lean_Elab_Term_elabTerm(x_59, x_2, x_63, x_63, x_3, x_26);
-return x_64;
+lean_object* x_59; lean_object* x_60; uint8_t x_61; lean_object* x_62; 
+x_59 = lean_ctor_get(x_3, 8);
+x_60 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_60, 0, x_1);
+lean_ctor_set(x_60, 1, x_59);
+lean_ctor_set(x_3, 8, x_60);
+x_61 = 1;
+x_62 = l_Lean_Elab_Term_elabTerm(x_57, x_2, x_61, x_61, x_3, x_26);
+return x_62;
 }
 else
 {
-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; uint8_t x_75; lean_object* x_76; lean_object* x_77; uint8_t x_78; lean_object* x_79; 
-x_65 = lean_ctor_get(x_3, 0);
-x_66 = lean_ctor_get(x_3, 1);
-x_67 = lean_ctor_get(x_3, 2);
-x_68 = lean_ctor_get(x_3, 3);
-x_69 = lean_ctor_get(x_3, 4);
-x_70 = lean_ctor_get(x_3, 5);
-x_71 = lean_ctor_get(x_3, 6);
-x_72 = lean_ctor_get(x_3, 7);
-x_73 = lean_ctor_get(x_3, 8);
-x_74 = lean_ctor_get(x_3, 9);
-x_75 = lean_ctor_get_uint8(x_3, sizeof(void*)*10);
-lean_inc(x_74);
-lean_inc(x_73);
+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; uint8_t x_73; lean_object* x_74; lean_object* x_75; uint8_t x_76; lean_object* x_77; 
+x_63 = lean_ctor_get(x_3, 0);
+x_64 = lean_ctor_get(x_3, 1);
+x_65 = lean_ctor_get(x_3, 2);
+x_66 = lean_ctor_get(x_3, 3);
+x_67 = lean_ctor_get(x_3, 4);
+x_68 = lean_ctor_get(x_3, 5);
+x_69 = lean_ctor_get(x_3, 6);
+x_70 = lean_ctor_get(x_3, 7);
+x_71 = lean_ctor_get(x_3, 8);
+x_72 = lean_ctor_get(x_3, 9);
+x_73 = lean_ctor_get_uint8(x_3, sizeof(void*)*10);
 lean_inc(x_72);
 lean_inc(x_71);
 lean_inc(x_70);
@@ -2459,35 +2414,37 @@ lean_inc(x_68);
 lean_inc(x_67);
 lean_inc(x_66);
 lean_inc(x_65);
+lean_inc(x_64);
+lean_inc(x_63);
 lean_dec(x_3);
-x_76 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_76, 0, x_1);
-lean_ctor_set(x_76, 1, x_73);
-x_77 = lean_alloc_ctor(0, 10, 1);
-lean_ctor_set(x_77, 0, x_65);
-lean_ctor_set(x_77, 1, x_66);
-lean_ctor_set(x_77, 2, x_67);
-lean_ctor_set(x_77, 3, x_68);
-lean_ctor_set(x_77, 4, x_69);
-lean_ctor_set(x_77, 5, x_70);
-lean_ctor_set(x_77, 6, x_71);
-lean_ctor_set(x_77, 7, x_72);
-lean_ctor_set(x_77, 8, x_76);
-lean_ctor_set(x_77, 9, x_74);
-lean_ctor_set_uint8(x_77, sizeof(void*)*10, x_75);
-x_78 = 1;
-x_79 = l_Lean_Elab_Term_elabTerm(x_59, x_2, x_78, x_78, x_77, x_26);
-return x_79;
+x_74 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_74, 0, x_1);
+lean_ctor_set(x_74, 1, x_71);
+x_75 = lean_alloc_ctor(0, 10, 1);
+lean_ctor_set(x_75, 0, x_63);
+lean_ctor_set(x_75, 1, x_64);
+lean_ctor_set(x_75, 2, x_65);
+lean_ctor_set(x_75, 3, x_66);
+lean_ctor_set(x_75, 4, x_67);
+lean_ctor_set(x_75, 5, x_68);
+lean_ctor_set(x_75, 6, x_69);
+lean_ctor_set(x_75, 7, x_70);
+lean_ctor_set(x_75, 8, x_74);
+lean_ctor_set(x_75, 9, x_72);
+lean_ctor_set_uint8(x_75, sizeof(void*)*10, x_73);
+x_76 = 1;
+x_77 = l_Lean_Elab_Term_elabTerm(x_57, x_2, x_76, x_76, x_75, x_26);
+return x_77;
 }
 }
 }
 else
 {
-lean_object* x_80; 
+lean_object* x_78; 
 lean_dec(x_37);
 lean_dec(x_2);
-x_80 = lean_box(0);
-x_27 = x_80;
+x_78 = lean_box(0);
+x_27 = x_78;
 goto block_34;
 }
 }
@@ -2511,11 +2468,11 @@ return x_33;
 }
 else
 {
-lean_object* x_81; 
+lean_object* x_79; 
 lean_dec(x_22);
 lean_dec(x_2);
-x_81 = lean_box(0);
-x_15 = x_81;
+x_79 = lean_box(0);
+x_15 = x_79;
 goto block_21;
 }
 block_21:
@@ -2536,27 +2493,27 @@ return x_20;
 }
 else
 {
-uint8_t x_82; 
+uint8_t x_80; 
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_82 = !lean_is_exclusive(x_5);
-if (x_82 == 0)
+x_80 = !lean_is_exclusive(x_5);
+if (x_80 == 0)
 {
 return x_5;
 }
 else
 {
-lean_object* x_83; lean_object* x_84; lean_object* x_85; 
-x_83 = lean_ctor_get(x_5, 0);
-x_84 = lean_ctor_get(x_5, 1);
-lean_inc(x_84);
-lean_inc(x_83);
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = lean_ctor_get(x_5, 0);
+x_82 = lean_ctor_get(x_5, 1);
+lean_inc(x_82);
+lean_inc(x_81);
 lean_dec(x_5);
-x_85 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_85, 0, x_83);
-lean_ctor_set(x_85, 1, x_84);
-return x_85;
+x_83 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_83, 0, x_81);
+lean_ctor_set(x_83, 1, x_82);
+return x_83;
 }
 }
 }
@@ -2611,44 +2568,26 @@ lean_object* _init_l_Lean_Elab_Term_elabShow___lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("show-from");
+x_1 = lean_mk_string("this");
 return x_1;
 }
 }
 lean_object* _init_l_Lean_Elab_Term_elabShow___lambda__1___closed__2() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabShow___lambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Term_elabShow___lambda__1___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
 }
 }
 lean_object* _init_l_Lean_Elab_Term_elabShow___lambda__1___closed__3() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("this");
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabShow___lambda__1___closed__4() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
-x_3 = lean_name_mk_string(x_1, x_2);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabShow___lambda__1___closed__5() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__8;
+x_2 = l_Lean_Elab_Term_elabSubtype___lambda__1___closed__7;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -2662,206 +2601,205 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabShow___lambda__1___closed__2;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
+lean_object* x_6; 
+lean_dec(x_1);
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(3u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
 lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(3u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
+if (x_10 == 0)
 {
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabShow___lambda__1___closed__2;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
+lean_object* x_11; 
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(1u);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = lean_unsigned_to_nat(2u);
 x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = lean_unsigned_to_nat(2u);
-x_17 = l_Lean_Syntax_getArg(x_1, x_16);
-x_18 = l_Lean_Parser_Term_fromTerm___elambda__1___closed__2;
-lean_inc(x_17);
-x_19 = l_Lean_Syntax_isOfKind(x_17, x_18);
-if (x_19 == 0)
+x_16 = l_Lean_Parser_Term_fromTerm___elambda__1___closed__2;
+lean_inc(x_15);
+x_17 = l_Lean_Syntax_isOfKind(x_15, x_16);
+if (x_17 == 0)
 {
-lean_object* x_20; lean_object* x_21; 
-lean_dec(x_17);
+lean_object* x_18; 
 lean_dec(x_15);
-x_20 = l_Lean_Elab_Term_elabShow___lambda__1___closed__2;
-x_21 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_20, x_2, x_3);
-return x_21;
+lean_dec(x_13);
+lean_dec(x_1);
+x_18 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_18;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; uint8_t x_24; 
-x_22 = l_Lean_Syntax_getArgs(x_17);
-x_23 = lean_array_get_size(x_22);
-lean_dec(x_22);
-x_24 = lean_nat_dec_eq(x_23, x_16);
-lean_dec(x_23);
-if (x_24 == 0)
+lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+x_19 = l_Lean_Syntax_getArgs(x_15);
+x_20 = lean_array_get_size(x_19);
+lean_dec(x_19);
+x_21 = lean_nat_dec_eq(x_20, x_14);
+lean_dec(x_20);
+if (x_21 == 0)
 {
-lean_object* x_25; lean_object* x_26; 
-lean_dec(x_17);
+lean_object* x_22; 
 lean_dec(x_15);
-x_25 = l_Lean_Elab_Term_elabShow___lambda__1___closed__2;
-x_26 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_25, x_2, x_3);
+lean_dec(x_13);
+lean_dec(x_1);
+x_22 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_22;
+}
+else
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; 
+x_23 = l_Lean_Syntax_getArg(x_15, x_12);
+lean_dec(x_15);
+x_24 = l_Lean_Elab_Term_elabShow___lambda__1___closed__2;
+x_25 = l_Lean_Elab_Term_mkTermId(x_1, x_24);
+lean_dec(x_1);
+x_26 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_27 = !lean_is_exclusive(x_26);
+if (x_27 == 0)
+{
+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; 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_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; lean_object* x_65; lean_object* x_66; 
+x_28 = lean_ctor_get(x_26, 0);
+lean_dec(x_28);
+x_29 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_30 = lean_array_push(x_29, x_13);
+x_31 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_31);
+lean_ctor_set(x_32, 1, x_30);
+x_33 = l_Lean_mkOptionalNode___closed__1;
+x_34 = lean_array_push(x_33, x_32);
+x_35 = l_Lean_nullKind___closed__2;
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_34);
+x_37 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+lean_inc(x_25);
+x_38 = lean_array_push(x_37, x_25);
+x_39 = lean_array_push(x_38, x_36);
+x_40 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_40, 0, x_35);
+lean_ctor_set(x_40, 1, x_39);
+x_41 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_42 = lean_array_push(x_41, x_40);
+x_43 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_44 = lean_array_push(x_42, x_43);
+x_45 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_46 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_46, 0, x_45);
+lean_ctor_set(x_46, 1, x_44);
+x_47 = lean_array_push(x_33, x_46);
+x_48 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_48, 0, x_35);
+lean_ctor_set(x_48, 1, x_47);
+x_49 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_50 = lean_array_push(x_49, x_48);
+x_51 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_52 = lean_array_push(x_50, x_51);
+x_53 = lean_array_push(x_52, x_25);
+x_54 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_55 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_55, 0, x_54);
+lean_ctor_set(x_55, 1, x_53);
+x_56 = lean_array_push(x_37, x_55);
+x_57 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_58 = lean_array_push(x_56, x_57);
+x_59 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_59, 0, x_35);
+lean_ctor_set(x_59, 1, x_58);
+x_60 = lean_array_push(x_41, x_59);
+x_61 = lean_array_push(x_60, x_43);
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_45);
+lean_ctor_set(x_62, 1, x_61);
+x_63 = lean_array_push(x_37, x_62);
+x_64 = lean_array_push(x_63, x_23);
+x_65 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_66 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_66, 0, x_65);
+lean_ctor_set(x_66, 1, x_64);
+lean_ctor_set(x_26, 0, x_66);
 return x_26;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_27 = l_Lean_Syntax_getArg(x_17, x_14);
-lean_dec(x_17);
-x_28 = l_Lean_Elab_Term_elabShow___lambda__1___closed__4;
-x_29 = l_Lean_Elab_Term_mkTermId(x_1, x_28);
-lean_dec(x_1);
-x_30 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_31 = !lean_is_exclusive(x_30);
-if (x_31 == 0)
-{
-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; 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_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; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_32 = lean_ctor_get(x_30, 0);
-lean_dec(x_32);
-x_33 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_34 = lean_array_push(x_33, x_15);
-x_35 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
-x_36 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_34);
-x_37 = l_Lean_mkOptionalNode___closed__1;
-x_38 = lean_array_push(x_37, x_36);
-x_39 = l_Lean_nullKind___closed__2;
-x_40 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_38);
-x_41 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-lean_inc(x_29);
-x_42 = lean_array_push(x_41, x_29);
-x_43 = lean_array_push(x_42, x_40);
-x_44 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_44, 0, x_39);
-lean_ctor_set(x_44, 1, x_43);
-x_45 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_46 = lean_array_push(x_45, x_44);
-x_47 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_48 = lean_array_push(x_46, x_47);
-x_49 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_50 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_50, 0, x_49);
-lean_ctor_set(x_50, 1, x_48);
-x_51 = lean_array_push(x_37, x_50);
-x_52 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_52, 0, x_39);
-lean_ctor_set(x_52, 1, x_51);
-x_53 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_54 = lean_array_push(x_53, x_52);
-x_55 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_56 = lean_array_push(x_54, x_55);
-x_57 = lean_array_push(x_56, x_29);
-x_58 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_59 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_59, 0, x_58);
-lean_ctor_set(x_59, 1, x_57);
-x_60 = lean_array_push(x_41, x_59);
-x_61 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_62 = lean_array_push(x_60, x_61);
-x_63 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_63, 0, x_39);
-lean_ctor_set(x_63, 1, x_62);
-x_64 = lean_array_push(x_45, x_63);
-x_65 = lean_array_push(x_64, x_47);
-x_66 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_66, 0, x_49);
-lean_ctor_set(x_66, 1, x_65);
-x_67 = lean_array_push(x_41, x_66);
-x_68 = lean_array_push(x_67, x_27);
-x_69 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_70 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_70, 0, x_69);
-lean_ctor_set(x_70, 1, x_68);
-lean_ctor_set(x_30, 0, x_70);
-return x_30;
-}
-else
-{
-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_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; 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; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; 
-x_71 = lean_ctor_get(x_30, 1);
-lean_inc(x_71);
-lean_dec(x_30);
-x_72 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_73 = lean_array_push(x_72, x_15);
-x_74 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+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; 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; lean_object* x_89; 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; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; 
+x_67 = lean_ctor_get(x_26, 1);
+lean_inc(x_67);
+lean_dec(x_26);
+x_68 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_69 = lean_array_push(x_68, x_13);
+x_70 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_70);
+lean_ctor_set(x_71, 1, x_69);
+x_72 = l_Lean_mkOptionalNode___closed__1;
+x_73 = lean_array_push(x_72, x_71);
+x_74 = l_Lean_nullKind___closed__2;
 x_75 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_75, 0, x_74);
 lean_ctor_set(x_75, 1, x_73);
-x_76 = l_Lean_mkOptionalNode___closed__1;
-x_77 = lean_array_push(x_76, x_75);
-x_78 = l_Lean_nullKind___closed__2;
+x_76 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+lean_inc(x_25);
+x_77 = lean_array_push(x_76, x_25);
+x_78 = lean_array_push(x_77, x_75);
 x_79 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_79, 0, x_78);
-lean_ctor_set(x_79, 1, x_77);
-x_80 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-lean_inc(x_29);
-x_81 = lean_array_push(x_80, x_29);
-x_82 = lean_array_push(x_81, x_79);
-x_83 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_83, 0, x_78);
-lean_ctor_set(x_83, 1, x_82);
-x_84 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_85 = lean_array_push(x_84, x_83);
-x_86 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_87 = lean_array_push(x_85, x_86);
-x_88 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_89 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_89, 0, x_88);
-lean_ctor_set(x_89, 1, x_87);
-x_90 = lean_array_push(x_76, x_89);
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_78);
-lean_ctor_set(x_91, 1, x_90);
-x_92 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_93 = lean_array_push(x_92, x_91);
-x_94 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_95 = lean_array_push(x_93, x_94);
-x_96 = lean_array_push(x_95, x_29);
-x_97 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+lean_ctor_set(x_79, 0, x_74);
+lean_ctor_set(x_79, 1, x_78);
+x_80 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_81 = lean_array_push(x_80, x_79);
+x_82 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_83 = lean_array_push(x_81, x_82);
+x_84 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_85 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_85, 0, x_84);
+lean_ctor_set(x_85, 1, x_83);
+x_86 = lean_array_push(x_72, x_85);
+x_87 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_87, 0, x_74);
+lean_ctor_set(x_87, 1, x_86);
+x_88 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_89 = lean_array_push(x_88, x_87);
+x_90 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_91 = lean_array_push(x_89, x_90);
+x_92 = lean_array_push(x_91, x_25);
+x_93 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_94 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_94, 0, x_93);
+lean_ctor_set(x_94, 1, x_92);
+x_95 = lean_array_push(x_76, x_94);
+x_96 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_97 = lean_array_push(x_95, x_96);
 x_98 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_98, 0, x_97);
-lean_ctor_set(x_98, 1, x_96);
+lean_ctor_set(x_98, 0, x_74);
+lean_ctor_set(x_98, 1, x_97);
 x_99 = lean_array_push(x_80, x_98);
-x_100 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_101 = lean_array_push(x_99, x_100);
-x_102 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_102, 0, x_78);
-lean_ctor_set(x_102, 1, x_101);
-x_103 = lean_array_push(x_84, x_102);
-x_104 = lean_array_push(x_103, x_86);
+x_100 = lean_array_push(x_99, x_82);
+x_101 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_101, 0, x_84);
+lean_ctor_set(x_101, 1, x_100);
+x_102 = lean_array_push(x_76, x_101);
+x_103 = lean_array_push(x_102, x_23);
+x_104 = l_Lean_Parser_Term_app___elambda__1___closed__2;
 x_105 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_105, 0, x_88);
-lean_ctor_set(x_105, 1, x_104);
-x_106 = lean_array_push(x_80, x_105);
-x_107 = lean_array_push(x_106, x_27);
-x_108 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_109 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_109, 0, x_108);
-lean_ctor_set(x_109, 1, x_107);
-x_110 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_110, 0, x_109);
-lean_ctor_set(x_110, 1, x_71);
-return x_110;
+lean_ctor_set(x_105, 0, x_104);
+lean_ctor_set(x_105, 1, x_103);
+x_106 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_106, 0, x_105);
+lean_ctor_set(x_106, 1, x_67);
+return x_106;
 }
 }
 }
@@ -2873,7 +2811,7 @@ lean_object* _init_l_Lean_Elab_Term_elabShow___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabShow___lambda__1), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabShow___lambda__1___boxed), 3, 0);
 return x_1;
 }
 }
@@ -2886,6 +2824,15 @@ x_6 = l_Lean_Elab_Term_adaptExpander(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
+lean_object* l_Lean_Elab_Term_elabShow___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Term_elabShow___lambda__1(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
 lean_object* _init_l___regBuiltinTermElab_Lean_Elab_Term_elabShow___closed__1() {
 _start:
 {
@@ -2923,16 +2870,6 @@ x_5 = l_Lean_Elab_Term_addBuiltinTermElab(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabHave___lambda__1___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_have___elambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
 lean_object* l_Lean_Elab_Term_elabHave___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -2942,412 +2879,410 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
+lean_object* x_6; 
+lean_dec(x_1);
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(6u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
 lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(6u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
+if (x_10 == 0)
 {
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
+lean_object* x_11; 
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = l_Lean_nullKind___closed__2;
-lean_inc(x_15);
-x_17 = l_Lean_Syntax_isOfKind(x_15, x_16);
-if (x_17 == 0)
+lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = l_Lean_nullKind___closed__2;
+lean_inc(x_13);
+x_15 = l_Lean_Syntax_isOfKind(x_13, x_14);
+if (x_15 == 0)
 {
-lean_object* x_18; lean_object* x_19; 
-lean_dec(x_15);
-x_18 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_19 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_18, x_2, x_3);
-return x_19;
+lean_object* x_16; 
+lean_dec(x_13);
+lean_dec(x_1);
+x_16 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_16;
 }
 else
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
-x_20 = l_Lean_Syntax_getArgs(x_15);
-x_21 = lean_array_get_size(x_20);
-lean_dec(x_20);
-x_22 = lean_unsigned_to_nat(0u);
-x_23 = lean_nat_dec_eq(x_21, x_22);
-if (x_23 == 0)
+lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+x_17 = l_Lean_Syntax_getArgs(x_13);
+x_18 = lean_array_get_size(x_17);
+lean_dec(x_17);
+x_19 = lean_unsigned_to_nat(0u);
+x_20 = lean_nat_dec_eq(x_18, x_19);
+if (x_20 == 0)
 {
-lean_object* x_24; uint8_t x_25; 
-x_24 = lean_unsigned_to_nat(2u);
-x_25 = lean_nat_dec_eq(x_21, x_24);
-lean_dec(x_21);
-if (x_25 == 0)
+lean_object* x_21; uint8_t x_22; 
+x_21 = lean_unsigned_to_nat(2u);
+x_22 = lean_nat_dec_eq(x_18, x_21);
+lean_dec(x_18);
+if (x_22 == 0)
 {
-lean_object* x_26; lean_object* x_27; 
-lean_dec(x_15);
-x_26 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_27 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_26, x_2, x_3);
-return x_27;
+lean_object* x_23; 
+lean_dec(x_13);
+lean_dec(x_1);
+x_23 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_23;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; 
-x_28 = l_Lean_Syntax_getArg(x_15, x_22);
-lean_dec(x_15);
-x_29 = l_Lean_Syntax_getArg(x_1, x_24);
-x_30 = lean_unsigned_to_nat(3u);
-x_31 = l_Lean_Syntax_getArg(x_1, x_30);
-x_32 = l_Lean_Parser_Term_fromTerm___elambda__1___closed__2;
-lean_inc(x_31);
-x_33 = l_Lean_Syntax_isOfKind(x_31, x_32);
-if (x_33 == 0)
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
+x_24 = l_Lean_Syntax_getArg(x_13, x_19);
+lean_dec(x_13);
+x_25 = l_Lean_Syntax_getArg(x_1, x_21);
+x_26 = lean_unsigned_to_nat(3u);
+x_27 = l_Lean_Syntax_getArg(x_1, x_26);
+x_28 = l_Lean_Parser_Term_fromTerm___elambda__1___closed__2;
+lean_inc(x_27);
+x_29 = l_Lean_Syntax_isOfKind(x_27, x_28);
+if (x_29 == 0)
 {
-lean_object* x_34; uint8_t x_35; 
-x_34 = l_Lean_Parser_Term_haveAssign___elambda__1___closed__2;
-lean_inc(x_31);
-x_35 = l_Lean_Syntax_isOfKind(x_31, x_34);
+lean_object* x_30; uint8_t x_31; 
+x_30 = l_Lean_Parser_Term_haveAssign___elambda__1___closed__2;
+lean_inc(x_27);
+x_31 = l_Lean_Syntax_isOfKind(x_27, x_30);
+if (x_31 == 0)
+{
+lean_object* x_32; 
+lean_dec(x_27);
+lean_dec(x_25);
+lean_dec(x_24);
+lean_dec(x_1);
+x_32 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_32;
+}
+else
+{
+lean_object* x_33; lean_object* x_34; uint8_t x_35; 
+x_33 = l_Lean_Syntax_getArgs(x_27);
+x_34 = lean_array_get_size(x_33);
+lean_dec(x_33);
+x_35 = lean_nat_dec_eq(x_34, x_21);
+lean_dec(x_34);
 if (x_35 == 0)
 {
-lean_object* x_36; lean_object* x_37; 
-lean_dec(x_31);
-lean_dec(x_29);
-lean_dec(x_28);
-x_36 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_37 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_36, x_2, x_3);
-return x_37;
-}
-else
-{
-lean_object* x_38; lean_object* x_39; uint8_t x_40; 
-x_38 = l_Lean_Syntax_getArgs(x_31);
-x_39 = lean_array_get_size(x_38);
-lean_dec(x_38);
-x_40 = lean_nat_dec_eq(x_39, x_24);
-lean_dec(x_39);
-if (x_40 == 0)
-{
-lean_object* x_41; lean_object* x_42; 
-lean_dec(x_31);
-lean_dec(x_29);
-lean_dec(x_28);
-x_41 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_42 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_41, x_2, x_3);
-return x_42;
-}
-else
-{
-lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; uint8_t x_48; 
-x_43 = l_Lean_Syntax_getArg(x_31, x_14);
-lean_dec(x_31);
-x_44 = lean_unsigned_to_nat(5u);
-x_45 = l_Lean_Syntax_getArg(x_1, x_44);
+lean_object* x_36; 
+lean_dec(x_27);
+lean_dec(x_25);
+lean_dec(x_24);
 lean_dec(x_1);
-x_46 = l_Lean_Elab_Term_mkTermIdFromIdent(x_28);
-x_47 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_48 = !lean_is_exclusive(x_47);
-if (x_48 == 0)
+x_36 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_36;
+}
+else
 {
-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; 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; 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; 
-x_49 = lean_ctor_get(x_47, 0);
-lean_dec(x_49);
-x_50 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_51 = lean_array_push(x_50, x_29);
-x_52 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
-x_53 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_53, 0, x_52);
-lean_ctor_set(x_53, 1, x_51);
-x_54 = l_Lean_mkOptionalNode___closed__1;
-x_55 = lean_array_push(x_54, x_53);
-x_56 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_56, 0, x_16);
-lean_ctor_set(x_56, 1, x_55);
-x_57 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_58 = lean_array_push(x_57, x_46);
-x_59 = lean_array_push(x_58, x_56);
+lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; 
+x_37 = l_Lean_Syntax_getArg(x_27, x_12);
+lean_dec(x_27);
+x_38 = lean_unsigned_to_nat(5u);
+x_39 = l_Lean_Syntax_getArg(x_1, x_38);
+lean_dec(x_1);
+x_40 = l_Lean_Elab_Term_mkTermIdFromIdent(x_24);
+x_41 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_42 = !lean_is_exclusive(x_41);
+if (x_42 == 0)
+{
+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_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; 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; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_43 = lean_ctor_get(x_41, 0);
+lean_dec(x_43);
+x_44 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_45 = lean_array_push(x_44, x_25);
+x_46 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_47 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_47, 0, x_46);
+lean_ctor_set(x_47, 1, x_45);
+x_48 = l_Lean_mkOptionalNode___closed__1;
+x_49 = lean_array_push(x_48, x_47);
+x_50 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_50, 0, x_14);
+lean_ctor_set(x_50, 1, x_49);
+x_51 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_52 = lean_array_push(x_51, x_40);
+x_53 = lean_array_push(x_52, x_50);
+x_54 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_54, 0, x_14);
+lean_ctor_set(x_54, 1, x_53);
+x_55 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_56 = lean_array_push(x_55, x_54);
+x_57 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_58 = lean_array_push(x_56, x_57);
+x_59 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_60 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_60, 0, x_16);
-lean_ctor_set(x_60, 1, x_59);
-x_61 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_62 = lean_array_push(x_61, x_60);
-x_63 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_64 = lean_array_push(x_62, x_63);
-x_65 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_66 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_66, 0, x_65);
-lean_ctor_set(x_66, 1, x_64);
-x_67 = lean_array_push(x_54, x_66);
-x_68 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_68, 0, x_16);
-lean_ctor_set(x_68, 1, x_67);
-x_69 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_70 = lean_array_push(x_69, x_68);
-x_71 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+lean_ctor_set(x_60, 0, x_59);
+lean_ctor_set(x_60, 1, x_58);
+x_61 = lean_array_push(x_48, x_60);
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_14);
+lean_ctor_set(x_62, 1, x_61);
+x_63 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_64 = lean_array_push(x_63, x_62);
+x_65 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_66 = lean_array_push(x_64, x_65);
+x_67 = lean_array_push(x_66, x_39);
+x_68 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_69 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_69, 0, x_68);
+lean_ctor_set(x_69, 1, x_67);
+x_70 = lean_array_push(x_51, x_69);
+x_71 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_72 = lean_array_push(x_70, x_71);
-x_73 = lean_array_push(x_72, x_45);
-x_74 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_75 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_75, 0, x_74);
-lean_ctor_set(x_75, 1, x_73);
-x_76 = lean_array_push(x_57, x_75);
-x_77 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_78 = lean_array_push(x_76, x_77);
-x_79 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_79, 0, x_16);
-lean_ctor_set(x_79, 1, x_78);
-x_80 = lean_array_push(x_61, x_79);
-x_81 = lean_array_push(x_80, x_63);
-x_82 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_82, 0, x_65);
-lean_ctor_set(x_82, 1, x_81);
-x_83 = lean_array_push(x_57, x_82);
-x_84 = lean_array_push(x_83, x_43);
-x_85 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_86 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_86, 0, x_85);
-lean_ctor_set(x_86, 1, x_84);
-lean_ctor_set(x_47, 0, x_86);
-return x_47;
+x_73 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_73, 0, x_14);
+lean_ctor_set(x_73, 1, x_72);
+x_74 = lean_array_push(x_55, x_73);
+x_75 = lean_array_push(x_74, x_57);
+x_76 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_76, 0, x_59);
+lean_ctor_set(x_76, 1, x_75);
+x_77 = lean_array_push(x_51, x_76);
+x_78 = lean_array_push(x_77, x_37);
+x_79 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_80 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_80, 0, x_79);
+lean_ctor_set(x_80, 1, x_78);
+lean_ctor_set(x_41, 0, x_80);
+return x_41;
 }
 else
 {
-lean_object* x_87; lean_object* x_88; lean_object* x_89; 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; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 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_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
-x_87 = lean_ctor_get(x_47, 1);
-lean_inc(x_87);
-lean_dec(x_47);
-x_88 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_89 = lean_array_push(x_88, x_29);
-x_90 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_90);
-lean_ctor_set(x_91, 1, x_89);
-x_92 = l_Lean_mkOptionalNode___closed__1;
-x_93 = lean_array_push(x_92, x_91);
-x_94 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_94, 0, x_16);
-lean_ctor_set(x_94, 1, x_93);
-x_95 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_96 = lean_array_push(x_95, x_46);
-x_97 = lean_array_push(x_96, x_94);
+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; 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; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 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_119; 
+x_81 = lean_ctor_get(x_41, 1);
+lean_inc(x_81);
+lean_dec(x_41);
+x_82 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_83 = lean_array_push(x_82, x_25);
+x_84 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_85 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_85, 0, x_84);
+lean_ctor_set(x_85, 1, x_83);
+x_86 = l_Lean_mkOptionalNode___closed__1;
+x_87 = lean_array_push(x_86, x_85);
+x_88 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_88, 0, x_14);
+lean_ctor_set(x_88, 1, x_87);
+x_89 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_90 = lean_array_push(x_89, x_40);
+x_91 = lean_array_push(x_90, x_88);
+x_92 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_92, 0, x_14);
+lean_ctor_set(x_92, 1, x_91);
+x_93 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_94 = lean_array_push(x_93, x_92);
+x_95 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_96 = lean_array_push(x_94, x_95);
+x_97 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_98 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_98, 0, x_16);
-lean_ctor_set(x_98, 1, x_97);
-x_99 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_100 = lean_array_push(x_99, x_98);
-x_101 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_102 = lean_array_push(x_100, x_101);
-x_103 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_104 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_104, 0, x_103);
-lean_ctor_set(x_104, 1, x_102);
-x_105 = lean_array_push(x_92, x_104);
-x_106 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_106, 0, x_16);
-lean_ctor_set(x_106, 1, x_105);
-x_107 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_108 = lean_array_push(x_107, x_106);
-x_109 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+lean_ctor_set(x_98, 0, x_97);
+lean_ctor_set(x_98, 1, x_96);
+x_99 = lean_array_push(x_86, x_98);
+x_100 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_100, 0, x_14);
+lean_ctor_set(x_100, 1, x_99);
+x_101 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_102 = lean_array_push(x_101, x_100);
+x_103 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_104 = lean_array_push(x_102, x_103);
+x_105 = lean_array_push(x_104, x_39);
+x_106 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_107 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_107, 0, x_106);
+lean_ctor_set(x_107, 1, x_105);
+x_108 = lean_array_push(x_89, x_107);
+x_109 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_110 = lean_array_push(x_108, x_109);
-x_111 = lean_array_push(x_110, x_45);
-x_112 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_113 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_113, 0, x_112);
-lean_ctor_set(x_113, 1, x_111);
-x_114 = lean_array_push(x_95, x_113);
-x_115 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_116 = lean_array_push(x_114, x_115);
-x_117 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_117, 0, x_16);
-lean_ctor_set(x_117, 1, x_116);
-x_118 = lean_array_push(x_99, x_117);
-x_119 = lean_array_push(x_118, x_101);
-x_120 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_120, 0, x_103);
-lean_ctor_set(x_120, 1, x_119);
-x_121 = lean_array_push(x_95, x_120);
-x_122 = lean_array_push(x_121, x_43);
-x_123 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_124 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_124, 0, x_123);
-lean_ctor_set(x_124, 1, x_122);
-x_125 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_125, 0, x_124);
-lean_ctor_set(x_125, 1, x_87);
-return x_125;
+x_111 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_111, 0, x_14);
+lean_ctor_set(x_111, 1, x_110);
+x_112 = lean_array_push(x_93, x_111);
+x_113 = lean_array_push(x_112, x_95);
+x_114 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_114, 0, x_97);
+lean_ctor_set(x_114, 1, x_113);
+x_115 = lean_array_push(x_89, x_114);
+x_116 = lean_array_push(x_115, x_37);
+x_117 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_118 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_118, 0, x_117);
+lean_ctor_set(x_118, 1, x_116);
+x_119 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_119, 0, x_118);
+lean_ctor_set(x_119, 1, x_81);
+return x_119;
 }
 }
 }
 }
 else
 {
-lean_object* x_126; lean_object* x_127; uint8_t x_128; 
-x_126 = l_Lean_Syntax_getArgs(x_31);
-x_127 = lean_array_get_size(x_126);
-lean_dec(x_126);
-x_128 = lean_nat_dec_eq(x_127, x_24);
-lean_dec(x_127);
-if (x_128 == 0)
+lean_object* x_120; lean_object* x_121; uint8_t x_122; 
+x_120 = l_Lean_Syntax_getArgs(x_27);
+x_121 = lean_array_get_size(x_120);
+lean_dec(x_120);
+x_122 = lean_nat_dec_eq(x_121, x_21);
+lean_dec(x_121);
+if (x_122 == 0)
 {
-lean_object* x_129; lean_object* x_130; 
-lean_dec(x_31);
-lean_dec(x_29);
-lean_dec(x_28);
-x_129 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_130 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_129, x_2, x_3);
-return x_130;
-}
-else
-{
-lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; uint8_t x_136; 
-x_131 = l_Lean_Syntax_getArg(x_31, x_14);
-lean_dec(x_31);
-x_132 = lean_unsigned_to_nat(5u);
-x_133 = l_Lean_Syntax_getArg(x_1, x_132);
+lean_object* x_123; 
+lean_dec(x_27);
+lean_dec(x_25);
+lean_dec(x_24);
 lean_dec(x_1);
-x_134 = l_Lean_Elab_Term_mkTermIdFromIdent(x_28);
-x_135 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_136 = !lean_is_exclusive(x_135);
-if (x_136 == 0)
+x_123 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_123;
+}
+else
 {
-lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 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_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
-x_137 = lean_ctor_get(x_135, 0);
-lean_dec(x_137);
-x_138 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_139 = lean_array_push(x_138, x_29);
-x_140 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; uint8_t x_129; 
+x_124 = l_Lean_Syntax_getArg(x_27, x_12);
+lean_dec(x_27);
+x_125 = lean_unsigned_to_nat(5u);
+x_126 = l_Lean_Syntax_getArg(x_1, x_125);
+lean_dec(x_1);
+x_127 = l_Lean_Elab_Term_mkTermIdFromIdent(x_24);
+x_128 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_129 = !lean_is_exclusive(x_128);
+if (x_129 == 0)
+{
+lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 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_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; 
+x_130 = lean_ctor_get(x_128, 0);
+lean_dec(x_130);
+x_131 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_132 = lean_array_push(x_131, x_25);
+x_133 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_134 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_134, 0, x_133);
+lean_ctor_set(x_134, 1, x_132);
+x_135 = l_Lean_mkOptionalNode___closed__1;
+x_136 = lean_array_push(x_135, x_134);
+x_137 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_137, 0, x_14);
+lean_ctor_set(x_137, 1, x_136);
+x_138 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_139 = lean_array_push(x_138, x_127);
+x_140 = lean_array_push(x_139, x_137);
 x_141 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_141, 0, x_140);
-lean_ctor_set(x_141, 1, x_139);
-x_142 = l_Lean_mkOptionalNode___closed__1;
+lean_ctor_set(x_141, 0, x_14);
+lean_ctor_set(x_141, 1, x_140);
+x_142 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
 x_143 = lean_array_push(x_142, x_141);
-x_144 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_144, 0, x_16);
-lean_ctor_set(x_144, 1, x_143);
-x_145 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_146 = lean_array_push(x_145, x_134);
-x_147 = lean_array_push(x_146, x_144);
-x_148 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_148, 0, x_16);
-lean_ctor_set(x_148, 1, x_147);
-x_149 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_150 = lean_array_push(x_149, x_148);
-x_151 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_152 = lean_array_push(x_150, x_151);
-x_153 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_154 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_154, 0, x_153);
-lean_ctor_set(x_154, 1, x_152);
-x_155 = lean_array_push(x_142, x_154);
+x_144 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_145 = lean_array_push(x_143, x_144);
+x_146 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_147 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_147, 0, x_146);
+lean_ctor_set(x_147, 1, x_145);
+x_148 = lean_array_push(x_135, x_147);
+x_149 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_149, 0, x_14);
+lean_ctor_set(x_149, 1, x_148);
+x_150 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_151 = lean_array_push(x_150, x_149);
+x_152 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_153 = lean_array_push(x_151, x_152);
+x_154 = lean_array_push(x_153, x_126);
+x_155 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
 x_156 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_156, 0, x_16);
-lean_ctor_set(x_156, 1, x_155);
-x_157 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_158 = lean_array_push(x_157, x_156);
-x_159 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_160 = lean_array_push(x_158, x_159);
-x_161 = lean_array_push(x_160, x_133);
-x_162 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+lean_ctor_set(x_156, 0, x_155);
+lean_ctor_set(x_156, 1, x_154);
+x_157 = lean_array_push(x_138, x_156);
+x_158 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_159 = lean_array_push(x_157, x_158);
+x_160 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_160, 0, x_14);
+lean_ctor_set(x_160, 1, x_159);
+x_161 = lean_array_push(x_142, x_160);
+x_162 = lean_array_push(x_161, x_144);
 x_163 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_163, 0, x_162);
-lean_ctor_set(x_163, 1, x_161);
-x_164 = lean_array_push(x_145, x_163);
-x_165 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_166 = lean_array_push(x_164, x_165);
+lean_ctor_set(x_163, 0, x_146);
+lean_ctor_set(x_163, 1, x_162);
+x_164 = lean_array_push(x_138, x_163);
+x_165 = lean_array_push(x_164, x_124);
+x_166 = l_Lean_Parser_Term_app___elambda__1___closed__2;
 x_167 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_167, 0, x_16);
-lean_ctor_set(x_167, 1, x_166);
-x_168 = lean_array_push(x_149, x_167);
-x_169 = lean_array_push(x_168, x_151);
-x_170 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_170, 0, x_153);
-lean_ctor_set(x_170, 1, x_169);
-x_171 = lean_array_push(x_145, x_170);
-x_172 = lean_array_push(x_171, x_131);
-x_173 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_174 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_174, 0, x_173);
-lean_ctor_set(x_174, 1, x_172);
-lean_ctor_set(x_135, 0, x_174);
-return x_135;
+lean_ctor_set(x_167, 0, x_166);
+lean_ctor_set(x_167, 1, x_165);
+lean_ctor_set(x_128, 0, x_167);
+return x_128;
 }
 else
 {
-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_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; lean_object* 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; 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; 
-x_175 = lean_ctor_get(x_135, 1);
-lean_inc(x_175);
-lean_dec(x_135);
-x_176 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_177 = lean_array_push(x_176, x_29);
-x_178 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 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_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; lean_object* 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; 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; 
+x_168 = lean_ctor_get(x_128, 1);
+lean_inc(x_168);
+lean_dec(x_128);
+x_169 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_170 = lean_array_push(x_169, x_25);
+x_171 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_172 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_172, 0, x_171);
+lean_ctor_set(x_172, 1, x_170);
+x_173 = l_Lean_mkOptionalNode___closed__1;
+x_174 = lean_array_push(x_173, x_172);
+x_175 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_175, 0, x_14);
+lean_ctor_set(x_175, 1, x_174);
+x_176 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_177 = lean_array_push(x_176, x_127);
+x_178 = lean_array_push(x_177, x_175);
 x_179 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_179, 0, x_178);
-lean_ctor_set(x_179, 1, x_177);
-x_180 = l_Lean_mkOptionalNode___closed__1;
+lean_ctor_set(x_179, 0, x_14);
+lean_ctor_set(x_179, 1, x_178);
+x_180 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
 x_181 = lean_array_push(x_180, x_179);
-x_182 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_182, 0, x_16);
-lean_ctor_set(x_182, 1, x_181);
-x_183 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_184 = lean_array_push(x_183, x_134);
-x_185 = lean_array_push(x_184, x_182);
-x_186 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_186, 0, x_16);
-lean_ctor_set(x_186, 1, x_185);
-x_187 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_188 = lean_array_push(x_187, x_186);
-x_189 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_190 = lean_array_push(x_188, x_189);
-x_191 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_192 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_192, 0, x_191);
-lean_ctor_set(x_192, 1, x_190);
-x_193 = lean_array_push(x_180, x_192);
+x_182 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_183 = lean_array_push(x_181, x_182);
+x_184 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_185 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_185, 0, x_184);
+lean_ctor_set(x_185, 1, x_183);
+x_186 = lean_array_push(x_173, x_185);
+x_187 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_187, 0, x_14);
+lean_ctor_set(x_187, 1, x_186);
+x_188 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_189 = lean_array_push(x_188, x_187);
+x_190 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_191 = lean_array_push(x_189, x_190);
+x_192 = lean_array_push(x_191, x_126);
+x_193 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
 x_194 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_194, 0, x_16);
-lean_ctor_set(x_194, 1, x_193);
-x_195 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_196 = lean_array_push(x_195, x_194);
-x_197 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_198 = lean_array_push(x_196, x_197);
-x_199 = lean_array_push(x_198, x_133);
-x_200 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+lean_ctor_set(x_194, 0, x_193);
+lean_ctor_set(x_194, 1, x_192);
+x_195 = lean_array_push(x_176, x_194);
+x_196 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_197 = lean_array_push(x_195, x_196);
+x_198 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_198, 0, x_14);
+lean_ctor_set(x_198, 1, x_197);
+x_199 = lean_array_push(x_180, x_198);
+x_200 = lean_array_push(x_199, x_182);
 x_201 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_201, 0, x_200);
-lean_ctor_set(x_201, 1, x_199);
-x_202 = lean_array_push(x_183, x_201);
-x_203 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_204 = lean_array_push(x_202, x_203);
+lean_ctor_set(x_201, 0, x_184);
+lean_ctor_set(x_201, 1, x_200);
+x_202 = lean_array_push(x_176, x_201);
+x_203 = lean_array_push(x_202, x_124);
+x_204 = l_Lean_Parser_Term_app___elambda__1___closed__2;
 x_205 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_205, 0, x_16);
-lean_ctor_set(x_205, 1, x_204);
-x_206 = lean_array_push(x_187, x_205);
-x_207 = lean_array_push(x_206, x_189);
-x_208 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_208, 0, x_191);
-lean_ctor_set(x_208, 1, x_207);
-x_209 = lean_array_push(x_183, x_208);
-x_210 = lean_array_push(x_209, x_131);
-x_211 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_212 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_212, 0, x_211);
-lean_ctor_set(x_212, 1, x_210);
-x_213 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_213, 0, x_212);
-lean_ctor_set(x_213, 1, x_175);
-return x_213;
+lean_ctor_set(x_205, 0, x_204);
+lean_ctor_set(x_205, 1, x_203);
+x_206 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_206, 0, x_205);
+lean_ctor_set(x_206, 1, x_168);
+return x_206;
 }
 }
 }
@@ -3355,351 +3290,349 @@ return x_213;
 }
 else
 {
-lean_object* x_214; lean_object* x_215; lean_object* x_216; lean_object* x_217; lean_object* x_218; uint8_t x_219; 
-lean_dec(x_21);
-lean_dec(x_15);
-x_214 = lean_unsigned_to_nat(2u);
-x_215 = l_Lean_Syntax_getArg(x_1, x_214);
-x_216 = lean_unsigned_to_nat(3u);
-x_217 = l_Lean_Syntax_getArg(x_1, x_216);
-x_218 = l_Lean_Parser_Term_fromTerm___elambda__1___closed__2;
-lean_inc(x_217);
-x_219 = l_Lean_Syntax_isOfKind(x_217, x_218);
-if (x_219 == 0)
+lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; uint8_t x_212; 
+lean_dec(x_18);
+lean_dec(x_13);
+x_207 = lean_unsigned_to_nat(2u);
+x_208 = l_Lean_Syntax_getArg(x_1, x_207);
+x_209 = lean_unsigned_to_nat(3u);
+x_210 = l_Lean_Syntax_getArg(x_1, x_209);
+x_211 = l_Lean_Parser_Term_fromTerm___elambda__1___closed__2;
+lean_inc(x_210);
+x_212 = l_Lean_Syntax_isOfKind(x_210, x_211);
+if (x_212 == 0)
 {
-lean_object* x_220; uint8_t x_221; 
-x_220 = l_Lean_Parser_Term_haveAssign___elambda__1___closed__2;
-lean_inc(x_217);
-x_221 = l_Lean_Syntax_isOfKind(x_217, x_220);
-if (x_221 == 0)
+lean_object* x_213; uint8_t x_214; 
+x_213 = l_Lean_Parser_Term_haveAssign___elambda__1___closed__2;
+lean_inc(x_210);
+x_214 = l_Lean_Syntax_isOfKind(x_210, x_213);
+if (x_214 == 0)
 {
-lean_object* x_222; lean_object* x_223; 
+lean_object* x_215; 
+lean_dec(x_210);
+lean_dec(x_208);
+lean_dec(x_1);
+x_215 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_215;
+}
+else
+{
+lean_object* x_216; lean_object* x_217; uint8_t x_218; 
+x_216 = l_Lean_Syntax_getArgs(x_210);
+x_217 = lean_array_get_size(x_216);
+lean_dec(x_216);
+x_218 = lean_nat_dec_eq(x_217, x_207);
 lean_dec(x_217);
-lean_dec(x_215);
-x_222 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_223 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_222, x_2, x_3);
-return x_223;
+if (x_218 == 0)
+{
+lean_object* x_219; 
+lean_dec(x_210);
+lean_dec(x_208);
+lean_dec(x_1);
+x_219 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_219;
 }
 else
 {
-lean_object* x_224; lean_object* x_225; uint8_t x_226; 
-x_224 = l_Lean_Syntax_getArgs(x_217);
-x_225 = lean_array_get_size(x_224);
-lean_dec(x_224);
-x_226 = lean_nat_dec_eq(x_225, x_214);
-lean_dec(x_225);
+lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; lean_object* x_224; lean_object* x_225; uint8_t x_226; 
+x_220 = l_Lean_Syntax_getArg(x_210, x_12);
+lean_dec(x_210);
+x_221 = lean_unsigned_to_nat(5u);
+x_222 = l_Lean_Syntax_getArg(x_1, x_221);
+x_223 = l_Lean_Elab_Term_elabShow___lambda__1___closed__2;
+x_224 = l_Lean_Elab_Term_mkTermId(x_1, x_223);
+lean_dec(x_1);
+x_225 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_226 = !lean_is_exclusive(x_225);
 if (x_226 == 0)
 {
-lean_object* x_227; lean_object* x_228; 
-lean_dec(x_217);
-lean_dec(x_215);
-x_227 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_228 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_227, x_2, x_3);
-return x_228;
-}
-else
-{
-lean_object* x_229; lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; uint8_t x_235; 
-x_229 = l_Lean_Syntax_getArg(x_217, x_14);
-lean_dec(x_217);
-x_230 = lean_unsigned_to_nat(5u);
-x_231 = l_Lean_Syntax_getArg(x_1, x_230);
-x_232 = l_Lean_Elab_Term_elabShow___lambda__1___closed__4;
-x_233 = l_Lean_Elab_Term_mkTermId(x_1, x_232);
-lean_dec(x_1);
-x_234 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_235 = !lean_is_exclusive(x_234);
-if (x_235 == 0)
-{
-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; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; 
-x_236 = lean_ctor_get(x_234, 0);
-lean_dec(x_236);
-x_237 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_238 = lean_array_push(x_237, x_215);
-x_239 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
-x_240 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_240, 0, x_239);
-lean_ctor_set(x_240, 1, x_238);
-x_241 = l_Lean_mkOptionalNode___closed__1;
-x_242 = lean_array_push(x_241, x_240);
-x_243 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_243, 0, x_16);
-lean_ctor_set(x_243, 1, x_242);
-x_244 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_245 = lean_array_push(x_244, x_233);
-x_246 = lean_array_push(x_245, x_243);
-x_247 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_247, 0, x_16);
-lean_ctor_set(x_247, 1, x_246);
-x_248 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_249 = lean_array_push(x_248, x_247);
-x_250 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_251 = lean_array_push(x_249, x_250);
-x_252 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+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; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; 
+x_227 = lean_ctor_get(x_225, 0);
+lean_dec(x_227);
+x_228 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_229 = lean_array_push(x_228, x_208);
+x_230 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+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 = l_Lean_mkOptionalNode___closed__1;
+x_233 = lean_array_push(x_232, x_231);
+x_234 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_234, 0, x_14);
+lean_ctor_set(x_234, 1, x_233);
+x_235 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_236 = lean_array_push(x_235, x_224);
+x_237 = lean_array_push(x_236, x_234);
+x_238 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_238, 0, x_14);
+lean_ctor_set(x_238, 1, x_237);
+x_239 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_240 = lean_array_push(x_239, x_238);
+x_241 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_242 = lean_array_push(x_240, x_241);
+x_243 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_244 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_244, 0, x_243);
+lean_ctor_set(x_244, 1, x_242);
+x_245 = lean_array_push(x_232, x_244);
+x_246 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_246, 0, x_14);
+lean_ctor_set(x_246, 1, x_245);
+x_247 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_248 = lean_array_push(x_247, x_246);
+x_249 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_250 = lean_array_push(x_248, x_249);
+x_251 = lean_array_push(x_250, x_222);
+x_252 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
 x_253 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_253, 0, x_252);
 lean_ctor_set(x_253, 1, x_251);
-x_254 = lean_array_push(x_241, x_253);
-x_255 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_255, 0, x_16);
-lean_ctor_set(x_255, 1, x_254);
-x_256 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_257 = lean_array_push(x_256, x_255);
-x_258 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_259 = lean_array_push(x_257, x_258);
-x_260 = lean_array_push(x_259, x_231);
-x_261 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_262 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_262, 0, x_261);
-lean_ctor_set(x_262, 1, x_260);
-x_263 = lean_array_push(x_244, x_262);
-x_264 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_265 = lean_array_push(x_263, x_264);
-x_266 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_266, 0, x_16);
-lean_ctor_set(x_266, 1, x_265);
-x_267 = lean_array_push(x_248, x_266);
-x_268 = lean_array_push(x_267, x_250);
-x_269 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_269, 0, x_252);
-lean_ctor_set(x_269, 1, x_268);
-x_270 = lean_array_push(x_244, x_269);
-x_271 = lean_array_push(x_270, x_229);
-x_272 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_273 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_273, 0, x_272);
-lean_ctor_set(x_273, 1, x_271);
-lean_ctor_set(x_234, 0, x_273);
-return x_234;
+x_254 = lean_array_push(x_235, x_253);
+x_255 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_256 = lean_array_push(x_254, x_255);
+x_257 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_257, 0, x_14);
+lean_ctor_set(x_257, 1, x_256);
+x_258 = lean_array_push(x_239, x_257);
+x_259 = lean_array_push(x_258, x_241);
+x_260 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_260, 0, x_243);
+lean_ctor_set(x_260, 1, x_259);
+x_261 = lean_array_push(x_235, x_260);
+x_262 = lean_array_push(x_261, x_220);
+x_263 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_264 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_264, 0, x_263);
+lean_ctor_set(x_264, 1, x_262);
+lean_ctor_set(x_225, 0, x_264);
+return x_225;
 }
 else
 {
-lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; 
-x_274 = lean_ctor_get(x_234, 1);
-lean_inc(x_274);
-lean_dec(x_234);
-x_275 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_276 = lean_array_push(x_275, x_215);
-x_277 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
-x_278 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_278, 0, x_277);
-lean_ctor_set(x_278, 1, x_276);
-x_279 = l_Lean_mkOptionalNode___closed__1;
-x_280 = lean_array_push(x_279, x_278);
-x_281 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_281, 0, x_16);
-lean_ctor_set(x_281, 1, x_280);
-x_282 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_283 = lean_array_push(x_282, x_233);
-x_284 = lean_array_push(x_283, x_281);
-x_285 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_285, 0, x_16);
-lean_ctor_set(x_285, 1, x_284);
-x_286 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_287 = lean_array_push(x_286, x_285);
-x_288 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_289 = lean_array_push(x_287, x_288);
-x_290 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+lean_object* x_265; lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; lean_object* x_273; lean_object* x_274; lean_object* x_275; lean_object* x_276; lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; lean_object* x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; lean_object* x_303; 
+x_265 = lean_ctor_get(x_225, 1);
+lean_inc(x_265);
+lean_dec(x_225);
+x_266 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_267 = lean_array_push(x_266, x_208);
+x_268 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_269 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_269, 0, x_268);
+lean_ctor_set(x_269, 1, x_267);
+x_270 = l_Lean_mkOptionalNode___closed__1;
+x_271 = lean_array_push(x_270, x_269);
+x_272 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_272, 0, x_14);
+lean_ctor_set(x_272, 1, x_271);
+x_273 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_274 = lean_array_push(x_273, x_224);
+x_275 = lean_array_push(x_274, x_272);
+x_276 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_276, 0, x_14);
+lean_ctor_set(x_276, 1, x_275);
+x_277 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_278 = lean_array_push(x_277, x_276);
+x_279 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_280 = lean_array_push(x_278, x_279);
+x_281 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_282 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_282, 0, x_281);
+lean_ctor_set(x_282, 1, x_280);
+x_283 = lean_array_push(x_270, x_282);
+x_284 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_284, 0, x_14);
+lean_ctor_set(x_284, 1, x_283);
+x_285 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_286 = lean_array_push(x_285, x_284);
+x_287 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_288 = lean_array_push(x_286, x_287);
+x_289 = lean_array_push(x_288, x_222);
+x_290 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
 x_291 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_291, 0, x_290);
 lean_ctor_set(x_291, 1, x_289);
-x_292 = lean_array_push(x_279, x_291);
-x_293 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_293, 0, x_16);
-lean_ctor_set(x_293, 1, x_292);
-x_294 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_295 = lean_array_push(x_294, x_293);
-x_296 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_297 = lean_array_push(x_295, x_296);
-x_298 = lean_array_push(x_297, x_231);
-x_299 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_300 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_300, 0, x_299);
-lean_ctor_set(x_300, 1, x_298);
-x_301 = lean_array_push(x_282, x_300);
-x_302 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_303 = lean_array_push(x_301, x_302);
-x_304 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_304, 0, x_16);
-lean_ctor_set(x_304, 1, x_303);
-x_305 = lean_array_push(x_286, x_304);
-x_306 = lean_array_push(x_305, x_288);
-x_307 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_307, 0, x_290);
-lean_ctor_set(x_307, 1, x_306);
-x_308 = lean_array_push(x_282, x_307);
-x_309 = lean_array_push(x_308, x_229);
-x_310 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_311 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_311, 0, x_310);
-lean_ctor_set(x_311, 1, x_309);
-x_312 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_312, 0, x_311);
-lean_ctor_set(x_312, 1, x_274);
-return x_312;
+x_292 = lean_array_push(x_273, x_291);
+x_293 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_294 = lean_array_push(x_292, x_293);
+x_295 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_295, 0, x_14);
+lean_ctor_set(x_295, 1, x_294);
+x_296 = lean_array_push(x_277, x_295);
+x_297 = lean_array_push(x_296, x_279);
+x_298 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_298, 0, x_281);
+lean_ctor_set(x_298, 1, x_297);
+x_299 = lean_array_push(x_273, x_298);
+x_300 = lean_array_push(x_299, x_220);
+x_301 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_302 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_302, 0, x_301);
+lean_ctor_set(x_302, 1, x_300);
+x_303 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_303, 0, x_302);
+lean_ctor_set(x_303, 1, x_265);
+return x_303;
 }
 }
 }
 }
 else
 {
-lean_object* x_313; lean_object* x_314; uint8_t x_315; 
-x_313 = l_Lean_Syntax_getArgs(x_217);
-x_314 = lean_array_get_size(x_313);
-lean_dec(x_313);
-x_315 = lean_nat_dec_eq(x_314, x_214);
-lean_dec(x_314);
-if (x_315 == 0)
+lean_object* x_304; lean_object* x_305; uint8_t x_306; 
+x_304 = l_Lean_Syntax_getArgs(x_210);
+x_305 = lean_array_get_size(x_304);
+lean_dec(x_304);
+x_306 = lean_nat_dec_eq(x_305, x_207);
+lean_dec(x_305);
+if (x_306 == 0)
 {
-lean_object* x_316; lean_object* x_317; 
-lean_dec(x_217);
-lean_dec(x_215);
-x_316 = l_Lean_Elab_Term_elabHave___lambda__1___closed__1;
-x_317 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_316, x_2, x_3);
-return x_317;
-}
-else
-{
-lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_322; lean_object* x_323; uint8_t x_324; 
-x_318 = l_Lean_Syntax_getArg(x_217, x_14);
-lean_dec(x_217);
-x_319 = lean_unsigned_to_nat(5u);
-x_320 = l_Lean_Syntax_getArg(x_1, x_319);
-x_321 = l_Lean_Elab_Term_elabShow___lambda__1___closed__4;
-x_322 = l_Lean_Elab_Term_mkTermId(x_1, x_321);
+lean_object* x_307; 
+lean_dec(x_210);
+lean_dec(x_208);
 lean_dec(x_1);
-x_323 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_324 = !lean_is_exclusive(x_323);
-if (x_324 == 0)
-{
-lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; 
-x_325 = lean_ctor_get(x_323, 0);
-lean_dec(x_325);
-x_326 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_327 = lean_array_push(x_326, x_215);
-x_328 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
-x_329 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_329, 0, x_328);
-lean_ctor_set(x_329, 1, x_327);
-x_330 = l_Lean_mkOptionalNode___closed__1;
-x_331 = lean_array_push(x_330, x_329);
-x_332 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_332, 0, x_16);
-lean_ctor_set(x_332, 1, x_331);
-x_333 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_334 = lean_array_push(x_333, x_322);
-x_335 = lean_array_push(x_334, x_332);
-x_336 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_336, 0, x_16);
-lean_ctor_set(x_336, 1, x_335);
-x_337 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_338 = lean_array_push(x_337, x_336);
-x_339 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_340 = lean_array_push(x_338, x_339);
-x_341 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_342 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_342, 0, x_341);
-lean_ctor_set(x_342, 1, x_340);
-x_343 = lean_array_push(x_330, x_342);
-x_344 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_344, 0, x_16);
-lean_ctor_set(x_344, 1, x_343);
-x_345 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_346 = lean_array_push(x_345, x_344);
-x_347 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_348 = lean_array_push(x_346, x_347);
-x_349 = lean_array_push(x_348, x_320);
-x_350 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_351 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_351, 0, x_350);
-lean_ctor_set(x_351, 1, x_349);
-x_352 = lean_array_push(x_333, x_351);
-x_353 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_354 = lean_array_push(x_352, x_353);
-x_355 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_355, 0, x_16);
-lean_ctor_set(x_355, 1, x_354);
-x_356 = lean_array_push(x_337, x_355);
-x_357 = lean_array_push(x_356, x_339);
-x_358 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_358, 0, x_341);
-lean_ctor_set(x_358, 1, x_357);
-x_359 = lean_array_push(x_333, x_358);
-x_360 = lean_array_push(x_359, x_318);
-x_361 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_362 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_362, 0, x_361);
-lean_ctor_set(x_362, 1, x_360);
-lean_ctor_set(x_323, 0, x_362);
-return x_323;
+x_307 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_307;
 }
 else
 {
-lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_371; lean_object* x_372; lean_object* x_373; lean_object* x_374; lean_object* x_375; lean_object* x_376; lean_object* x_377; lean_object* x_378; lean_object* x_379; lean_object* x_380; lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; lean_object* x_394; lean_object* x_395; lean_object* x_396; lean_object* x_397; lean_object* x_398; lean_object* x_399; lean_object* x_400; lean_object* x_401; 
-x_363 = lean_ctor_get(x_323, 1);
-lean_inc(x_363);
-lean_dec(x_323);
-x_364 = l_Lean_Elab_Term_elabShow___lambda__1___closed__5;
-x_365 = lean_array_push(x_364, x_215);
-x_366 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
-x_367 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_367, 0, x_366);
-lean_ctor_set(x_367, 1, x_365);
-x_368 = l_Lean_mkOptionalNode___closed__1;
-x_369 = lean_array_push(x_368, x_367);
+lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; lean_object* x_313; uint8_t x_314; 
+x_308 = l_Lean_Syntax_getArg(x_210, x_12);
+lean_dec(x_210);
+x_309 = lean_unsigned_to_nat(5u);
+x_310 = l_Lean_Syntax_getArg(x_1, x_309);
+x_311 = l_Lean_Elab_Term_elabShow___lambda__1___closed__2;
+x_312 = l_Lean_Elab_Term_mkTermId(x_1, x_311);
+lean_dec(x_1);
+x_313 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_314 = !lean_is_exclusive(x_313);
+if (x_314 == 0)
+{
+lean_object* x_315; lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; lean_object* x_322; lean_object* x_323; lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; lean_object* x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; 
+x_315 = lean_ctor_get(x_313, 0);
+lean_dec(x_315);
+x_316 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_317 = lean_array_push(x_316, x_208);
+x_318 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_319 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_319, 0, x_318);
+lean_ctor_set(x_319, 1, x_317);
+x_320 = l_Lean_mkOptionalNode___closed__1;
+x_321 = lean_array_push(x_320, x_319);
+x_322 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_322, 0, x_14);
+lean_ctor_set(x_322, 1, x_321);
+x_323 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_324 = lean_array_push(x_323, x_312);
+x_325 = lean_array_push(x_324, x_322);
+x_326 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_326, 0, x_14);
+lean_ctor_set(x_326, 1, x_325);
+x_327 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_328 = lean_array_push(x_327, x_326);
+x_329 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_330 = lean_array_push(x_328, x_329);
+x_331 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_332 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_332, 0, x_331);
+lean_ctor_set(x_332, 1, x_330);
+x_333 = lean_array_push(x_320, x_332);
+x_334 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_334, 0, x_14);
+lean_ctor_set(x_334, 1, x_333);
+x_335 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_336 = lean_array_push(x_335, x_334);
+x_337 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_338 = lean_array_push(x_336, x_337);
+x_339 = lean_array_push(x_338, x_310);
+x_340 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_341 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_341, 0, x_340);
+lean_ctor_set(x_341, 1, x_339);
+x_342 = lean_array_push(x_323, x_341);
+x_343 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_344 = lean_array_push(x_342, x_343);
+x_345 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_345, 0, x_14);
+lean_ctor_set(x_345, 1, x_344);
+x_346 = lean_array_push(x_327, x_345);
+x_347 = lean_array_push(x_346, x_329);
+x_348 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_348, 0, x_331);
+lean_ctor_set(x_348, 1, x_347);
+x_349 = lean_array_push(x_323, x_348);
+x_350 = lean_array_push(x_349, x_308);
+x_351 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_352 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_352, 0, x_351);
+lean_ctor_set(x_352, 1, x_350);
+lean_ctor_set(x_313, 0, x_352);
+return x_313;
+}
+else
+{
+lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; lean_object* x_358; lean_object* x_359; lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; lean_object* x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_371; lean_object* x_372; lean_object* x_373; lean_object* x_374; lean_object* x_375; lean_object* x_376; lean_object* x_377; lean_object* x_378; lean_object* x_379; lean_object* x_380; lean_object* x_381; lean_object* x_382; lean_object* x_383; lean_object* x_384; lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; 
+x_353 = lean_ctor_get(x_313, 1);
+lean_inc(x_353);
+lean_dec(x_313);
+x_354 = l_Lean_Elab_Term_elabShow___lambda__1___closed__3;
+x_355 = lean_array_push(x_354, x_208);
+x_356 = l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
+x_357 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_357, 0, x_356);
+lean_ctor_set(x_357, 1, x_355);
+x_358 = l_Lean_mkOptionalNode___closed__1;
+x_359 = lean_array_push(x_358, x_357);
+x_360 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_360, 0, x_14);
+lean_ctor_set(x_360, 1, x_359);
+x_361 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_362 = lean_array_push(x_361, x_312);
+x_363 = lean_array_push(x_362, x_360);
+x_364 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_364, 0, x_14);
+lean_ctor_set(x_364, 1, x_363);
+x_365 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_366 = lean_array_push(x_365, x_364);
+x_367 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_368 = lean_array_push(x_366, x_367);
+x_369 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
 x_370 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_370, 0, x_16);
-lean_ctor_set(x_370, 1, x_369);
-x_371 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_372 = lean_array_push(x_371, x_322);
-x_373 = lean_array_push(x_372, x_370);
-x_374 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_374, 0, x_16);
-lean_ctor_set(x_374, 1, x_373);
-x_375 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_376 = lean_array_push(x_375, x_374);
-x_377 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_378 = lean_array_push(x_376, x_377);
-x_379 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_380 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_380, 0, x_379);
-lean_ctor_set(x_380, 1, x_378);
-x_381 = lean_array_push(x_368, x_380);
-x_382 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_382, 0, x_16);
-lean_ctor_set(x_382, 1, x_381);
-x_383 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
-x_384 = lean_array_push(x_383, x_382);
-x_385 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
-x_386 = lean_array_push(x_384, x_385);
-x_387 = lean_array_push(x_386, x_320);
-x_388 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
-x_389 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_389, 0, x_388);
-lean_ctor_set(x_389, 1, x_387);
-x_390 = lean_array_push(x_371, x_389);
-x_391 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_392 = lean_array_push(x_390, x_391);
-x_393 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_393, 0, x_16);
-lean_ctor_set(x_393, 1, x_392);
-x_394 = lean_array_push(x_375, x_393);
-x_395 = lean_array_push(x_394, x_377);
-x_396 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_396, 0, x_379);
-lean_ctor_set(x_396, 1, x_395);
-x_397 = lean_array_push(x_371, x_396);
-x_398 = lean_array_push(x_397, x_318);
-x_399 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_400 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_400, 0, x_399);
-lean_ctor_set(x_400, 1, x_398);
-x_401 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_401, 0, x_400);
-lean_ctor_set(x_401, 1, x_363);
-return x_401;
+lean_ctor_set(x_370, 0, x_369);
+lean_ctor_set(x_370, 1, x_368);
+x_371 = lean_array_push(x_358, x_370);
+x_372 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_372, 0, x_14);
+lean_ctor_set(x_372, 1, x_371);
+x_373 = l_Lean_Elab_Term_expandCDot_x3f___closed__3;
+x_374 = lean_array_push(x_373, x_372);
+x_375 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+x_376 = lean_array_push(x_374, x_375);
+x_377 = lean_array_push(x_376, x_310);
+x_378 = l_Lean_Parser_Term_fun___elambda__1___closed__2;
+x_379 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_379, 0, x_378);
+lean_ctor_set(x_379, 1, x_377);
+x_380 = lean_array_push(x_361, x_379);
+x_381 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_382 = lean_array_push(x_380, x_381);
+x_383 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_383, 0, x_14);
+lean_ctor_set(x_383, 1, x_382);
+x_384 = lean_array_push(x_365, x_383);
+x_385 = lean_array_push(x_384, x_367);
+x_386 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_386, 0, x_369);
+lean_ctor_set(x_386, 1, x_385);
+x_387 = lean_array_push(x_361, x_386);
+x_388 = lean_array_push(x_387, x_308);
+x_389 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_390 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_390, 0, x_389);
+lean_ctor_set(x_390, 1, x_388);
+x_391 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_391, 0, x_390);
+lean_ctor_set(x_391, 1, x_353);
+return x_391;
 }
 }
 }
@@ -3713,7 +3646,7 @@ lean_object* _init_l_Lean_Elab_Term_elabHave___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabHave___lambda__1), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabHave___lambda__1___boxed), 3, 0);
 return x_1;
 }
 }
@@ -3726,6 +3659,15 @@ x_6 = l_Lean_Elab_Term_adaptExpander(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
+lean_object* l_Lean_Elab_Term_elabHave___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Term_elabHave___lambda__1(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
 lean_object* _init_l___regBuiltinTermElab_Lean_Elab_Term_elabHave___closed__1() {
 _start:
 {
@@ -3809,16 +3751,6 @@ return x_25;
 }
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabWhere___lambda__1___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_where___elambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
 lean_object* l_Lean_Elab_Term_elabWhere___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -3828,46 +3760,45 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabWhere___lambda__1___closed__1;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
-lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(3u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabWhere___lambda__1___closed__1;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
-}
-else
-{
-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; 
-x_14 = lean_unsigned_to_nat(0u);
-x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = lean_unsigned_to_nat(2u);
-x_17 = l_Lean_Syntax_getArg(x_1, x_16);
-x_18 = l_Lean_Syntax_getArgs(x_17);
-lean_dec(x_17);
-x_19 = l_Array_empty___closed__1;
-x_20 = l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(x_16, x_18, x_14, x_19);
-lean_dec(x_18);
-x_21 = lean_array_get_size(x_20);
-x_22 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__2;
-x_23 = l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_Elab_Term_elabWhere___spec__1(x_1, x_22, x_20, x_21, lean_box(0), x_15, x_2, x_3);
-lean_dec(x_2);
-lean_dec(x_20);
+lean_object* x_6; 
 lean_dec(x_1);
-return x_23;
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
+}
+else
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(3u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
+lean_dec(x_8);
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
+}
+else
+{
+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; 
+x_12 = lean_unsigned_to_nat(0u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = lean_unsigned_to_nat(2u);
+x_15 = l_Lean_Syntax_getArg(x_1, x_14);
+x_16 = l_Lean_Syntax_getArgs(x_15);
+lean_dec(x_15);
+x_17 = l_Array_empty___closed__1;
+x_18 = l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(x_14, x_16, x_12, x_17);
+lean_dec(x_16);
+x_19 = lean_array_get_size(x_18);
+x_20 = l_Lean_Parser_Term_explicitUniv___elambda__1___closed__2;
+x_21 = l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_Elab_Term_elabWhere___spec__1(x_1, x_20, x_18, x_19, lean_box(0), x_13, x_2, x_3);
+lean_dec(x_18);
+lean_dec(x_1);
+return x_21;
 }
 }
 }
@@ -3876,7 +3807,7 @@ lean_object* _init_l_Lean_Elab_Term_elabWhere___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabWhere___lambda__1), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabWhere___lambda__1___boxed), 3, 0);
 return x_1;
 }
 }
@@ -3900,17 +3831,16 @@ lean_dec(x_1);
 return x_9;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__1() {
+lean_object* l_Lean_Elab_Term_elabWhere___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_parser_x21___elambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Term_elabWhere___lambda__1(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__2() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -3918,12 +3848,22 @@ x_1 = lean_mk_string("invalid `parser!` macro, it must be used in definitions");
 return x_1;
 }
 }
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__1;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__2;
-x_2 = lean_alloc_ctor(2, 1, 0);
+x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
@@ -3931,19 +3871,19 @@ return x_2;
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__3;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
+lean_object* x_1; 
+x_1 = lean_mk_string("invalid `parser!` macro, unexpected declaration name");
+return x_1;
 }
 }
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__5() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("invalid `parser!` macro, unexpected declaration name");
-return x_1;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__4;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
 }
 }
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__6() {
@@ -3951,7 +3891,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__5;
-x_2 = lean_alloc_ctor(2, 1, 0);
+x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
@@ -3959,37 +3899,27 @@ return x_2;
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__7() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__6;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__8() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("HasOrelse.orelse");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__9() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__8;
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__7;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__10() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__8;
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__7;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__9;
+x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__8;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -3997,7 +3927,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__11() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__10() {
 _start:
 {
 lean_object* x_1; 
@@ -4005,12 +3935,22 @@ x_1 = lean_mk_string("HasOrelse");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__12() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__11;
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__10;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__12() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__11;
+x_2 = l_Lean_Parser_Term_orelse___elambda__1___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -4019,9 +3959,11 @@ lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__12;
-x_2 = l_Lean_Parser_Term_orelse___elambda__1___closed__1;
-x_3 = lean_name_mk_string(x_1, x_2);
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__12;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
@@ -4031,7 +3973,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__13;
-x_3 = lean_alloc_ctor(0, 2, 0);
+x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
@@ -4040,39 +3982,27 @@ return x_3;
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__15() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__14;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__16() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("Lean.Parser.mkAntiquot");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__17() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__16() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__16;
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__15;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__18() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__17() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__16;
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__15;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__17;
+x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__16;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4080,7 +4010,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__19() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__18() {
 _start:
 {
 lean_object* x_1; 
@@ -4088,23 +4018,35 @@ x_1 = lean_mk_string("mkAntiquot");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__20() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__19() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_declareLeadingBuiltinParser___closed__1;
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__19;
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__18;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__20() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__19;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__21() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__20;
-x_3 = lean_alloc_ctor(0, 2, 0);
+x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
@@ -4113,39 +4055,27 @@ return x_3;
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__22() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__21;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__23() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("some");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__24() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__23() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__23;
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__22;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__25() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__24() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__23;
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__22;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__24;
+x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__23;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4153,12 +4083,22 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__26() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__25() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__23;
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__22;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__26() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__33;
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__22;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -4167,9 +4107,11 @@ lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__27() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__33;
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__23;
-x_3 = lean_name_mk_string(x_1, x_2);
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__26;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
@@ -4179,7 +4121,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__27;
-x_3 = lean_alloc_ctor(0, 2, 0);
+x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
@@ -4188,31 +4130,19 @@ return x_3;
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__29() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__28;
-x_3 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__30() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Bool_HasRepr___closed__2;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__31() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__30() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = l_Bool_HasRepr___closed__2;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__30;
+x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__29;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4220,7 +4150,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__32() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__31() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -4230,7 +4160,7 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__33() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__32() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -4242,19 +4172,19 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__34() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__33() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__33;
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__32;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__35() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__34() {
 _start:
 {
 lean_object* x_1; 
@@ -4262,22 +4192,22 @@ x_1 = lean_mk_string("Lean.Parser.leadingNode");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__36() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__35() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__35;
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__34;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__37() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__36() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__35;
+x_1 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__34;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__36;
+x_3 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__35;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4285,7 +4215,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__38() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__37() {
 _start:
 {
 lean_object* x_1; 
@@ -4293,34 +4223,34 @@ x_1 = lean_mk_string("leadingNode");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__39() {
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__38() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_declareLeadingBuiltinParser___closed__1;
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__38;
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__37;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
+lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__39() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__38;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
 lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__40() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__39;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__41() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__40;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
@@ -4336,411 +4266,413 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__1;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
-lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(2u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__1;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = l_Lean_Elab_Term_getDeclName_x3f(x_2, x_3);
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-lean_dec(x_15);
-x_18 = lean_ctor_get(x_16, 1);
-lean_inc(x_18);
-lean_dec(x_16);
-x_19 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__4;
-x_20 = l_Lean_Elab_Term_throwError___rarg(x_1, x_19, x_2, x_18);
-return x_20;
-}
-else
-{
-lean_object* x_21; 
-x_21 = lean_ctor_get(x_17, 0);
-lean_inc(x_21);
-lean_dec(x_17);
-if (lean_obj_tag(x_21) == 1)
-{
-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_dec(x_1);
-x_22 = lean_ctor_get(x_16, 1);
-lean_inc(x_22);
-lean_dec(x_16);
-x_23 = lean_ctor_get(x_21, 1);
-lean_inc(x_23);
-x_24 = l___private_Init_Lean_Elab_Quotation_1__quoteName___main(x_21);
-x_25 = lean_box(0);
-x_26 = l_Lean_mkStxStrLit(x_23, x_25);
-x_27 = l_Lean_mkOptionalNode___closed__1;
-x_28 = lean_array_push(x_27, x_26);
-x_29 = l_Lean_Parser_Term_str___elambda__1___closed__2;
-x_30 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_30, 0, x_29);
-lean_ctor_set(x_30, 1, x_28);
-x_31 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_22);
+lean_object* x_6; 
 lean_dec(x_2);
-x_32 = !lean_is_exclusive(x_31);
-if (x_32 == 0)
-{
-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_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; 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; 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; lean_object* x_89; 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; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 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_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; 
-x_33 = lean_ctor_get(x_31, 0);
-x_34 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__13;
-lean_inc(x_33);
-x_35 = lean_name_mk_numeral(x_34, x_33);
-x_36 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__10;
-x_37 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__15;
-x_38 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_38, 0, x_25);
-lean_ctor_set(x_38, 1, x_36);
-lean_ctor_set(x_38, 2, x_35);
-lean_ctor_set(x_38, 3, x_37);
-x_39 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_40 = lean_array_push(x_39, x_38);
-x_41 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_42 = lean_array_push(x_40, x_41);
-x_43 = l_Lean_Parser_Term_id___elambda__1___closed__2;
-x_44 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_44, 0, x_43);
-lean_ctor_set(x_44, 1, x_42);
-x_45 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__20;
-lean_inc(x_33);
-x_46 = lean_name_mk_numeral(x_45, x_33);
-x_47 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__18;
-x_48 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__22;
-x_49 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_49, 0, x_25);
-lean_ctor_set(x_49, 1, x_47);
-lean_ctor_set(x_49, 2, x_46);
-lean_ctor_set(x_49, 3, x_48);
-x_50 = lean_array_push(x_39, x_49);
-x_51 = lean_array_push(x_50, x_41);
-x_52 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_52, 0, x_43);
-lean_ctor_set(x_52, 1, x_51);
-x_53 = lean_array_push(x_39, x_52);
-x_54 = lean_array_push(x_53, x_30);
-x_55 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_56 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_56, 0, x_55);
-lean_ctor_set(x_56, 1, x_54);
-x_57 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__26;
-lean_inc(x_33);
-x_58 = lean_name_mk_numeral(x_57, x_33);
-x_59 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__25;
-x_60 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__29;
-x_61 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_61, 0, x_25);
-lean_ctor_set(x_61, 1, x_59);
-lean_ctor_set(x_61, 2, x_58);
-lean_ctor_set(x_61, 3, x_60);
-x_62 = lean_array_push(x_39, x_61);
-x_63 = lean_array_push(x_62, x_41);
-x_64 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_64, 0, x_43);
-lean_ctor_set(x_64, 1, x_63);
-x_65 = lean_array_push(x_39, x_64);
-lean_inc(x_24);
-x_66 = lean_array_push(x_65, x_24);
-x_67 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_67, 0, x_55);
-lean_ctor_set(x_67, 1, x_66);
-x_68 = lean_array_push(x_39, x_67);
-x_69 = lean_array_push(x_68, x_41);
-x_70 = l_Lean_nullKind___closed__2;
-x_71 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_71, 0, x_70);
-lean_ctor_set(x_71, 1, x_69);
-x_72 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_73 = lean_array_push(x_72, x_71);
-x_74 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_75 = lean_array_push(x_73, x_74);
-x_76 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_77 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_77, 0, x_76);
-lean_ctor_set(x_77, 1, x_75);
-x_78 = lean_array_push(x_39, x_56);
-x_79 = lean_array_push(x_78, x_77);
-x_80 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_80, 0, x_55);
-lean_ctor_set(x_80, 1, x_79);
-x_81 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__32;
-lean_inc(x_33);
-x_82 = lean_name_mk_numeral(x_81, x_33);
-x_83 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__31;
-x_84 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__34;
-x_85 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_85, 0, x_25);
-lean_ctor_set(x_85, 1, x_83);
-lean_ctor_set(x_85, 2, x_82);
-lean_ctor_set(x_85, 3, x_84);
-x_86 = lean_array_push(x_39, x_85);
-x_87 = lean_array_push(x_86, x_41);
-x_88 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_88, 0, x_43);
-lean_ctor_set(x_88, 1, x_87);
-x_89 = lean_array_push(x_39, x_80);
-x_90 = lean_array_push(x_89, x_88);
-x_91 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_91, 0, x_55);
-lean_ctor_set(x_91, 1, x_90);
-x_92 = lean_array_push(x_39, x_91);
-x_93 = lean_array_push(x_92, x_41);
-x_94 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_94, 0, x_70);
-lean_ctor_set(x_94, 1, x_93);
-x_95 = lean_array_push(x_72, x_94);
-x_96 = lean_array_push(x_95, x_74);
-x_97 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_97, 0, x_76);
-lean_ctor_set(x_97, 1, x_96);
-x_98 = lean_array_push(x_39, x_44);
-x_99 = lean_array_push(x_98, x_97);
-x_100 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_100, 0, x_55);
-lean_ctor_set(x_100, 1, x_99);
-x_101 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__39;
-x_102 = lean_name_mk_numeral(x_101, x_33);
-x_103 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__37;
-x_104 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__41;
-x_105 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_105, 0, x_25);
-lean_ctor_set(x_105, 1, x_103);
-lean_ctor_set(x_105, 2, x_102);
-lean_ctor_set(x_105, 3, x_104);
-x_106 = lean_array_push(x_39, x_105);
-x_107 = lean_array_push(x_106, x_41);
-x_108 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_108, 0, x_43);
-lean_ctor_set(x_108, 1, x_107);
-x_109 = lean_array_push(x_39, x_108);
-x_110 = lean_array_push(x_109, x_24);
-x_111 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_111, 0, x_55);
-lean_ctor_set(x_111, 1, x_110);
-x_112 = lean_array_push(x_39, x_111);
-x_113 = lean_array_push(x_112, x_15);
-x_114 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_114, 0, x_55);
-lean_ctor_set(x_114, 1, x_113);
-x_115 = lean_array_push(x_39, x_114);
-x_116 = lean_array_push(x_115, x_41);
-x_117 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_117, 0, x_70);
-lean_ctor_set(x_117, 1, x_116);
-x_118 = lean_array_push(x_72, x_117);
-x_119 = lean_array_push(x_118, x_74);
-x_120 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_120, 0, x_76);
-lean_ctor_set(x_120, 1, x_119);
-x_121 = lean_array_push(x_39, x_100);
-x_122 = lean_array_push(x_121, x_120);
-x_123 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_123, 0, x_55);
-lean_ctor_set(x_123, 1, x_122);
-lean_ctor_set(x_31, 0, x_123);
-return x_31;
+lean_dec(x_1);
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
 }
 else
 {
-lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 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_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 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_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; lean_object* 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; 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; 
-x_124 = lean_ctor_get(x_31, 0);
-x_125 = lean_ctor_get(x_31, 1);
-lean_inc(x_125);
-lean_inc(x_124);
-lean_dec(x_31);
-x_126 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__13;
-lean_inc(x_124);
-x_127 = lean_name_mk_numeral(x_126, x_124);
-x_128 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__10;
-x_129 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__15;
-x_130 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_130, 0, x_25);
-lean_ctor_set(x_130, 1, x_128);
-lean_ctor_set(x_130, 2, x_127);
-lean_ctor_set(x_130, 3, x_129);
-x_131 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_132 = lean_array_push(x_131, x_130);
-x_133 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_134 = lean_array_push(x_132, x_133);
-x_135 = l_Lean_Parser_Term_id___elambda__1___closed__2;
-x_136 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_136, 0, x_135);
-lean_ctor_set(x_136, 1, x_134);
-x_137 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__20;
-lean_inc(x_124);
-x_138 = lean_name_mk_numeral(x_137, x_124);
-x_139 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__18;
-x_140 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__22;
-x_141 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_141, 0, x_25);
-lean_ctor_set(x_141, 1, x_139);
-lean_ctor_set(x_141, 2, x_138);
-lean_ctor_set(x_141, 3, x_140);
-x_142 = lean_array_push(x_131, x_141);
-x_143 = lean_array_push(x_142, x_133);
-x_144 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_144, 0, x_135);
-lean_ctor_set(x_144, 1, x_143);
-x_145 = lean_array_push(x_131, x_144);
-x_146 = lean_array_push(x_145, x_30);
-x_147 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_148 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_148, 0, x_147);
-lean_ctor_set(x_148, 1, x_146);
-x_149 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__26;
-lean_inc(x_124);
-x_150 = lean_name_mk_numeral(x_149, x_124);
-x_151 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__25;
-x_152 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__29;
-x_153 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_153, 0, x_25);
-lean_ctor_set(x_153, 1, x_151);
-lean_ctor_set(x_153, 2, x_150);
-lean_ctor_set(x_153, 3, x_152);
-x_154 = lean_array_push(x_131, x_153);
-x_155 = lean_array_push(x_154, x_133);
-x_156 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_156, 0, x_135);
-lean_ctor_set(x_156, 1, x_155);
-x_157 = lean_array_push(x_131, x_156);
-lean_inc(x_24);
-x_158 = lean_array_push(x_157, x_24);
-x_159 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_159, 0, x_147);
-lean_ctor_set(x_159, 1, x_158);
-x_160 = lean_array_push(x_131, x_159);
-x_161 = lean_array_push(x_160, x_133);
-x_162 = l_Lean_nullKind___closed__2;
-x_163 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_163, 0, x_162);
-lean_ctor_set(x_163, 1, x_161);
-x_164 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
-x_165 = lean_array_push(x_164, x_163);
-x_166 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
-x_167 = lean_array_push(x_165, x_166);
-x_168 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
-x_169 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_169, 0, x_168);
-lean_ctor_set(x_169, 1, x_167);
-x_170 = lean_array_push(x_131, x_148);
-x_171 = lean_array_push(x_170, x_169);
-x_172 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_172, 0, x_147);
-lean_ctor_set(x_172, 1, x_171);
-x_173 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__32;
-lean_inc(x_124);
-x_174 = lean_name_mk_numeral(x_173, x_124);
-x_175 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__31;
-x_176 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__34;
-x_177 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_177, 0, x_25);
-lean_ctor_set(x_177, 1, x_175);
-lean_ctor_set(x_177, 2, x_174);
-lean_ctor_set(x_177, 3, x_176);
-x_178 = lean_array_push(x_131, x_177);
-x_179 = lean_array_push(x_178, x_133);
-x_180 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_180, 0, x_135);
-lean_ctor_set(x_180, 1, x_179);
-x_181 = lean_array_push(x_131, x_172);
-x_182 = lean_array_push(x_181, x_180);
-x_183 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_183, 0, x_147);
-lean_ctor_set(x_183, 1, x_182);
-x_184 = lean_array_push(x_131, x_183);
-x_185 = lean_array_push(x_184, x_133);
-x_186 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_186, 0, x_162);
-lean_ctor_set(x_186, 1, x_185);
-x_187 = lean_array_push(x_164, x_186);
-x_188 = lean_array_push(x_187, x_166);
-x_189 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_189, 0, x_168);
-lean_ctor_set(x_189, 1, x_188);
-x_190 = lean_array_push(x_131, x_136);
-x_191 = lean_array_push(x_190, x_189);
-x_192 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_192, 0, x_147);
-lean_ctor_set(x_192, 1, x_191);
-x_193 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__39;
-x_194 = lean_name_mk_numeral(x_193, x_124);
-x_195 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__37;
-x_196 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__41;
-x_197 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_197, 0, x_25);
-lean_ctor_set(x_197, 1, x_195);
-lean_ctor_set(x_197, 2, x_194);
-lean_ctor_set(x_197, 3, x_196);
-x_198 = lean_array_push(x_131, x_197);
-x_199 = lean_array_push(x_198, x_133);
-x_200 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_200, 0, x_135);
-lean_ctor_set(x_200, 1, x_199);
-x_201 = lean_array_push(x_131, x_200);
-x_202 = lean_array_push(x_201, x_24);
-x_203 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_203, 0, x_147);
-lean_ctor_set(x_203, 1, x_202);
-x_204 = lean_array_push(x_131, x_203);
-x_205 = lean_array_push(x_204, x_15);
-x_206 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_206, 0, x_147);
-lean_ctor_set(x_206, 1, x_205);
-x_207 = lean_array_push(x_131, x_206);
-x_208 = lean_array_push(x_207, x_133);
-x_209 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_209, 0, x_162);
-lean_ctor_set(x_209, 1, x_208);
-x_210 = lean_array_push(x_164, x_209);
-x_211 = lean_array_push(x_210, x_166);
-x_212 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_212, 0, x_168);
-lean_ctor_set(x_212, 1, x_211);
-x_213 = lean_array_push(x_131, x_192);
-x_214 = lean_array_push(x_213, x_212);
-x_215 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_215, 0, x_147);
-lean_ctor_set(x_215, 1, x_214);
-x_216 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_216, 0, x_215);
-lean_ctor_set(x_216, 1, x_125);
-return x_216;
-}
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(2u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
+lean_dec(x_8);
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
 }
 else
 {
-lean_object* x_217; lean_object* x_218; lean_object* x_219; 
-lean_dec(x_21);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = l_Lean_Elab_Term_getDeclName_x3f(x_2, x_3);
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+if (lean_obj_tag(x_15) == 0)
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+lean_dec(x_13);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__3;
+x_18 = l_Lean_Elab_Term_throwError___rarg(x_1, x_17, x_2, x_16);
+return x_18;
+}
+else
+{
+lean_object* x_19; 
+x_19 = lean_ctor_get(x_15, 0);
+lean_inc(x_19);
 lean_dec(x_15);
-x_217 = lean_ctor_get(x_16, 1);
-lean_inc(x_217);
-lean_dec(x_16);
-x_218 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__7;
-x_219 = l_Lean_Elab_Term_throwError___rarg(x_1, x_218, x_2, x_217);
-return x_219;
+if (lean_obj_tag(x_19) == 1)
+{
+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; uint8_t x_30; 
+lean_dec(x_1);
+x_20 = lean_ctor_get(x_14, 1);
+lean_inc(x_20);
+lean_dec(x_14);
+x_21 = lean_ctor_get(x_19, 1);
+lean_inc(x_21);
+x_22 = l___private_Init_Lean_Elab_Quotation_1__quoteName___main(x_19);
+x_23 = lean_box(0);
+x_24 = l_Lean_mkStxStrLit(x_21, x_23);
+x_25 = l_Lean_mkOptionalNode___closed__1;
+x_26 = lean_array_push(x_25, x_24);
+x_27 = l_Lean_Parser_Term_str___elambda__1___closed__2;
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_27);
+lean_ctor_set(x_28, 1, x_26);
+x_29 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_20);
+lean_dec(x_2);
+x_30 = !lean_is_exclusive(x_29);
+if (x_30 == 0)
+{
+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; 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_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; 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; 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; lean_object* x_89; 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; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 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_119; lean_object* x_120; lean_object* x_121; 
+x_31 = lean_ctor_get(x_29, 0);
+x_32 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__12;
+lean_inc(x_31);
+x_33 = lean_name_mk_numeral(x_32, x_31);
+x_34 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__9;
+x_35 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__14;
+x_36 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_36, 0, x_23);
+lean_ctor_set(x_36, 1, x_34);
+lean_ctor_set(x_36, 2, x_33);
+lean_ctor_set(x_36, 3, x_35);
+x_37 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_38 = lean_array_push(x_37, x_36);
+x_39 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_40 = lean_array_push(x_38, x_39);
+x_41 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 1, x_40);
+x_43 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__19;
+lean_inc(x_31);
+x_44 = lean_name_mk_numeral(x_43, x_31);
+x_45 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__17;
+x_46 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__21;
+x_47 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_47, 0, x_23);
+lean_ctor_set(x_47, 1, x_45);
+lean_ctor_set(x_47, 2, x_44);
+lean_ctor_set(x_47, 3, x_46);
+x_48 = lean_array_push(x_37, x_47);
+x_49 = lean_array_push(x_48, x_39);
+x_50 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_50, 0, x_41);
+lean_ctor_set(x_50, 1, x_49);
+x_51 = lean_array_push(x_37, x_50);
+x_52 = lean_array_push(x_51, x_28);
+x_53 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_54 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_54, 0, x_53);
+lean_ctor_set(x_54, 1, x_52);
+x_55 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__25;
+lean_inc(x_31);
+x_56 = lean_name_mk_numeral(x_55, x_31);
+x_57 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__24;
+x_58 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__28;
+x_59 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_59, 0, x_23);
+lean_ctor_set(x_59, 1, x_57);
+lean_ctor_set(x_59, 2, x_56);
+lean_ctor_set(x_59, 3, x_58);
+x_60 = lean_array_push(x_37, x_59);
+x_61 = lean_array_push(x_60, x_39);
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_41);
+lean_ctor_set(x_62, 1, x_61);
+x_63 = lean_array_push(x_37, x_62);
+lean_inc(x_22);
+x_64 = lean_array_push(x_63, x_22);
+x_65 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_65, 0, x_53);
+lean_ctor_set(x_65, 1, x_64);
+x_66 = lean_array_push(x_37, x_65);
+x_67 = lean_array_push(x_66, x_39);
+x_68 = l_Lean_nullKind___closed__2;
+x_69 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_69, 0, x_68);
+lean_ctor_set(x_69, 1, x_67);
+x_70 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_71 = lean_array_push(x_70, x_69);
+x_72 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_73 = lean_array_push(x_71, x_72);
+x_74 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_75 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_75, 0, x_74);
+lean_ctor_set(x_75, 1, x_73);
+x_76 = lean_array_push(x_37, x_54);
+x_77 = lean_array_push(x_76, x_75);
+x_78 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_78, 0, x_53);
+lean_ctor_set(x_78, 1, x_77);
+x_79 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__31;
+lean_inc(x_31);
+x_80 = lean_name_mk_numeral(x_79, x_31);
+x_81 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__30;
+x_82 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__33;
+x_83 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_83, 0, x_23);
+lean_ctor_set(x_83, 1, x_81);
+lean_ctor_set(x_83, 2, x_80);
+lean_ctor_set(x_83, 3, x_82);
+x_84 = lean_array_push(x_37, x_83);
+x_85 = lean_array_push(x_84, x_39);
+x_86 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_86, 0, x_41);
+lean_ctor_set(x_86, 1, x_85);
+x_87 = lean_array_push(x_37, x_78);
+x_88 = lean_array_push(x_87, x_86);
+x_89 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_89, 0, x_53);
+lean_ctor_set(x_89, 1, x_88);
+x_90 = lean_array_push(x_37, x_89);
+x_91 = lean_array_push(x_90, x_39);
+x_92 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_92, 0, x_68);
+lean_ctor_set(x_92, 1, x_91);
+x_93 = lean_array_push(x_70, x_92);
+x_94 = lean_array_push(x_93, x_72);
+x_95 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_95, 0, x_74);
+lean_ctor_set(x_95, 1, x_94);
+x_96 = lean_array_push(x_37, x_42);
+x_97 = lean_array_push(x_96, x_95);
+x_98 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_98, 0, x_53);
+lean_ctor_set(x_98, 1, x_97);
+x_99 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__38;
+x_100 = lean_name_mk_numeral(x_99, x_31);
+x_101 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__36;
+x_102 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__40;
+x_103 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_103, 0, x_23);
+lean_ctor_set(x_103, 1, x_101);
+lean_ctor_set(x_103, 2, x_100);
+lean_ctor_set(x_103, 3, x_102);
+x_104 = lean_array_push(x_37, x_103);
+x_105 = lean_array_push(x_104, x_39);
+x_106 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_106, 0, x_41);
+lean_ctor_set(x_106, 1, x_105);
+x_107 = lean_array_push(x_37, x_106);
+x_108 = lean_array_push(x_107, x_22);
+x_109 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_109, 0, x_53);
+lean_ctor_set(x_109, 1, x_108);
+x_110 = lean_array_push(x_37, x_109);
+x_111 = lean_array_push(x_110, x_13);
+x_112 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_112, 0, x_53);
+lean_ctor_set(x_112, 1, x_111);
+x_113 = lean_array_push(x_37, x_112);
+x_114 = lean_array_push(x_113, x_39);
+x_115 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_115, 0, x_68);
+lean_ctor_set(x_115, 1, x_114);
+x_116 = lean_array_push(x_70, x_115);
+x_117 = lean_array_push(x_116, x_72);
+x_118 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_118, 0, x_74);
+lean_ctor_set(x_118, 1, x_117);
+x_119 = lean_array_push(x_37, x_98);
+x_120 = lean_array_push(x_119, x_118);
+x_121 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_121, 0, x_53);
+lean_ctor_set(x_121, 1, x_120);
+lean_ctor_set(x_29, 0, x_121);
+return x_29;
+}
+else
+{
+lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; 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_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; 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_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; lean_object* 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; 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; 
+x_122 = lean_ctor_get(x_29, 0);
+x_123 = lean_ctor_get(x_29, 1);
+lean_inc(x_123);
+lean_inc(x_122);
+lean_dec(x_29);
+x_124 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__12;
+lean_inc(x_122);
+x_125 = lean_name_mk_numeral(x_124, x_122);
+x_126 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__9;
+x_127 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__14;
+x_128 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_128, 0, x_23);
+lean_ctor_set(x_128, 1, x_126);
+lean_ctor_set(x_128, 2, x_125);
+lean_ctor_set(x_128, 3, x_127);
+x_129 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_130 = lean_array_push(x_129, x_128);
+x_131 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_132 = lean_array_push(x_130, x_131);
+x_133 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_134 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_134, 0, x_133);
+lean_ctor_set(x_134, 1, x_132);
+x_135 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__19;
+lean_inc(x_122);
+x_136 = lean_name_mk_numeral(x_135, x_122);
+x_137 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__17;
+x_138 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__21;
+x_139 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_139, 0, x_23);
+lean_ctor_set(x_139, 1, x_137);
+lean_ctor_set(x_139, 2, x_136);
+lean_ctor_set(x_139, 3, x_138);
+x_140 = lean_array_push(x_129, x_139);
+x_141 = lean_array_push(x_140, x_131);
+x_142 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_142, 0, x_133);
+lean_ctor_set(x_142, 1, x_141);
+x_143 = lean_array_push(x_129, x_142);
+x_144 = lean_array_push(x_143, x_28);
+x_145 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_146 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_146, 0, x_145);
+lean_ctor_set(x_146, 1, x_144);
+x_147 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__25;
+lean_inc(x_122);
+x_148 = lean_name_mk_numeral(x_147, x_122);
+x_149 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__24;
+x_150 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__28;
+x_151 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_151, 0, x_23);
+lean_ctor_set(x_151, 1, x_149);
+lean_ctor_set(x_151, 2, x_148);
+lean_ctor_set(x_151, 3, x_150);
+x_152 = lean_array_push(x_129, x_151);
+x_153 = lean_array_push(x_152, x_131);
+x_154 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_154, 0, x_133);
+lean_ctor_set(x_154, 1, x_153);
+x_155 = lean_array_push(x_129, x_154);
+lean_inc(x_22);
+x_156 = lean_array_push(x_155, x_22);
+x_157 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_157, 0, x_145);
+lean_ctor_set(x_157, 1, x_156);
+x_158 = lean_array_push(x_129, x_157);
+x_159 = lean_array_push(x_158, x_131);
+x_160 = l_Lean_nullKind___closed__2;
+x_161 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_161, 0, x_160);
+lean_ctor_set(x_161, 1, x_159);
+x_162 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__64;
+x_163 = lean_array_push(x_162, x_161);
+x_164 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__63;
+x_165 = lean_array_push(x_163, x_164);
+x_166 = l_Lean_Parser_Term_paren___elambda__1___closed__1;
+x_167 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_167, 0, x_166);
+lean_ctor_set(x_167, 1, x_165);
+x_168 = lean_array_push(x_129, x_146);
+x_169 = lean_array_push(x_168, x_167);
+x_170 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_170, 0, x_145);
+lean_ctor_set(x_170, 1, x_169);
+x_171 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__31;
+lean_inc(x_122);
+x_172 = lean_name_mk_numeral(x_171, x_122);
+x_173 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__30;
+x_174 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__33;
+x_175 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_175, 0, x_23);
+lean_ctor_set(x_175, 1, x_173);
+lean_ctor_set(x_175, 2, x_172);
+lean_ctor_set(x_175, 3, x_174);
+x_176 = lean_array_push(x_129, x_175);
+x_177 = lean_array_push(x_176, x_131);
+x_178 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_178, 0, x_133);
+lean_ctor_set(x_178, 1, x_177);
+x_179 = lean_array_push(x_129, x_170);
+x_180 = lean_array_push(x_179, x_178);
+x_181 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_181, 0, x_145);
+lean_ctor_set(x_181, 1, x_180);
+x_182 = lean_array_push(x_129, x_181);
+x_183 = lean_array_push(x_182, x_131);
+x_184 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_184, 0, x_160);
+lean_ctor_set(x_184, 1, x_183);
+x_185 = lean_array_push(x_162, x_184);
+x_186 = lean_array_push(x_185, x_164);
+x_187 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_187, 0, x_166);
+lean_ctor_set(x_187, 1, x_186);
+x_188 = lean_array_push(x_129, x_134);
+x_189 = lean_array_push(x_188, x_187);
+x_190 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_190, 0, x_145);
+lean_ctor_set(x_190, 1, x_189);
+x_191 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__38;
+x_192 = lean_name_mk_numeral(x_191, x_122);
+x_193 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__36;
+x_194 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__40;
+x_195 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_195, 0, x_23);
+lean_ctor_set(x_195, 1, x_193);
+lean_ctor_set(x_195, 2, x_192);
+lean_ctor_set(x_195, 3, x_194);
+x_196 = lean_array_push(x_129, x_195);
+x_197 = lean_array_push(x_196, x_131);
+x_198 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_198, 0, x_133);
+lean_ctor_set(x_198, 1, x_197);
+x_199 = lean_array_push(x_129, x_198);
+x_200 = lean_array_push(x_199, x_22);
+x_201 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_201, 0, x_145);
+lean_ctor_set(x_201, 1, x_200);
+x_202 = lean_array_push(x_129, x_201);
+x_203 = lean_array_push(x_202, x_13);
+x_204 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_204, 0, x_145);
+lean_ctor_set(x_204, 1, x_203);
+x_205 = lean_array_push(x_129, x_204);
+x_206 = lean_array_push(x_205, x_131);
+x_207 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_207, 0, x_160);
+lean_ctor_set(x_207, 1, x_206);
+x_208 = lean_array_push(x_162, x_207);
+x_209 = lean_array_push(x_208, x_164);
+x_210 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_210, 0, x_166);
+lean_ctor_set(x_210, 1, x_209);
+x_211 = lean_array_push(x_129, x_190);
+x_212 = lean_array_push(x_211, x_210);
+x_213 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_213, 0, x_145);
+lean_ctor_set(x_213, 1, x_212);
+x_214 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_214, 0, x_213);
+lean_ctor_set(x_214, 1, x_123);
+return x_214;
+}
+}
+else
+{
+lean_object* x_215; lean_object* x_216; lean_object* x_217; 
+lean_dec(x_19);
+lean_dec(x_13);
+x_215 = lean_ctor_get(x_14, 1);
+lean_inc(x_215);
+lean_dec(x_14);
+x_216 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__6;
+x_217 = l_Lean_Elab_Term_throwError___rarg(x_1, x_216, x_2, x_215);
+return x_217;
 }
 }
 }
@@ -4767,19 +4699,19 @@ return x_6;
 lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__1() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_tparser_x21___elambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
+lean_object* x_1; 
+x_1 = lean_mk_string("invalid `tparser!` macro, it must be used in definitions");
+return x_1;
 }
 }
 lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__2() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("invalid `tparser!` macro, it must be used in definitions");
-return x_1;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__1;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
 }
 }
 lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__3() {
@@ -4787,7 +4719,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__2;
-x_2 = lean_alloc_ctor(2, 1, 0);
+x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
@@ -4795,37 +4727,27 @@ return x_2;
 lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__4() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__3;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__5() {
-_start:
-{
 lean_object* x_1; 
 x_1 = lean_mk_string("Lean.Parser.trailingNode");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__6() {
+lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__5;
+x_1 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__4;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__7() {
+lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__5;
+x_1 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__4;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__6;
+x_3 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__5;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -4833,7 +4755,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__8() {
+lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -4841,34 +4763,34 @@ x_1 = lean_mk_string("trailingNode");
 return x_1;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__9() {
+lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_declareLeadingBuiltinParser___closed__1;
-x_2 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__8;
+x_2 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__7;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
+lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__9() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__8;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
 lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__9;
-x_3 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_3, 0, x_2);
-lean_ctor_set(x_3, 1, x_1);
-return x_3;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__11() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = lean_box(0);
-x_2 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__10;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
@@ -4884,137 +4806,139 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__1;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
-lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(2u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__1;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = l_Lean_Elab_Term_getDeclName_x3f(x_2, x_3);
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-if (lean_obj_tag(x_17) == 0)
-{
-lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-lean_dec(x_15);
-x_18 = lean_ctor_get(x_16, 1);
-lean_inc(x_18);
-lean_dec(x_16);
-x_19 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__4;
-x_20 = l_Lean_Elab_Term_throwError___rarg(x_1, x_19, x_2, x_18);
-return x_20;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
-lean_dec(x_1);
-x_21 = lean_ctor_get(x_16, 1);
-lean_inc(x_21);
-lean_dec(x_16);
-x_22 = lean_ctor_get(x_17, 0);
-lean_inc(x_22);
-lean_dec(x_17);
-x_23 = l___private_Init_Lean_Elab_Quotation_1__quoteName___main(x_22);
-x_24 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_21);
+lean_object* x_6; 
 lean_dec(x_2);
-x_25 = !lean_is_exclusive(x_24);
-if (x_25 == 0)
-{
-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; 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_26 = lean_ctor_get(x_24, 0);
-x_27 = lean_box(0);
-x_28 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__9;
-x_29 = lean_name_mk_numeral(x_28, x_26);
-x_30 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__7;
-x_31 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__11;
-x_32 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_32, 0, x_27);
-lean_ctor_set(x_32, 1, x_30);
-lean_ctor_set(x_32, 2, x_29);
-lean_ctor_set(x_32, 3, x_31);
-x_33 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_34 = lean_array_push(x_33, x_32);
-x_35 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_36 = lean_array_push(x_34, x_35);
-x_37 = l_Lean_Parser_Term_id___elambda__1___closed__2;
-x_38 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_38, 0, x_37);
-lean_ctor_set(x_38, 1, x_36);
-x_39 = lean_array_push(x_33, x_38);
-x_40 = lean_array_push(x_39, x_23);
-x_41 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_42 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_42, 0, x_41);
-lean_ctor_set(x_42, 1, x_40);
-x_43 = lean_array_push(x_33, x_42);
-x_44 = lean_array_push(x_43, x_15);
-x_45 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_45, 0, x_41);
-lean_ctor_set(x_45, 1, x_44);
-lean_ctor_set(x_24, 0, x_45);
-return x_24;
+lean_dec(x_1);
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
 }
 else
 {
-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; 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; 
-x_46 = lean_ctor_get(x_24, 0);
-x_47 = lean_ctor_get(x_24, 1);
-lean_inc(x_47);
-lean_inc(x_46);
-lean_dec(x_24);
-x_48 = lean_box(0);
-x_49 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__9;
-x_50 = lean_name_mk_numeral(x_49, x_46);
-x_51 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__7;
-x_52 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__11;
-x_53 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_53, 0, x_48);
-lean_ctor_set(x_53, 1, x_51);
-lean_ctor_set(x_53, 2, x_50);
-lean_ctor_set(x_53, 3, x_52);
-x_54 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_55 = lean_array_push(x_54, x_53);
-x_56 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_57 = lean_array_push(x_55, x_56);
-x_58 = l_Lean_Parser_Term_id___elambda__1___closed__2;
-x_59 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_59, 0, x_58);
-lean_ctor_set(x_59, 1, x_57);
-x_60 = lean_array_push(x_54, x_59);
-x_61 = lean_array_push(x_60, x_23);
-x_62 = l_Lean_Parser_Term_app___elambda__1___closed__2;
-x_63 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_63, 0, x_62);
-lean_ctor_set(x_63, 1, x_61);
-x_64 = lean_array_push(x_54, x_63);
-x_65 = lean_array_push(x_64, x_15);
-x_66 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_66, 0, x_62);
-lean_ctor_set(x_66, 1, x_65);
-x_67 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_67, 0, x_66);
-lean_ctor_set(x_67, 1, x_47);
-return x_67;
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(2u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
+lean_dec(x_8);
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = l_Lean_Elab_Term_getDeclName_x3f(x_2, x_3);
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+if (lean_obj_tag(x_15) == 0)
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+lean_dec(x_13);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__3;
+x_18 = l_Lean_Elab_Term_throwError___rarg(x_1, x_17, x_2, x_16);
+return x_18;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
+lean_dec(x_1);
+x_19 = lean_ctor_get(x_14, 1);
+lean_inc(x_19);
+lean_dec(x_14);
+x_20 = lean_ctor_get(x_15, 0);
+lean_inc(x_20);
+lean_dec(x_15);
+x_21 = l___private_Init_Lean_Elab_Quotation_1__quoteName___main(x_20);
+x_22 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_19);
+lean_dec(x_2);
+x_23 = !lean_is_exclusive(x_22);
+if (x_23 == 0)
+{
+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; 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; 
+x_24 = lean_ctor_get(x_22, 0);
+x_25 = lean_box(0);
+x_26 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__8;
+x_27 = lean_name_mk_numeral(x_26, x_24);
+x_28 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__6;
+x_29 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__10;
+x_30 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_30, 0, x_25);
+lean_ctor_set(x_30, 1, x_28);
+lean_ctor_set(x_30, 2, x_27);
+lean_ctor_set(x_30, 3, x_29);
+x_31 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_32 = lean_array_push(x_31, x_30);
+x_33 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_34 = lean_array_push(x_32, x_33);
+x_35 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_34);
+x_37 = lean_array_push(x_31, x_36);
+x_38 = lean_array_push(x_37, x_21);
+x_39 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_40 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_40, 0, x_39);
+lean_ctor_set(x_40, 1, x_38);
+x_41 = lean_array_push(x_31, x_40);
+x_42 = lean_array_push(x_41, x_13);
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_39);
+lean_ctor_set(x_43, 1, x_42);
+lean_ctor_set(x_22, 0, x_43);
+return x_22;
+}
+else
+{
+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_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; lean_object* x_65; 
+x_44 = lean_ctor_get(x_22, 0);
+x_45 = lean_ctor_get(x_22, 1);
+lean_inc(x_45);
+lean_inc(x_44);
+lean_dec(x_22);
+x_46 = lean_box(0);
+x_47 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__8;
+x_48 = lean_name_mk_numeral(x_47, x_44);
+x_49 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__6;
+x_50 = l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__10;
+x_51 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_51, 0, x_46);
+lean_ctor_set(x_51, 1, x_49);
+lean_ctor_set(x_51, 2, x_48);
+lean_ctor_set(x_51, 3, x_50);
+x_52 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_53 = lean_array_push(x_52, x_51);
+x_54 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_55 = lean_array_push(x_53, x_54);
+x_56 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_57 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_57, 1, x_55);
+x_58 = lean_array_push(x_52, x_57);
+x_59 = lean_array_push(x_58, x_21);
+x_60 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_61 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_61, 0, x_60);
+lean_ctor_set(x_61, 1, x_59);
+x_62 = lean_array_push(x_52, x_61);
+x_63 = lean_array_push(x_62, x_13);
+x_64 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_64, 0, x_60);
+lean_ctor_set(x_64, 1, x_63);
+x_65 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_65, 0, x_64);
+lean_ctor_set(x_65, 1, x_45);
+return x_65;
 }
 }
 }
@@ -5041,21 +4965,19 @@ return x_6;
 lean_object* l_Lean_Elab_Term_elabInfix(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; uint8_t x_16; lean_object* x_17; 
-x_6 = lean_ctor_get(x_2, 1);
-x_7 = l_Lean_stxInh;
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = lean_array_get(x_7, x_6, x_8);
+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; uint8_t x_14; lean_object* x_15; 
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = l_Lean_Syntax_getArg(x_2, x_6);
+x_8 = lean_unsigned_to_nat(2u);
+x_9 = l_Lean_Syntax_getArg(x_2, x_8);
 x_10 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_11 = lean_array_push(x_10, x_9);
-x_12 = lean_unsigned_to_nat(2u);
-x_13 = lean_array_get(x_7, x_6, x_12);
-x_14 = lean_array_push(x_11, x_13);
-x_15 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1(x_14, x_14, x_8, x_1);
-lean_dec(x_14);
-x_16 = 1;
-x_17 = l_Lean_Elab_Term_elabTerm(x_15, x_3, x_16, x_16, x_4, x_5);
-return x_17;
+x_11 = lean_array_push(x_10, x_7);
+x_12 = lean_array_push(x_11, x_9);
+x_13 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1(x_12, x_12, x_6, x_1);
+lean_dec(x_12);
+x_14 = 1;
+x_15 = l_Lean_Elab_Term_elabTerm(x_13, x_3, x_14, x_14, x_4, x_5);
+return x_15;
 }
 }
 lean_object* l_Lean_Elab_Term_elabInfix___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
@@ -5070,15 +4992,13 @@ return x_6;
 lean_object* l_Lean_Elab_Term_elabInfixOp(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; 
-x_6 = lean_ctor_get(x_2, 1);
-x_7 = l_Lean_stxInh;
-x_8 = lean_unsigned_to_nat(1u);
-x_9 = lean_array_get(x_7, x_6, x_8);
-x_10 = l_Lean_Elab_Term_mkTermId(x_9, x_1);
-lean_dec(x_9);
-x_11 = l_Lean_Elab_Term_elabInfix(x_10, x_2, x_3, x_4, x_5);
-return x_11;
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_6 = lean_unsigned_to_nat(1u);
+x_7 = l_Lean_Syntax_getArg(x_2, x_6);
+x_8 = l_Lean_Elab_Term_mkTermId(x_7, x_1);
+lean_dec(x_7);
+x_9 = l_Lean_Elab_Term_elabInfix(x_8, x_2, x_3, x_4, x_5);
+return x_9;
 }
 }
 lean_object* l_Lean_Elab_Term_elabInfixOp___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
@@ -5094,7 +5014,7 @@ lean_object* l_Lean_Elab_Term_elabProd(lean_object* x_1, lean_object* x_2, lean_
 _start:
 {
 lean_object* x_5; lean_object* x_6; 
-x_5 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__5;
+x_5 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__5;
 x_6 = l_Lean_Elab_Term_elabInfixOp(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
@@ -7705,7 +7625,7 @@ lean_object* l_Lean_Elab_Term_elabOrElse(lean_object* x_1, lean_object* x_2, lea
 _start:
 {
 lean_object* x_5; lean_object* x_6; 
-x_5 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__13;
+x_5 = l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__12;
 x_6 = l_Lean_Elab_Term_elabInfixOp(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
@@ -7899,10 +7819,6 @@ lean_dec_ref(res);
 res = initialize_Init_Lean_Elab_Quotation(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Elab_Term_elabDollar___lambda__1___closed__1 = _init_l_Lean_Elab_Term_elabDollar___lambda__1___closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_elabDollar___lambda__1___closed__1);
-l_Lean_Elab_Term_elabDollar___lambda__1___closed__2 = _init_l_Lean_Elab_Term_elabDollar___lambda__1___closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_elabDollar___lambda__1___closed__2);
 l_Lean_Elab_Term_elabDollar___closed__1 = _init_l_Lean_Elab_Term_elabDollar___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabDollar___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabDollar___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabDollar___closed__1();
@@ -7916,8 +7832,6 @@ if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__1 = _init_l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__1);
-l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__2 = _init_l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_elabDollarProj___lambda__1___closed__2);
 l_Lean_Elab_Term_elabDollarProj___closed__1 = _init_l_Lean_Elab_Term_elabDollarProj___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabDollarProj___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabDollarProj___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabDollarProj___closed__1();
@@ -7947,10 +7861,6 @@ l_Lean_Elab_Term_elabIf___lambda__1___closed__8 = _init_l_Lean_Elab_Term_elabIf_
 lean_mark_persistent(l_Lean_Elab_Term_elabIf___lambda__1___closed__8);
 l_Lean_Elab_Term_elabIf___lambda__1___closed__9 = _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__9();
 lean_mark_persistent(l_Lean_Elab_Term_elabIf___lambda__1___closed__9);
-l_Lean_Elab_Term_elabIf___lambda__1___closed__10 = _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__10();
-lean_mark_persistent(l_Lean_Elab_Term_elabIf___lambda__1___closed__10);
-l_Lean_Elab_Term_elabIf___lambda__1___closed__11 = _init_l_Lean_Elab_Term_elabIf___lambda__1___closed__11();
-lean_mark_persistent(l_Lean_Elab_Term_elabIf___lambda__1___closed__11);
 l_Lean_Elab_Term_elabIf___closed__1 = _init_l_Lean_Elab_Term_elabIf___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabIf___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabIf___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabIf___closed__1();
@@ -7990,8 +7900,6 @@ l_Lean_Elab_Term_elabSubtype___lambda__1___closed__13 = _init_l_Lean_Elab_Term_e
 lean_mark_persistent(l_Lean_Elab_Term_elabSubtype___lambda__1___closed__13);
 l_Lean_Elab_Term_elabSubtype___lambda__1___closed__14 = _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__14();
 lean_mark_persistent(l_Lean_Elab_Term_elabSubtype___lambda__1___closed__14);
-l_Lean_Elab_Term_elabSubtype___lambda__1___closed__15 = _init_l_Lean_Elab_Term_elabSubtype___lambda__1___closed__15();
-lean_mark_persistent(l_Lean_Elab_Term_elabSubtype___lambda__1___closed__15);
 l_Lean_Elab_Term_elabSubtype___closed__1 = _init_l_Lean_Elab_Term_elabSubtype___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabSubtype___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabSubtype___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabSubtype___closed__1();
@@ -8048,10 +7956,6 @@ l_Lean_Elab_Term_elabShow___lambda__1___closed__2 = _init_l_Lean_Elab_Term_elabS
 lean_mark_persistent(l_Lean_Elab_Term_elabShow___lambda__1___closed__2);
 l_Lean_Elab_Term_elabShow___lambda__1___closed__3 = _init_l_Lean_Elab_Term_elabShow___lambda__1___closed__3();
 lean_mark_persistent(l_Lean_Elab_Term_elabShow___lambda__1___closed__3);
-l_Lean_Elab_Term_elabShow___lambda__1___closed__4 = _init_l_Lean_Elab_Term_elabShow___lambda__1___closed__4();
-lean_mark_persistent(l_Lean_Elab_Term_elabShow___lambda__1___closed__4);
-l_Lean_Elab_Term_elabShow___lambda__1___closed__5 = _init_l_Lean_Elab_Term_elabShow___lambda__1___closed__5();
-lean_mark_persistent(l_Lean_Elab_Term_elabShow___lambda__1___closed__5);
 l_Lean_Elab_Term_elabShow___closed__1 = _init_l_Lean_Elab_Term_elabShow___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabShow___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabShow___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabShow___closed__1();
@@ -8063,8 +7967,6 @@ lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabShow___closed__3)
 res = l___regBuiltinTermElab_Lean_Elab_Term_elabShow(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Elab_Term_elabHave___lambda__1___closed__1 = _init_l_Lean_Elab_Term_elabHave___lambda__1___closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_elabHave___lambda__1___closed__1);
 l_Lean_Elab_Term_elabHave___closed__1 = _init_l_Lean_Elab_Term_elabHave___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabHave___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabHave___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabHave___closed__1();
@@ -8076,8 +7978,6 @@ lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabHave___closed__3)
 res = l___regBuiltinTermElab_Lean_Elab_Term_elabHave(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Elab_Term_elabWhere___lambda__1___closed__1 = _init_l_Lean_Elab_Term_elabWhere___lambda__1___closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_elabWhere___lambda__1___closed__1);
 l_Lean_Elab_Term_elabWhere___closed__1 = _init_l_Lean_Elab_Term_elabWhere___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabWhere___closed__1);
 l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__1 = _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__1();
@@ -8160,8 +8060,6 @@ l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__39 = _init_l_Lean_Elab_Te
 lean_mark_persistent(l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__39);
 l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__40 = _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__40();
 lean_mark_persistent(l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__40);
-l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__41 = _init_l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__41();
-lean_mark_persistent(l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__41);
 l_Lean_Elab_Term_elabParserMacro___closed__1 = _init_l_Lean_Elab_Term_elabParserMacro___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabParserMacro___closed__1);
 l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__1 = _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__1();
@@ -8184,8 +8082,6 @@ l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__9 = _init_l_Lean_Elab_Te
 lean_mark_persistent(l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__9);
 l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__10 = _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__10();
 lean_mark_persistent(l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__10);
-l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__11 = _init_l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__11();
-lean_mark_persistent(l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__11);
 l_Lean_Elab_Term_elabTParserMacro___closed__1 = _init_l_Lean_Elab_Term_elabTParserMacro___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabTParserMacro___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabProd___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabProd___closed__1();
diff --git a/stage0/stdlib/Init/Lean/Elab/Command.c b/stage0/stdlib/Init/Lean/Elab/Command.c
index 86260a3ac7..184a5d9210 100644
--- a/stage0/stdlib/Init/Lean/Elab/Command.c
+++ b/stage0/stdlib/Init/Lean/Elab/Command.c
@@ -16,14 +16,12 @@ extern "C" {
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___lambda__1(lean_object*, lean_object*, lean_object*);
 uint8_t l_AssocList_contains___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__3(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabVariable(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Name_toString___closed__1;
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___closed__4;
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___main(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSection(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace(lean_object*);
 lean_object* l_PersistentHashMap_contains___at_Lean_Elab_Command_addBuiltinCommandElab___spec__4___boxed(lean_object*, lean_object*);
-lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-size_t l_USize_add(size_t, size_t);
 lean_object* l_Lean_Elab_Command_commandElabAttribute___closed__3;
 lean_object* l_List_head_x21___at_Lean_Elab_Command_getScope___spec__1(lean_object*);
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabUniverses___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -38,8 +36,6 @@ lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabInitQuot___closed__
 lean_object* l_Lean_Elab_Command_addDecl(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabNotation(lean_object*);
 lean_object* l_Lean_Elab_Term_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__2;
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_div(lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabReserve(lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSection___closed__2;
@@ -48,7 +44,6 @@ lean_object* l_AssocList_find___main___at_Lean_Elab_Command_elabCommand___spec__
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabOpen___closed__3;
 lean_object* l_unreachable_x21___rarg(lean_object*);
 lean_object* l_Lean_Elab_Command_withNamespace(lean_object*);
-extern lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
 lean_object* l_Lean_Elab_Command_CommandElabCoreM_monadState___closed__1;
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___closed__1;
 lean_object* l_Lean_Elab_Command_addContext(lean_object*, lean_object*, lean_object*);
@@ -72,7 +67,6 @@ lean_object* l_Lean_SMap_empty___at_Lean_Elab_Command_mkBuiltinCommandElabTable_
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabReserve___closed__1;
 lean_object* l_Lean_Syntax_getIdAt(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_commandElabAttribute;
-lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l_Lean_Elab_Command_elabUniverse(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fswap(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabCommand___closed__2;
@@ -81,11 +75,10 @@ lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_Command_elabCom
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSetOption___closed__2;
 lean_object* l_Lean_Elab_Command_elabCheck___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_logUnknownDecl(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_elabSection___closed__1;
 lean_object* l_Lean_Meta_SynthInstance_SynthM_inhabited___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_stxInh;
+lean_object* l___private_Init_Lean_Elab_Command_17__checkEndHeader___main___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_withDeclId___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-size_t l_USize_sub(size_t, size_t);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_Command_elabCommand___spec__3(lean_object*, size_t, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
 extern lean_object* l_Lean_verboseOption___closed__3;
@@ -96,15 +89,18 @@ lean_object* l_Lean_Elab_Command_elabUniverses(lean_object*, lean_object*, lean_
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabReserve___closed__2;
 lean_object* l_Lean_Elab_Command_elabOpen___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_runTermElabM(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_12__toCommandResult___rarg(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_section___elambda__1___closed__2;
-lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_dbg_trace(lean_object*, lean_object*);
 lean_object* lean_io_mk_ref(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_ElabFnTable_insert___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_8__elabCommandUsing(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_append___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSetOption(lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___closed__2;
+lean_object* l___private_Init_Lean_Elab_Command_9__mkTermContext___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_io_ref_get(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_compileDecl(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabUniverse(lean_object*);
@@ -112,21 +108,22 @@ lean_object* l_Lean_Elab_Command_getCurrMacroScope___boxed(lean_object*, lean_ob
 lean_object* l_Lean_Syntax_reprint___main(lean_object*);
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabOpenSimple___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_declareBuiltinCommandElab___closed__5;
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__2;
 lean_object* l_Lean_Elab_Command_State_inhabited___closed__4;
 lean_object* lean_array_push(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_10__getVarDecls(lean_object*);
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariables___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabCheck(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_List_find_x3f___main___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_logAt___at_Lean_Elab_Command_logUnknownDecl___spec__2(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerAttribute(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_15__addNamespace(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr(lean_object*);
 lean_object* l_Lean_Elab_Command_elabUniverse___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSynth___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_14__addNamespace(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_init__quot___elambda__1___closed__2;
+lean_object* l___private_Init_Lean_Elab_Command_12__toCommandResult(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabNotation___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___closed__11;
 extern lean_object* l_Lean_Name_inhabited;
@@ -144,6 +141,8 @@ lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_addOpenDecl_
 size_t l_USize_shiftRight(size_t, size_t);
 lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___spec__5(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_getPos___at_Lean_Elab_Command_throwError___spec__2___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_Elab_Exception_inhabited___closed__1;
 lean_object* l_Lean_Elab_Command_Scope_inhabited;
 extern lean_object* l_Lean_Parser_Command_section___elambda__1___closed__1;
 extern lean_object* l_Lean_Meta_MetaHasEval___rarg___closed__4;
@@ -159,8 +158,6 @@ lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariable
 lean_object* l_Lean_Elab_Command_elabUniverses___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabVariables(lean_object*);
 lean_object* l_Lean_Elab_Command_elabMixfix___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_throwUnexpectedSyntax___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__3;
 extern lean_object* l_Lean_AttributeImpl_inhabited___closed__2;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___closed__9;
@@ -168,13 +165,13 @@ lean_object* l_IO_ofExcept___at_Lean_registerClassAttr___spec__1(lean_object*, l
 lean_object* l_Lean_Elab_Command_addBuiltinCommandElab(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_State_inhabited___closed__3;
 lean_object* l_Lean_Elab_Command_setOption___closed__1;
+lean_object* l___private_Init_Lean_Elab_Command_8__elabCommandUsing___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabOpenRenaming___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_QSort_1__partitionAux___main___at_Lean_Elab_Command_sortDeclLevelParams___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabUniverses___closed__3;
 lean_object* l_Lean_Elab_Command_elabEnd___closed__4;
 lean_object* l_Lean_Elab_Command_declareBuiltinCommandElab(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabUniverses___closed__1;
-lean_object* l_Lean_Elab_Command_resolveNamespace___closed__2;
 lean_object* l_Lean_Elab_Command_elabNotation___rarg(lean_object*);
 lean_object* l_Lean_Elab_Command_State_inhabited___closed__1;
 lean_object* l___private_Init_Lean_Elab_Term_5__fromMetaException(lean_object*, lean_object*, lean_object*);
@@ -184,7 +181,6 @@ lean_object* l___private_Init_Data_Array_QSort_1__partitionAux___main___at_Lean_
 lean_object* l_Lean_Elab_Command_setOption___closed__2;
 extern lean_object* l_Lean_LocalContext_Inhabited___closed__2;
 lean_object* l_Lean_Elab_Command_elabSynth(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_resolveNamespace___closed__1;
 lean_object* l_List_foldl___main___at_Lean_Elab_Command_elabExport___spec__2(lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabInitQuot___closed__2;
 extern lean_object* l_Lean_Meta_dbgTrace___rarg___closed__1;
@@ -192,10 +188,9 @@ lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabOpenRe
 lean_object* l_Lean_Elab_Command_CommandElabCoreM_monadState___closed__3;
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_elabExport___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_inhabited(lean_object*);
+uint8_t l___private_Init_Lean_Elab_Command_17__checkEndHeader___main(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkBuiltinCommandElabTable(lean_object*);
 lean_object* l_Lean_Elab_Command_addOpenDecl(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_11__toCommandResult(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__1;
 lean_object* l_Lean_Elab_Command_elabCommand___closed__6;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabVariables___closed__3;
 extern lean_object* l_Lean_Syntax_getKind___closed__4;
@@ -230,14 +225,13 @@ lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_5__getBetterRef(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___closed__8;
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___closed__8;
+extern lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__3;
 lean_object* l___private_Init_Lean_Elab_Command_4__modifyGetState(lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabUniverse___closed__3;
 lean_object* lean_array_swap(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_set__option___elambda__1___closed__2;
-lean_object* l___private_Init_Lean_Elab_Command_9__mkTermState___boxed(lean_object*);
 lean_object* l_Lean_Syntax_isStrLit_x3f(lean_object*);
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___closed__5;
-lean_object* l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_mkHashMap___at_Lean_Elab_Command_mkBuiltinCommandElabTable___spec__2(lean_object*);
 lean_object* l_Lean_Name_append___main(lean_object*, lean_object*);
 lean_object* l_Array_shrink___main___rarg(lean_object*, lean_object*);
@@ -261,37 +255,31 @@ lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabVariables___closed_
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___closed__4;
 lean_object* l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg___closed__3;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_15__checkAnonymousScope___boxed(lean_object*);
 uint8_t l_HashMapImp_contains___at_Lean_Elab_Command_addBuiltinCommandElab___spec__2(lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSetOption(lean_object*);
 extern lean_object* l___private_Init_Lean_Meta_ExprDefEq_17__checkTypesAndAssign___closed__7;
 lean_object* l_Lean_Elab_Command_elabOpenRenaming(lean_object*, lean_object*, lean_object*);
-lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_Elab_Term_mkConst___closed__4;
 lean_object* l_List_lengthAux___main___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_resolveNamespace(lean_object*, lean_object*, lean_object*);
+uint8_t l___private_Init_Lean_Elab_Command_16__checkAnonymousScope(lean_object*);
 lean_object* l_Lean_Elab_Command_addBuiltinCommandElab___closed__1;
 lean_object* l_Lean_Elab_Command_mkState(lean_object*, lean_object*, lean_object*);
-uint8_t l___private_Init_Lean_Elab_Command_15__checkAnonymousScope(lean_object*);
-lean_object* l_Lean_Elab_Command_throwUnexpectedSyntax(lean_object*);
-extern lean_object* l_Lean_Message_Inhabited;
+lean_object* l___private_Init_Lean_Elab_Command_11__getVarDecls(lean_object*);
 lean_object* l_Lean_Elab_Command_dbgTrace___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_qsortAux___main___at_Lean_Elab_Command_sortDeclLevelParams___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_namespace___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_addBuiltinCommandElab___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabCoreM_monadState;
-extern lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__3;
 size_t l_Lean_Name_hash(lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_11__toCommandResult___boxed(lean_object*, lean_object*);
 extern lean_object* l_Char_HasRepr___closed__1;
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___lambda__1___closed__4;
 lean_object* l___private_Init_Lean_Elab_Command_1__ioErrorToMessage___boxed(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_PersistentHashMap_insertAux___main___rarg___closed__3;
 lean_object* l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
 lean_object* l_Lean_Elab_Command_adaptExpander(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_6__prettyPrint___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSynth___closed__3;
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_KVMap_insertCore___main(lean_object*, lean_object*, lean_object*);
@@ -301,16 +289,13 @@ lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabUniverses(lean_obje
 extern lean_object* l_Lean_Parser_Command_namespace___elambda__1___closed__1;
 extern lean_object* l___regBuiltinParser_Lean_Parser_Command_antiquot___closed__2;
 lean_object* l_Lean_Elab_Command_elabVariables___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_11__toCommandResult___rarg___closed__1;
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__1;
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabOpenHiding___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_16__checkEndHeader___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg___closed__6;
 lean_object* l_Lean_Elab_Command_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__13(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__3;
 extern lean_object* l___regBuiltinParser_Lean_Parser_Command_antiquot___closed__1;
 uint8_t l_Lean_Environment_contains(lean_object*, lean_object*);
-lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8(lean_object*, size_t, size_t, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_10__getVarDecls___boxed(lean_object*);
 lean_object* l_Lean_Elab_Command_getScopes(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_Command_elabCommand___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec__1___closed__3;
@@ -330,11 +315,11 @@ lean_object* l_ReaderT_read___at_Lean_Elab_Command_CommandElabM_monadLog___spec_
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabExport___closed__1;
 lean_object* l_Lean_Elab_logAt___at_Lean_Elab_Command_logUnknownDecl___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t lean_usize_modn(size_t, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_9__mkTermContext(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_SMap_contains___at_Lean_Elab_Command_addBuiltinCommandElab___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_withLogging(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_logUnknownDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__10(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSynth___closed__1;
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_List_head_x21___rarg___closed__2;
@@ -346,7 +331,6 @@ lean_object* l_Lean_Elab_Command_CommandElabM_MonadQuotation___closed__1;
 lean_object* l_Lean_Elab_mkElabAttribute___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___closed__2;
 lean_object* l_Lean_Elab_Command_elabCommand(lean_object*, lean_object*, lean_object*);
-size_t l_USize_mul(size_t, size_t);
 lean_object* l_Lean_Elab_Command_liftIO___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabExport___closed__2;
 lean_object* l_Lean_Elab_Command_elabSetOption___closed__1;
@@ -358,7 +342,6 @@ lean_object* l_Lean_Elab_Command_liftIO___rarg___boxed(lean_object*, lean_object
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSynth___closed__2;
 lean_object* l_PersistentHashMap_empty___at_Lean_Elab_Command_mkBuiltinCommandElabTable___spec__3;
 lean_object* l_mkHashMapImp___rarg(lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_12__addScope(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabOpen(lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -392,15 +375,13 @@ lean_object* l_Lean_Elab_Command_declareBuiltinCommandElab___closed__1;
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog;
 lean_object* l_Lean_Elab_Command_addUnivLevel(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabMixfix___closed__3;
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__9(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabCoreM_monadState___closed__4;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSynth___closed__1;
 lean_object* l___private_Init_Lean_Elab_Command_2__getState(lean_object*, lean_object*);
-uint8_t l___private_Init_Lean_Elab_Command_16__checkEndHeader___main(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_universe___elambda__1___closed__2;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabOpen___closed__2;
 extern lean_object* l_Bool_HasRepr___closed__1;
-lean_object* l_Lean_Meta_synthInstance(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_synthInstance(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_drop___main___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_addUnivLevel___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabExport___closed__2;
@@ -410,22 +391,18 @@ lean_object* l_Lean_Elab_Command_elabReserve(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_end___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_setOption___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Command_logUnknownDecl___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_8__mkTermContext___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttribute___closed__1;
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabOpenOnly___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_withMacroExpansion___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabOpen___closed__1;
 lean_object* l_Lean_Elab_Command_elabVariables___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabExport___closed__1;
 extern lean_object* l_Lean_mkInitAttr___lambda__1___closed__1;
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getScope(lean_object*, lean_object*);
-lean_object* l_AssocList_replace___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__15(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___closed__6;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
-uint8_t l_USize_decLe(size_t, size_t);
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___closed__6;
-lean_object* l_AssocList_foldlM___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__14(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getCurrMacroScope(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabVariable___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_nameToExprAux___main(lean_object*);
@@ -434,6 +411,7 @@ lean_object* l___private_Init_Lean_Elab_Term_1__getBetterRef___lambda__1___boxed
 lean_object* l_Lean_Elab_Command_modifyScope(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_MonadQuotation___closed__2;
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_17__checkEndHeader___boxed(lean_object*, lean_object*);
 extern lean_object* l_Bool_HasRepr___closed__2;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSetOption___closed__3;
 lean_object* l_Lean_Elab_Command_State_inhabited___closed__2;
@@ -441,27 +419,27 @@ lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabReserve___closed__3
 lean_object* l_Lean_Environment_addAndCompile(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_throwError(lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___closed__5;
+lean_object* l_Lean_Syntax_getKind(lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___closed__1;
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_withDeclId___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___closed__5;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabUniverse___closed__2;
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___closed__3;
+lean_object* l___private_Init_Lean_Elab_Command_16__checkAnonymousScope___boxed(lean_object*);
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Term_logTrace___spec__1(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentHashMap_containsAtAux___main___at_Lean_Parser_isValidSyntaxNodeKind___spec__3(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabCheck___closed__2;
 extern lean_object* l_Lean_EnvExtension_setState___closed__1;
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabOpenSimple___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__6;
 lean_object* l_Lean_Syntax_getOptionalIdent_x3f(lean_object*);
 lean_object* l_Array_filterAux___main___at_Lean_Elab_Command_sortDeclLevelParams___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttribute___closed__2;
-lean_object* l_Lean_SMap_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__6(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabNamespace(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabReserve___rarg(lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabMixfix(lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabInitQuot(lean_object*);
-lean_object* l_Lean_Elab_Command_resolveNamespace___closed__3;
 lean_object* l_Lean_Elab_Command_withDeclId___closed__2;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabCheck___closed__1;
 lean_object* l_Lean_Elab_Command_withNamespace___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -469,11 +447,9 @@ lean_object* lean_io_ref_reset(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabNotation(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_compileDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_logUnknownDecl___closed__1;
-lean_object* lean_nat_mul(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getPos(lean_object*);
 lean_object* l_Lean_Elab_Command_State_inhabited;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabMixfix___closed__2;
-lean_object* l_PersistentHashMap_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__7(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabOpenHiding___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getOpenDecls(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg___closed__4;
@@ -481,7 +457,6 @@ lean_object* l_Lean_Elab_Command_declareBuiltinCommandElab___closed__3;
 extern lean_object* l_Lean_Parser_Command_export___elambda__1___closed__2;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabEnd___closed__1;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSection___closed__3;
-lean_object* l_Lean_Elab_throwErrorUsingCmdPos___at_Lean_Elab_Command_resolveNamespace___spec__1(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isNone(lean_object*);
 lean_object* l_Lean_Elab_Command_getEnv(lean_object*, lean_object*);
 extern lean_object* l_Lean_TraceState_Inhabited___closed__1;
@@ -489,22 +464,22 @@ lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabUniverse___closed__
 extern lean_object* l_Lean_Parser_Command_universes___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabEnd___closed__3;
 lean_object* lean_io_ref_set(lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_expand___at_Lean_Elab_Command_addBuiltinCommandElab___spec__12(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_13__addScope(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabCheck___closed__4;
-lean_object* l_PersistentHashMap_getCollisionNodeSize___rarg(lean_object*);
 lean_object* l_Lean_Elab_Command_getLevelNames(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttribute___closed__3;
 lean_object* l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_openOnly___elambda__1___closed__2;
 lean_object* l_Array_toList___rarg(lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___lambda__3(lean_object*, lean_object*, lean_object*);
-lean_object* lean_mk_array(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_12__toCommandResult___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_setOption___closed__3;
 lean_object* l___private_Init_Lean_Elab_Command_4__modifyGetState___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_getState___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_declareBuiltinCommandElab___closed__7;
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___main(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabVariable___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_DataValue_sameCtor(lean_object*, lean_object*);
@@ -519,7 +494,6 @@ lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___lambda__1___cl
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabInitQuot___closed__1;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabEnd___closed__3;
 lean_object* l_Lean_Elab_Command_withDeclId(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_11__toCommandResult___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkMessageAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_variables___elambda__1___closed__2;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabExport___closed__3;
@@ -529,18 +503,17 @@ lean_object* l_Lean_Elab_Command_liftIOCore___rarg(lean_object*, lean_object*, l
 lean_object* l_Lean_Elab_Command_logUnknownDecl___closed__2;
 lean_object* l_Lean_Elab_Command_mkCommandElabAttribute(lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___closed__10;
-extern lean_object* l_Lean_Message_Inhabited___closed__2;
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_withDeclId___spec__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___lambda__1___closed__3;
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 extern lean_object* l_Lean_MetavarContext_Inhabited___closed__1;
 lean_object* l_ReaderT_bind___at_Lean_Elab_Command_CommandElabM_monadLog___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_16__checkEndHeader___main___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___lambda__4(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabVariable___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
-uint8_t l___private_Init_Lean_Elab_Command_16__checkEndHeader(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l___private_Init_Lean_Elab_Command_17__checkEndHeader(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_asNode(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_12__toCommandResult___rarg___closed__1;
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_elabExport___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_compile_decl(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_formatStxAux___main(lean_object*, lean_object*, lean_object*);
@@ -558,7 +531,6 @@ lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_Command_elabCommand___s
 lean_object* lean_usize_to_nat(size_t);
 extern lean_object* l_Lean_addClass___closed__1;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabVariable___closed__1;
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_commandElabAttribute___closed__1;
 lean_object* l_Lean_Elab_Command_elabOpenSimple___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___closed__7;
@@ -573,28 +545,26 @@ lean_object* l_IO_ofExcept___at___private_Init_Lean_Elab_Util_6__ElabAttribute_a
 lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_Command_7__addMacroStack___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkMessageAux(lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_10__mkTermState___boxed(lean_object*);
 lean_object* l_Lean_Elab_Command_commandElabAttribute___closed__5;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace___closed__1;
 lean_object* l_Lean_Elab_Command_CommandElabM_MonadQuotation___closed__3;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabSection___closed__1;
-lean_object* l_HashMapImp_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__11(lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Elab_Command_elabCommand___spec__6(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Command_elabNamespace___closed__1;
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__4;
 extern lean_object* l_Lean_initAttr;
+lean_object* l___private_Init_Lean_Elab_Command_11__getVarDecls___boxed(lean_object*);
 lean_object* l_Lean_Elab_Command_declareBuiltinCommandElab___closed__2;
 extern lean_object* l_Lean_Parser_Command_openHiding___elambda__1___closed__2;
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_regBuiltinCommandParserAttr___closed__3;
 lean_object* l_Lean_Elab_Command_elabCommand___closed__5;
-lean_object* l___private_Init_Lean_Elab_Command_9__mkTermState(lean_object*);
-lean_object* l_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace___closed__2;
 lean_object* l_Lean_Elab_Command_CommandElabM_MonadQuotation;
 lean_object* l___private_Init_Lean_Elab_Command_3__setState(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_resolveNamespace(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_NameGenerator_Inhabited___closed__3;
-lean_object* l___private_Init_Lean_Elab_Command_8__mkTermContext(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Command_Exception_inhabited;
 lean_object* l_Lean_Elab_Command_addDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -602,6 +572,7 @@ lean_object* l_HashMapImp_contains___at_Lean_Elab_Command_addBuiltinCommandElab_
 lean_object* l_monadInhabited___rarg(lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabEnd___closed__2;
 lean_object* lean_add_decl(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_10__mkTermState(lean_object*);
 lean_object* _init_l_Lean_Elab_Command_Scope_inhabited___closed__1() {
 _start:
 {
@@ -724,6 +695,14 @@ lean_ctor_set(x_12, 3, x_11);
 return x_12;
 }
 }
+lean_object* _init_l_Lean_Elab_Command_Exception_inhabited() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_Elab_Exception_inhabited___closed__1;
+return x_1;
+}
+}
 lean_object* l_Lean_Elab_Command_mkMessageAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4) {
 _start:
 {
@@ -825,25 +804,29 @@ uint8_t x_10;
 x_10 = !lean_is_exclusive(x_5);
 if (x_10 == 0)
 {
-lean_object* x_11; lean_object* x_12; 
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
 x_11 = lean_ctor_get(x_5, 0);
 x_12 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_1, x_2, x_11);
-lean_ctor_set(x_5, 0, x_12);
+x_13 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_5, 0, x_13);
 return x_5;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-x_13 = lean_ctor_get(x_5, 0);
-x_14 = lean_ctor_get(x_5, 1);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_14 = lean_ctor_get(x_5, 0);
+x_15 = lean_ctor_get(x_5, 1);
+lean_inc(x_15);
 lean_inc(x_14);
-lean_inc(x_13);
 lean_dec(x_5);
-x_15 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_1, x_2, x_13);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_14);
-return x_16;
+x_16 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_1, x_2, x_14);
+x_17 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_17, 0, x_16);
+x_18 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_15);
+return x_18;
 }
 }
 }
@@ -899,25 +882,29 @@ uint8_t x_10;
 x_10 = !lean_is_exclusive(x_5);
 if (x_10 == 0)
 {
-lean_object* x_11; lean_object* x_12; 
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
 x_11 = lean_ctor_get(x_5, 0);
 x_12 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_3, x_1, x_11);
-lean_ctor_set(x_5, 0, x_12);
+x_13 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_5, 0, x_13);
 return x_5;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-x_13 = lean_ctor_get(x_5, 0);
-x_14 = lean_ctor_get(x_5, 1);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_14 = lean_ctor_get(x_5, 0);
+x_15 = lean_ctor_get(x_5, 1);
+lean_inc(x_15);
 lean_inc(x_14);
-lean_inc(x_13);
 lean_dec(x_5);
-x_15 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_3, x_1, x_13);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_14);
-return x_16;
+x_16 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_3, x_1, x_14);
+x_17 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_17, 0, x_16);
+x_18 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_15);
+return x_18;
 }
 }
 }
@@ -976,27 +963,31 @@ uint8_t x_9;
 x_9 = !lean_is_exclusive(x_4);
 if (x_9 == 0)
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
 x_10 = lean_ctor_get(x_4, 0);
 x_11 = lean_box(0);
 x_12 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_1, x_11, x_10);
-lean_ctor_set(x_4, 0, x_12);
+x_13 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_4, 0, x_13);
 return x_4;
 }
 else
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_13 = lean_ctor_get(x_4, 0);
-x_14 = lean_ctor_get(x_4, 1);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_14 = lean_ctor_get(x_4, 0);
+x_15 = lean_ctor_get(x_4, 1);
+lean_inc(x_15);
 lean_inc(x_14);
-lean_inc(x_13);
 lean_dec(x_4);
-x_15 = lean_box(0);
-x_16 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_1, x_15, x_13);
-x_17 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_17, 0, x_16);
-lean_ctor_set(x_17, 1, x_14);
-return x_17;
+x_16 = lean_box(0);
+x_17 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_1, x_16, x_14);
+x_18 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_18, 0, x_17);
+x_19 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_15);
+return x_19;
 }
 }
 }
@@ -1038,27 +1029,31 @@ uint8_t x_10;
 x_10 = !lean_is_exclusive(x_5);
 if (x_10 == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 x_11 = lean_ctor_get(x_5, 0);
 x_12 = lean_box(0);
 x_13 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_2, x_12, x_11);
-lean_ctor_set(x_5, 0, x_13);
+x_14 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_5, 0, x_14);
 return x_5;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_14 = lean_ctor_get(x_5, 0);
-x_15 = lean_ctor_get(x_5, 1);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_15 = lean_ctor_get(x_5, 0);
+x_16 = lean_ctor_get(x_5, 1);
+lean_inc(x_16);
 lean_inc(x_15);
-lean_inc(x_14);
 lean_dec(x_5);
-x_16 = lean_box(0);
-x_17 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_2, x_16, x_14);
-x_18 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_15);
-return x_18;
+x_17 = lean_box(0);
+x_18 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_2, x_17, x_15);
+x_19 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_19, 0, x_18);
+x_20 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_16);
+return x_20;
 }
 }
 }
@@ -2360,43 +2355,50 @@ uint8_t x_13;
 x_13 = !lean_is_exclusive(x_12);
 if (x_13 == 0)
 {
-lean_ctor_set_tag(x_12, 1);
-return x_12;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+lean_object* x_14; lean_object* x_15; 
 x_14 = lean_ctor_get(x_12, 0);
-x_15 = lean_ctor_get(x_12, 1);
-lean_inc(x_15);
-lean_inc(x_14);
+x_15 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+lean_ctor_set_tag(x_12, 1);
+lean_ctor_set(x_12, 0, x_15);
+return x_12;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_16 = lean_ctor_get(x_12, 0);
+x_17 = lean_ctor_get(x_12, 1);
+lean_inc(x_17);
+lean_inc(x_16);
 lean_dec(x_12);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_14);
-lean_ctor_set(x_16, 1, x_15);
-return x_16;
+x_18 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_18, 0, x_16);
+x_19 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_17);
+return x_19;
 }
 }
 else
 {
-uint8_t x_17; 
-x_17 = !lean_is_exclusive(x_12);
-if (x_17 == 0)
+uint8_t x_20; 
+x_20 = !lean_is_exclusive(x_12);
+if (x_20 == 0)
 {
 return x_12;
 }
 else
 {
-lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_18 = lean_ctor_get(x_12, 0);
-x_19 = lean_ctor_get(x_12, 1);
-lean_inc(x_19);
-lean_inc(x_18);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_21 = lean_ctor_get(x_12, 0);
+x_22 = lean_ctor_get(x_12, 1);
+lean_inc(x_22);
+lean_inc(x_21);
 lean_dec(x_12);
-x_20 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_20, 0, x_18);
-lean_ctor_set(x_20, 1, x_19);
-return x_20;
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
 }
 }
 }
@@ -2441,94 +2443,6 @@ lean_dec(x_3);
 return x_7;
 }
 }
-lean_object* l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-lean_inc(x_1);
-x_5 = l___private_Init_Lean_Elab_Command_6__prettyPrint(x_1, x_3, x_4);
-if (lean_obj_tag(x_2) == 0)
-{
-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; 
-x_6 = lean_ctor_get(x_5, 0);
-lean_inc(x_6);
-x_7 = lean_ctor_get(x_5, 1);
-lean_inc(x_7);
-lean_dec(x_5);
-x_8 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_8, 0, x_6);
-x_9 = l_Lean_MessageData_ofList___closed__3;
-x_10 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_10, 0, x_9);
-lean_ctor_set(x_10, 1, x_8);
-x_11 = lean_unsigned_to_nat(2u);
-x_12 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_12, 0, x_11);
-lean_ctor_set(x_12, 1, x_10);
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__3;
-x_14 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_14, 0, x_13);
-lean_ctor_set(x_14, 1, x_12);
-x_15 = l_Lean_Elab_Command_throwError___rarg(x_1, x_14, x_3, x_7);
-return x_15;
-}
-else
-{
-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; 
-x_16 = lean_ctor_get(x_5, 0);
-lean_inc(x_16);
-x_17 = lean_ctor_get(x_5, 1);
-lean_inc(x_17);
-lean_dec(x_5);
-x_18 = lean_ctor_get(x_2, 0);
-lean_inc(x_18);
-x_19 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_19, 0, x_18);
-x_20 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_20, 0, x_19);
-x_21 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__6;
-x_22 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_22, 0, x_21);
-lean_ctor_set(x_22, 1, x_20);
-x_23 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
-x_24 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-x_25 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_25, 0, x_16);
-x_26 = l_Lean_MessageData_ofList___closed__3;
-x_27 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_27, 0, x_26);
-lean_ctor_set(x_27, 1, x_25);
-x_28 = lean_unsigned_to_nat(2u);
-x_29 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_27);
-x_30 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_30, 0, x_24);
-lean_ctor_set(x_30, 1, x_29);
-x_31 = l_Lean_Elab_Command_throwError___rarg(x_1, x_30, x_3, x_17);
-return x_31;
-}
-}
-}
-lean_object* l_Lean_Elab_Command_throwUnexpectedSyntax(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Elab_Command_throwUnexpectedSyntax___rarg___boxed), 4, 0);
-return x_2;
-}
-}
-lean_object* l_Lean_Elab_Command_throwUnexpectedSyntax___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(x_1, x_2, x_3, x_4);
-lean_dec(x_2);
-return x_5;
-}
-}
 lean_object* l_Lean_Elab_Command_getCurrMacroScope(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -3016,829 +2930,6 @@ return x_10;
 }
 }
 }
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_5 = lean_ctor_get(x_1, 0);
-lean_inc(x_5);
-x_6 = lean_ctor_get(x_1, 1);
-lean_inc(x_6);
-x_7 = lean_array_get_size(x_5);
-x_8 = lean_nat_dec_lt(x_2, x_7);
-lean_dec(x_7);
-if (x_8 == 0)
-{
-uint8_t x_9; 
-lean_dec(x_2);
-x_9 = !lean_is_exclusive(x_1);
-if (x_9 == 0)
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_10 = lean_ctor_get(x_1, 1);
-lean_dec(x_10);
-x_11 = lean_ctor_get(x_1, 0);
-lean_dec(x_11);
-x_12 = lean_array_push(x_5, x_3);
-x_13 = lean_array_push(x_6, x_4);
-lean_ctor_set(x_1, 1, x_13);
-lean_ctor_set(x_1, 0, x_12);
-return x_1;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-lean_dec(x_1);
-x_14 = lean_array_push(x_5, x_3);
-x_15 = lean_array_push(x_6, x_4);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_14);
-lean_ctor_set(x_16, 1, x_15);
-return x_16;
-}
-}
-else
-{
-lean_object* x_17; uint8_t x_18; 
-x_17 = lean_array_fget(x_5, x_2);
-x_18 = lean_name_eq(x_3, x_17);
-lean_dec(x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; 
-lean_dec(x_6);
-lean_dec(x_5);
-x_19 = lean_unsigned_to_nat(1u);
-x_20 = lean_nat_add(x_2, x_19);
-lean_dec(x_2);
-x_2 = x_20;
-goto _start;
-}
-else
-{
-uint8_t x_22; 
-x_22 = !lean_is_exclusive(x_1);
-if (x_22 == 0)
-{
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_23 = lean_ctor_get(x_1, 1);
-lean_dec(x_23);
-x_24 = lean_ctor_get(x_1, 0);
-lean_dec(x_24);
-x_25 = lean_array_fset(x_5, x_2, x_3);
-x_26 = lean_array_fset(x_6, x_2, x_4);
-lean_dec(x_2);
-lean_ctor_set(x_1, 1, x_26);
-lean_ctor_set(x_1, 0, x_25);
-return x_1;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-lean_dec(x_1);
-x_27 = lean_array_fset(x_5, x_2, x_3);
-x_28 = lean_array_fset(x_6, x_2, x_4);
-lean_dec(x_2);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
-}
-}
-}
-}
-}
-lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__10(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; uint8_t x_8; 
-x_7 = lean_array_get_size(x_4);
-x_8 = lean_nat_dec_lt(x_5, x_7);
-lean_dec(x_7);
-if (x_8 == 0)
-{
-lean_dec(x_5);
-return x_6;
-}
-else
-{
-lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; size_t x_13; size_t x_14; size_t x_15; size_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_9 = lean_array_fget(x_4, x_5);
-x_10 = lean_array_fget(x_3, x_5);
-x_11 = l_Lean_Name_hash(x_9);
-x_12 = 1;
-x_13 = x_1 - x_12;
-x_14 = 5;
-x_15 = x_14 * x_13;
-x_16 = x_11 >> x_15;
-x_17 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8(x_6, x_16, x_1, x_9, x_10);
-x_18 = lean_unsigned_to_nat(1u);
-x_19 = lean_nat_add(x_5, x_18);
-lean_dec(x_5);
-x_5 = x_19;
-x_6 = x_17;
-goto _start;
-}
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-if (lean_obj_tag(x_1) == 0)
-{
-uint8_t x_6; 
-x_6 = !lean_is_exclusive(x_1);
-if (x_6 == 0)
-{
-lean_object* x_7; size_t x_8; size_t x_9; size_t x_10; size_t x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
-x_7 = lean_ctor_get(x_1, 0);
-x_8 = 1;
-x_9 = 5;
-x_10 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
-x_11 = x_2 & x_10;
-x_12 = lean_usize_to_nat(x_11);
-x_13 = lean_array_get_size(x_7);
-x_14 = lean_nat_dec_lt(x_12, x_13);
-lean_dec(x_13);
-if (x_14 == 0)
-{
-lean_dec(x_12);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_1;
-}
-else
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_15 = lean_array_fget(x_7, x_12);
-x_16 = lean_box(2);
-x_17 = lean_array_fset(x_7, x_12, x_16);
-switch (lean_obj_tag(x_15)) {
-case 0:
-{
-uint8_t x_18; 
-x_18 = !lean_is_exclusive(x_15);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; uint8_t x_21; 
-x_19 = lean_ctor_get(x_15, 0);
-x_20 = lean_ctor_get(x_15, 1);
-x_21 = lean_name_eq(x_4, x_19);
-if (x_21 == 0)
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-lean_free_object(x_15);
-x_22 = l_PersistentHashMap_mkCollisionNode___rarg(x_19, x_20, x_4, x_5);
-x_23 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_23, 0, x_22);
-x_24 = lean_array_fset(x_17, x_12, x_23);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_24);
-return x_1;
-}
-else
-{
-lean_object* x_25; 
-lean_dec(x_20);
-lean_dec(x_19);
-lean_ctor_set(x_15, 1, x_5);
-lean_ctor_set(x_15, 0, x_4);
-x_25 = lean_array_fset(x_17, x_12, x_15);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_25);
-return x_1;
-}
-}
-else
-{
-lean_object* x_26; lean_object* x_27; uint8_t x_28; 
-x_26 = lean_ctor_get(x_15, 0);
-x_27 = lean_ctor_get(x_15, 1);
-lean_inc(x_27);
-lean_inc(x_26);
-lean_dec(x_15);
-x_28 = lean_name_eq(x_4, x_26);
-if (x_28 == 0)
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = l_PersistentHashMap_mkCollisionNode___rarg(x_26, x_27, x_4, x_5);
-x_30 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_30, 0, x_29);
-x_31 = lean_array_fset(x_17, x_12, x_30);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_31);
-return x_1;
-}
-else
-{
-lean_object* x_32; lean_object* x_33; 
-lean_dec(x_27);
-lean_dec(x_26);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_4);
-lean_ctor_set(x_32, 1, x_5);
-x_33 = lean_array_fset(x_17, x_12, x_32);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_33);
-return x_1;
-}
-}
-}
-case 1:
-{
-uint8_t x_34; 
-x_34 = !lean_is_exclusive(x_15);
-if (x_34 == 0)
-{
-lean_object* x_35; size_t x_36; size_t x_37; lean_object* x_38; lean_object* x_39; 
-x_35 = lean_ctor_get(x_15, 0);
-x_36 = x_2 >> x_9;
-x_37 = x_3 + x_8;
-x_38 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8(x_35, x_36, x_37, x_4, x_5);
-lean_ctor_set(x_15, 0, x_38);
-x_39 = lean_array_fset(x_17, x_12, x_15);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_39);
-return x_1;
-}
-else
-{
-lean_object* x_40; size_t x_41; size_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_40 = lean_ctor_get(x_15, 0);
-lean_inc(x_40);
-lean_dec(x_15);
-x_41 = x_2 >> x_9;
-x_42 = x_3 + x_8;
-x_43 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8(x_40, x_41, x_42, x_4, x_5);
-x_44 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_44, 0, x_43);
-x_45 = lean_array_fset(x_17, x_12, x_44);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_45);
-return x_1;
-}
-}
-default: 
-{
-lean_object* x_46; lean_object* x_47; 
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_4);
-lean_ctor_set(x_46, 1, x_5);
-x_47 = lean_array_fset(x_17, x_12, x_46);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_47);
-return x_1;
-}
-}
-}
-}
-else
-{
-lean_object* x_48; size_t x_49; size_t x_50; size_t x_51; size_t x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
-x_48 = lean_ctor_get(x_1, 0);
-lean_inc(x_48);
-lean_dec(x_1);
-x_49 = 1;
-x_50 = 5;
-x_51 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
-x_52 = x_2 & x_51;
-x_53 = lean_usize_to_nat(x_52);
-x_54 = lean_array_get_size(x_48);
-x_55 = lean_nat_dec_lt(x_53, x_54);
-lean_dec(x_54);
-if (x_55 == 0)
-{
-lean_object* x_56; 
-lean_dec(x_53);
-lean_dec(x_5);
-lean_dec(x_4);
-x_56 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_56, 0, x_48);
-return x_56;
-}
-else
-{
-lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_57 = lean_array_fget(x_48, x_53);
-x_58 = lean_box(2);
-x_59 = lean_array_fset(x_48, x_53, x_58);
-switch (lean_obj_tag(x_57)) {
-case 0:
-{
-lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
-x_60 = lean_ctor_get(x_57, 0);
-lean_inc(x_60);
-x_61 = lean_ctor_get(x_57, 1);
-lean_inc(x_61);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- lean_ctor_release(x_57, 1);
- x_62 = x_57;
-} else {
- lean_dec_ref(x_57);
- x_62 = lean_box(0);
-}
-x_63 = lean_name_eq(x_4, x_60);
-if (x_63 == 0)
-{
-lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-lean_dec(x_62);
-x_64 = l_PersistentHashMap_mkCollisionNode___rarg(x_60, x_61, x_4, x_5);
-x_65 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_65, 0, x_64);
-x_66 = lean_array_fset(x_59, x_53, x_65);
-lean_dec(x_53);
-x_67 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_67, 0, x_66);
-return x_67;
-}
-else
-{
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-lean_dec(x_61);
-lean_dec(x_60);
-if (lean_is_scalar(x_62)) {
- x_68 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_68 = x_62;
-}
-lean_ctor_set(x_68, 0, x_4);
-lean_ctor_set(x_68, 1, x_5);
-x_69 = lean_array_fset(x_59, x_53, x_68);
-lean_dec(x_53);
-x_70 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_70, 0, x_69);
-return x_70;
-}
-}
-case 1:
-{
-lean_object* x_71; lean_object* x_72; size_t x_73; size_t x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_71 = lean_ctor_get(x_57, 0);
-lean_inc(x_71);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- x_72 = x_57;
-} else {
- lean_dec_ref(x_57);
- x_72 = lean_box(0);
-}
-x_73 = x_2 >> x_50;
-x_74 = x_3 + x_49;
-x_75 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8(x_71, x_73, x_74, x_4, x_5);
-if (lean_is_scalar(x_72)) {
- x_76 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_76 = x_72;
-}
-lean_ctor_set(x_76, 0, x_75);
-x_77 = lean_array_fset(x_59, x_53, x_76);
-lean_dec(x_53);
-x_78 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_78, 0, x_77);
-return x_78;
-}
-default: 
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_4);
-lean_ctor_set(x_79, 1, x_5);
-x_80 = lean_array_fset(x_59, x_53, x_79);
-lean_dec(x_53);
-x_81 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_81, 0, x_80);
-return x_81;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_82; lean_object* x_83; size_t x_84; uint8_t x_85; 
-x_82 = lean_unsigned_to_nat(0u);
-x_83 = l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__9(x_1, x_82, x_4, x_5);
-x_84 = 7;
-x_85 = x_84 <= x_3;
-if (x_85 == 0)
-{
-lean_object* x_86; lean_object* x_87; uint8_t x_88; 
-x_86 = l_PersistentHashMap_getCollisionNodeSize___rarg(x_83);
-x_87 = lean_unsigned_to_nat(4u);
-x_88 = lean_nat_dec_lt(x_86, x_87);
-lean_dec(x_86);
-if (x_88 == 0)
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_89 = lean_ctor_get(x_83, 0);
-lean_inc(x_89);
-x_90 = lean_ctor_get(x_83, 1);
-lean_inc(x_90);
-lean_dec(x_83);
-x_91 = l_PersistentHashMap_insertAux___main___rarg___closed__3;
-x_92 = l_Array_iterateMAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__10(x_3, x_89, x_90, x_89, x_82, x_91);
-lean_dec(x_90);
-lean_dec(x_89);
-return x_92;
-}
-else
-{
-return x_83;
-}
-}
-else
-{
-return x_83;
-}
-}
-}
-}
-lean_object* l_PersistentHashMap_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__7(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_1);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = l_Lean_Name_hash(x_2);
-x_8 = 1;
-x_9 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8(x_5, x_7, x_8, x_2, x_3);
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_nat_add(x_6, x_10);
-lean_dec(x_6);
-lean_ctor_set(x_1, 1, x_11);
-lean_ctor_set(x_1, 0, x_9);
-return x_1;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_12 = lean_ctor_get(x_1, 0);
-x_13 = lean_ctor_get(x_1, 1);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_dec(x_1);
-x_14 = l_Lean_Name_hash(x_2);
-x_15 = 1;
-x_16 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8(x_12, x_14, x_15, x_2, x_3);
-x_17 = lean_unsigned_to_nat(1u);
-x_18 = lean_nat_add(x_13, x_17);
-lean_dec(x_13);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_16);
-lean_ctor_set(x_19, 1, x_18);
-return x_19;
-}
-}
-}
-lean_object* l_AssocList_foldlM___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__14(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-return x_1;
-}
-else
-{
-uint8_t x_3; 
-x_3 = !lean_is_exclusive(x_2);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
-x_4 = lean_ctor_get(x_2, 0);
-x_5 = lean_ctor_get(x_2, 2);
-x_6 = lean_array_get_size(x_1);
-x_7 = l_Lean_Name_hash(x_4);
-x_8 = lean_usize_modn(x_7, x_6);
-lean_dec(x_6);
-x_9 = lean_array_uget(x_1, x_8);
-lean_ctor_set(x_2, 2, x_9);
-x_10 = lean_array_uset(x_1, x_8, x_2);
-x_1 = x_10;
-x_2 = x_5;
-goto _start;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_12 = lean_ctor_get(x_2, 0);
-x_13 = lean_ctor_get(x_2, 1);
-x_14 = lean_ctor_get(x_2, 2);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_dec(x_2);
-x_15 = lean_array_get_size(x_1);
-x_16 = l_Lean_Name_hash(x_12);
-x_17 = lean_usize_modn(x_16, x_15);
-lean_dec(x_15);
-x_18 = lean_array_uget(x_1, x_17);
-x_19 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_19, 0, x_12);
-lean_ctor_set(x_19, 1, x_13);
-lean_ctor_set(x_19, 2, x_18);
-x_20 = lean_array_uset(x_1, x_17, x_19);
-x_1 = x_20;
-x_2 = x_14;
-goto _start;
-}
-}
-}
-}
-lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__13(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; uint8_t x_5; 
-x_4 = lean_array_get_size(x_2);
-x_5 = lean_nat_dec_lt(x_1, x_4);
-lean_dec(x_4);
-if (x_5 == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_3;
-}
-else
-{
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_6 = lean_array_fget(x_2, x_1);
-x_7 = lean_box(0);
-x_8 = lean_array_fset(x_2, x_1, x_7);
-x_9 = l_AssocList_foldlM___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__14(x_3, x_6);
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_nat_add(x_1, x_10);
-lean_dec(x_1);
-x_1 = x_11;
-x_2 = x_8;
-x_3 = x_9;
-goto _start;
-}
-}
-}
-lean_object* l_HashMapImp_expand___at_Lean_Elab_Command_addBuiltinCommandElab___spec__12(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_3 = lean_array_get_size(x_2);
-x_4 = lean_unsigned_to_nat(2u);
-x_5 = lean_nat_mul(x_3, x_4);
-lean_dec(x_3);
-x_6 = lean_box(0);
-x_7 = lean_mk_array(x_5, x_6);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l_HashMapImp_moveEntries___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__13(x_8, x_2, x_7);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_1);
-lean_ctor_set(x_10, 1, x_9);
-return x_10;
-}
-}
-lean_object* l_AssocList_replace___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__15(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-if (lean_obj_tag(x_3) == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_3;
-}
-else
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_3);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_5 = lean_ctor_get(x_3, 0);
-x_6 = lean_ctor_get(x_3, 1);
-x_7 = lean_ctor_get(x_3, 2);
-x_8 = lean_name_eq(x_5, x_1);
-if (x_8 == 0)
-{
-lean_object* x_9; 
-x_9 = l_AssocList_replace___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__15(x_1, x_2, x_7);
-lean_ctor_set(x_3, 2, x_9);
-return x_3;
-}
-else
-{
-lean_dec(x_6);
-lean_dec(x_5);
-lean_ctor_set(x_3, 1, x_2);
-lean_ctor_set(x_3, 0, x_1);
-return x_3;
-}
-}
-else
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
-x_10 = lean_ctor_get(x_3, 0);
-x_11 = lean_ctor_get(x_3, 1);
-x_12 = lean_ctor_get(x_3, 2);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_dec(x_3);
-x_13 = lean_name_eq(x_10, x_1);
-if (x_13 == 0)
-{
-lean_object* x_14; lean_object* x_15; 
-x_14 = l_AssocList_replace___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__15(x_1, x_2, x_12);
-x_15 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_15, 0, x_10);
-lean_ctor_set(x_15, 1, x_11);
-lean_ctor_set(x_15, 2, x_14);
-return x_15;
-}
-else
-{
-lean_object* x_16; 
-lean_dec(x_11);
-lean_dec(x_10);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_1);
-lean_ctor_set(x_16, 1, x_2);
-lean_ctor_set(x_16, 2, x_12);
-return x_16;
-}
-}
-}
-}
-}
-lean_object* l_HashMapImp_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__11(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_1);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = lean_array_get_size(x_6);
-x_8 = l_Lean_Name_hash(x_2);
-x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_array_uget(x_6, x_9);
-x_11 = l_AssocList_contains___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__3(x_2, x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
-x_12 = lean_unsigned_to_nat(1u);
-x_13 = lean_nat_add(x_5, x_12);
-lean_dec(x_5);
-x_14 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_14, 0, x_2);
-lean_ctor_set(x_14, 1, x_3);
-lean_ctor_set(x_14, 2, x_10);
-x_15 = lean_array_uset(x_6, x_9, x_14);
-x_16 = lean_nat_dec_le(x_13, x_7);
-lean_dec(x_7);
-if (x_16 == 0)
-{
-lean_object* x_17; 
-lean_free_object(x_1);
-x_17 = l_HashMapImp_expand___at_Lean_Elab_Command_addBuiltinCommandElab___spec__12(x_13, x_15);
-return x_17;
-}
-else
-{
-lean_ctor_set(x_1, 1, x_15);
-lean_ctor_set(x_1, 0, x_13);
-return x_1;
-}
-}
-else
-{
-lean_object* x_18; lean_object* x_19; 
-lean_dec(x_7);
-x_18 = l_AssocList_replace___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__15(x_2, x_3, x_10);
-x_19 = lean_array_uset(x_6, x_9, x_18);
-lean_ctor_set(x_1, 1, x_19);
-return x_1;
-}
-}
-else
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
-x_20 = lean_ctor_get(x_1, 0);
-x_21 = lean_ctor_get(x_1, 1);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_dec(x_1);
-x_22 = lean_array_get_size(x_21);
-x_23 = l_Lean_Name_hash(x_2);
-x_24 = lean_usize_modn(x_23, x_22);
-x_25 = lean_array_uget(x_21, x_24);
-x_26 = l_AssocList_contains___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__3(x_2, x_25);
-if (x_26 == 0)
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_27 = lean_unsigned_to_nat(1u);
-x_28 = lean_nat_add(x_20, x_27);
-lean_dec(x_20);
-x_29 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_29, 0, x_2);
-lean_ctor_set(x_29, 1, x_3);
-lean_ctor_set(x_29, 2, x_25);
-x_30 = lean_array_uset(x_21, x_24, x_29);
-x_31 = lean_nat_dec_le(x_28, x_22);
-lean_dec(x_22);
-if (x_31 == 0)
-{
-lean_object* x_32; 
-x_32 = l_HashMapImp_expand___at_Lean_Elab_Command_addBuiltinCommandElab___spec__12(x_28, x_30);
-return x_32;
-}
-else
-{
-lean_object* x_33; 
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_28);
-lean_ctor_set(x_33, 1, x_30);
-return x_33;
-}
-}
-else
-{
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-lean_dec(x_22);
-x_34 = l_AssocList_replace___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__15(x_2, x_3, x_25);
-x_35 = lean_array_uset(x_21, x_24, x_34);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_20);
-lean_ctor_set(x_36, 1, x_35);
-return x_36;
-}
-}
-}
-}
-lean_object* l_Lean_SMap_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__6(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
-if (x_4 == 0)
-{
-uint8_t x_5; 
-x_5 = !lean_is_exclusive(x_1);
-if (x_5 == 0)
-{
-lean_object* x_6; lean_object* x_7; 
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = l_PersistentHashMap_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__7(x_6, x_2, x_3);
-lean_ctor_set(x_1, 1, x_7);
-return x_1;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_8 = lean_ctor_get(x_1, 0);
-x_9 = lean_ctor_get(x_1, 1);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_dec(x_1);
-x_10 = l_PersistentHashMap_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__7(x_9, x_2, x_3);
-x_11 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_11, 0, x_8);
-lean_ctor_set(x_11, 1, x_10);
-lean_ctor_set_uint8(x_11, sizeof(void*)*2, x_4);
-return x_11;
-}
-}
-else
-{
-uint8_t x_12; 
-x_12 = !lean_is_exclusive(x_1);
-if (x_12 == 0)
-{
-lean_object* x_13; lean_object* x_14; 
-x_13 = lean_ctor_get(x_1, 0);
-x_14 = l_HashMapImp_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__11(x_13, x_2, x_3);
-lean_ctor_set(x_1, 0, x_14);
-return x_1;
-}
-else
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_15 = lean_ctor_get(x_1, 0);
-x_16 = lean_ctor_get(x_1, 1);
-lean_inc(x_16);
-lean_inc(x_15);
-lean_dec(x_1);
-x_17 = l_HashMapImp_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__11(x_15, x_2, x_3);
-x_18 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_16);
-lean_ctor_set_uint8(x_18, sizeof(void*)*2, x_4);
-return x_18;
-}
-}
-}
-}
 lean_object* _init_l_Lean_Elab_Command_addBuiltinCommandElab___closed__1() {
 _start:
 {
@@ -3883,7 +2974,7 @@ lean_object* x_15; lean_object* x_16; lean_object* x_17;
 x_15 = lean_ctor_get(x_14, 1);
 lean_inc(x_15);
 lean_dec(x_14);
-x_16 = l_Lean_SMap_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__6(x_12, x_1, x_3);
+x_16 = l_Lean_Elab_ElabFnTable_insert___rarg(x_12, x_1, x_3);
 x_17 = lean_io_ref_set(x_5, x_16, x_15);
 return x_17;
 }
@@ -3982,7 +3073,7 @@ lean_object* x_39; lean_object* x_40; lean_object* x_41;
 x_39 = lean_ctor_get(x_38, 1);
 lean_inc(x_39);
 lean_dec(x_38);
-x_40 = l_Lean_SMap_insert___at_Lean_Elab_Command_addBuiltinCommandElab___spec__6(x_36, x_1, x_3);
+x_40 = l_Lean_Elab_ElabFnTable_insert___rarg(x_36, x_1, x_3);
 x_41 = lean_io_ref_set(x_5, x_40, x_39);
 return x_41;
 }
@@ -4139,31 +3230,6 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__10___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-size_t x_7; lean_object* x_8; 
-x_7 = lean_unbox_usize(x_1);
-lean_dec(x_1);
-x_8 = l_Array_iterateMAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__10(x_7, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-return x_8;
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-size_t x_6; size_t x_7; lean_object* x_8; 
-x_6 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_7 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_8 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Command_addBuiltinCommandElab___spec__8(x_1, x_6, x_7, x_4, x_5);
-return x_8;
-}
-}
 lean_object* l_Lean_Elab_Command_addBuiltinCommandElab___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -4825,6 +3891,107 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
+lean_object* l___private_Init_Lean_Elab_Command_8__elabCommandUsing___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+lean_inc(x_1);
+x_5 = l___private_Init_Lean_Elab_Command_6__prettyPrint(x_1, x_3, x_4);
+x_6 = lean_ctor_get(x_5, 0);
+lean_inc(x_6);
+x_7 = lean_ctor_get(x_5, 1);
+lean_inc(x_7);
+lean_dec(x_5);
+x_8 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_8, 0, x_6);
+x_9 = l_Lean_MessageData_ofList___closed__3;
+x_10 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_10, 0, x_9);
+lean_ctor_set(x_10, 1, x_8);
+x_11 = lean_unsigned_to_nat(2u);
+x_12 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_10);
+x_13 = l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__3;
+x_14 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_14, 1, x_12);
+x_15 = l_Lean_Elab_Command_throwError___rarg(x_1, x_14, x_3, x_7);
+return x_15;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = lean_ctor_get(x_2, 0);
+lean_inc(x_16);
+x_17 = lean_ctor_get(x_2, 1);
+lean_inc(x_17);
+lean_dec(x_2);
+lean_inc(x_3);
+lean_inc(x_1);
+x_18 = lean_apply_3(x_16, x_1, x_3, x_4);
+if (lean_obj_tag(x_18) == 0)
+{
+lean_dec(x_17);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_18;
+}
+else
+{
+lean_object* x_19; 
+x_19 = lean_ctor_get(x_18, 0);
+lean_inc(x_19);
+if (lean_obj_tag(x_19) == 0)
+{
+uint8_t x_20; 
+lean_dec(x_17);
+lean_dec(x_3);
+lean_dec(x_1);
+x_20 = !lean_is_exclusive(x_18);
+if (x_20 == 0)
+{
+lean_object* x_21; 
+x_21 = lean_ctor_get(x_18, 0);
+lean_dec(x_21);
+return x_18;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; 
+x_22 = lean_ctor_get(x_18, 1);
+lean_inc(x_22);
+lean_dec(x_18);
+x_23 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_23, 0, x_19);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
+}
+}
+else
+{
+lean_object* x_24; 
+x_24 = lean_ctor_get(x_18, 1);
+lean_inc(x_24);
+lean_dec(x_18);
+x_2 = x_17;
+x_4 = x_24;
+goto _start;
+}
+}
+}
+}
+}
+lean_object* l___private_Init_Lean_Elab_Command_8__elabCommandUsing(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l___private_Init_Lean_Elab_Command_8__elabCommandUsing___main(x_1, x_2, x_3, x_4);
+return x_5;
+}
+}
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_Command_elabCommand___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -5104,37 +4271,37 @@ _start:
 {
 if (lean_obj_tag(x_1) == 1)
 {
-lean_object* x_4; lean_object* x_5; 
-x_4 = lean_ctor_get(x_1, 0);
-lean_inc(x_4);
+lean_object* x_4; 
 lean_inc(x_2);
-x_5 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
-if (lean_obj_tag(x_5) == 0)
+x_4 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
+if (lean_obj_tag(x_4) == 0)
 {
-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; 
-x_6 = lean_ctor_get(x_5, 0);
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_5 = lean_ctor_get(x_4, 0);
+lean_inc(x_5);
+x_6 = lean_ctor_get(x_4, 1);
 lean_inc(x_6);
-x_7 = lean_ctor_get(x_5, 1);
-lean_inc(x_7);
-lean_dec(x_5);
-x_8 = l_Lean_Elab_Command_commandElabAttribute;
-x_9 = lean_ctor_get(x_8, 1);
+lean_dec(x_4);
+x_7 = l_Lean_Elab_Command_commandElabAttribute;
+x_8 = lean_ctor_get(x_7, 1);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_5, 0);
 lean_inc(x_9);
-x_10 = lean_ctor_get(x_6, 0);
-lean_inc(x_10);
-lean_dec(x_6);
-x_11 = l_Lean_PersistentEnvExtension_getState___rarg(x_9, x_10);
-lean_dec(x_10);
+lean_dec(x_5);
+x_10 = l_Lean_PersistentEnvExtension_getState___rarg(x_8, x_9);
 lean_dec(x_9);
-x_12 = lean_ctor_get(x_11, 1);
-lean_inc(x_12);
-lean_dec(x_11);
-x_13 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__1(x_12, x_4);
+lean_dec(x_8);
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(x_10);
+lean_inc(x_1);
+x_12 = l_Lean_Syntax_getKind(x_1);
+x_13 = l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___spec__1(x_11, x_12);
 if (lean_obj_tag(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; 
 x_14 = l_Lean_Name_toString___closed__1;
-x_15 = l_Lean_Name_toStringWithSep___main(x_14, x_4);
+x_15 = l_Lean_Name_toStringWithSep___main(x_14, x_12);
 x_16 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_16, 0, x_15);
 x_17 = lean_alloc_ctor(0, 1, 0);
@@ -5147,39 +4314,38 @@ x_20 = l_Lean_Elab_Term_elabTerm___closed__6;
 x_21 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_21, 0, x_19);
 lean_ctor_set(x_21, 1, x_20);
-x_22 = l_Lean_Elab_Command_throwError___rarg(x_1, x_21, x_2, x_7);
+x_22 = l_Lean_Elab_Command_throwError___rarg(x_1, x_21, x_2, x_6);
 return x_22;
 }
 else
 {
 lean_object* x_23; lean_object* x_24; 
-lean_dec(x_4);
+lean_dec(x_12);
 x_23 = lean_ctor_get(x_13, 0);
 lean_inc(x_23);
 lean_dec(x_13);
-x_24 = lean_apply_3(x_23, x_1, x_2, x_7);
+x_24 = l___private_Init_Lean_Elab_Command_8__elabCommandUsing___main(x_1, x_23, x_2, x_6);
 return x_24;
 }
 }
 else
 {
 uint8_t x_25; 
-lean_dec(x_4);
 lean_dec(x_2);
 lean_dec(x_1);
-x_25 = !lean_is_exclusive(x_5);
+x_25 = !lean_is_exclusive(x_4);
 if (x_25 == 0)
 {
-return x_5;
+return x_4;
 }
 else
 {
 lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_5, 0);
-x_27 = lean_ctor_get(x_5, 1);
+x_26 = lean_ctor_get(x_4, 0);
+x_27 = lean_ctor_get(x_4, 1);
 lean_inc(x_27);
 lean_inc(x_26);
-lean_dec(x_5);
+lean_dec(x_4);
 x_28 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_28, 0, x_26);
 lean_ctor_set(x_28, 1, x_27);
@@ -5430,7 +4596,7 @@ return x_31;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_8__mkTermContext(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_Command_9__mkTermContext(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; uint8_t x_8; uint8_t 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; 
@@ -5488,17 +4654,17 @@ lean_ctor_set_uint8(x_22, sizeof(void*)*10, x_7);
 return x_22;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_8__mkTermContext___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_Command_9__mkTermContext___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l___private_Init_Lean_Elab_Command_8__mkTermContext(x_1, x_2, x_3);
+x_4 = l___private_Init_Lean_Elab_Command_9__mkTermContext(x_1, x_2, x_3);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_9__mkTermState(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_Command_10__mkTermState(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
@@ -5532,16 +4698,16 @@ lean_ctor_set(x_13, 5, x_4);
 return x_13;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_9__mkTermState___boxed(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_Command_10__mkTermState___boxed(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l___private_Init_Lean_Elab_Command_9__mkTermState(x_1);
+x_2 = l___private_Init_Lean_Elab_Command_10__mkTermState(x_1);
 lean_dec(x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_10__getVarDecls(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_Command_11__getVarDecls(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
@@ -5553,20 +4719,20 @@ lean_dec(x_3);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_10__getVarDecls___boxed(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_Command_11__getVarDecls___boxed(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l___private_Init_Lean_Elab_Command_10__getVarDecls(x_1);
+x_2 = l___private_Init_Lean_Elab_Command_11__getVarDecls(x_1);
 lean_dec(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Command_11__toCommandResult___rarg___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_Command_12__toCommandResult___rarg___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Lean_Message_Inhabited;
+x_1 = l_Lean_Elab_Command_Exception_inhabited;
 x_2 = l_Lean_Elab_Command_State_inhabited;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -5574,7 +4740,7 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_11__toCommandResult___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_Elab_Command_12__toCommandResult___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 if (lean_obj_tag(x_2) == 0)
@@ -5788,26 +4954,26 @@ else
 lean_object* x_51; lean_object* x_52; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_51 = l___private_Init_Lean_Elab_Command_11__toCommandResult___rarg___closed__1;
+x_51 = l___private_Init_Lean_Elab_Command_12__toCommandResult___rarg___closed__1;
 x_52 = l_unreachable_x21___rarg(x_51);
 return x_52;
 }
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_11__toCommandResult(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_Elab_Command_12__toCommandResult(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_Command_11__toCommandResult___rarg), 2, 0);
+x_3 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_Command_12__toCommandResult___rarg), 2, 0);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_11__toCommandResult___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_Elab_Command_12__toCommandResult___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l___private_Init_Lean_Elab_Command_11__toCommandResult(x_1, x_2);
+x_3 = l___private_Init_Lean_Elab_Command_12__toCommandResult(x_1, x_2);
 lean_dec(x_2);
 return x_3;
 }
@@ -5816,7 +4982,7 @@ lean_object* _init_l_Lean_Elab_Command_CommandElabM_inhabited___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Message_Inhabited___closed__2;
+x_1 = l_Lean_Elab_Exception_inhabited___closed__1;
 x_2 = lean_alloc_closure((void*)(l_Lean_Meta_SynthInstance_SynthM_inhabited___lambda__1___boxed), 3, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
@@ -5852,9 +5018,9 @@ lean_inc(x_6);
 x_7 = lean_ctor_get(x_5, 1);
 lean_inc(x_7);
 lean_dec(x_5);
-x_8 = l___private_Init_Lean_Elab_Command_10__getVarDecls(x_6);
-x_9 = l___private_Init_Lean_Elab_Command_8__mkTermContext(x_3, x_6, x_1);
-x_10 = l___private_Init_Lean_Elab_Command_9__mkTermState(x_6);
+x_8 = l___private_Init_Lean_Elab_Command_11__getVarDecls(x_6);
+x_9 = l___private_Init_Lean_Elab_Command_9__mkTermContext(x_3, x_6, x_1);
+x_10 = l___private_Init_Lean_Elab_Command_10__mkTermState(x_6);
 lean_dec(x_6);
 x_11 = l_Lean_Elab_Term_elabBinders___rarg(x_8, x_2, x_9, x_10);
 lean_dec(x_8);
@@ -6273,170 +5439,188 @@ return x_4;
 }
 else
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+lean_object* x_5; 
 x_5 = lean_ctor_get(x_4, 0);
 lean_inc(x_5);
+if (lean_obj_tag(x_5) == 0)
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = lean_ctor_get(x_4, 1);
 lean_inc(x_6);
 lean_dec(x_4);
+x_7 = lean_ctor_get(x_5, 0);
+lean_inc(x_7);
+lean_dec(x_5);
 lean_inc(x_2);
-x_7 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_6);
-if (lean_obj_tag(x_7) == 0)
+x_8 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_6);
+if (lean_obj_tag(x_8) == 0)
 {
-lean_object* x_8; lean_object* x_9; uint8_t x_10; 
-x_8 = lean_ctor_get(x_7, 0);
-lean_inc(x_8);
-x_9 = lean_ctor_get(x_7, 1);
+lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+x_9 = lean_ctor_get(x_8, 0);
 lean_inc(x_9);
-lean_dec(x_7);
-x_10 = !lean_is_exclusive(x_8);
-if (x_10 == 0)
+x_10 = lean_ctor_get(x_8, 1);
+lean_inc(x_10);
+lean_dec(x_8);
+x_11 = !lean_is_exclusive(x_9);
+if (x_11 == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_11 = lean_ctor_get(x_8, 1);
-x_12 = l_PersistentArray_push___rarg(x_11, x_5);
-lean_ctor_set(x_8, 1, x_12);
-x_13 = l___private_Init_Lean_Elab_Command_3__setState(x_8, x_2, x_9);
-if (lean_obj_tag(x_13) == 0)
+lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_12 = lean_ctor_get(x_9, 1);
+x_13 = l_PersistentArray_push___rarg(x_12, x_7);
+lean_ctor_set(x_9, 1, x_13);
+x_14 = l___private_Init_Lean_Elab_Command_3__setState(x_9, x_2, x_10);
+if (lean_obj_tag(x_14) == 0)
 {
-uint8_t x_14; 
-x_14 = !lean_is_exclusive(x_13);
-if (x_14 == 0)
+uint8_t x_15; 
+x_15 = !lean_is_exclusive(x_14);
+if (x_15 == 0)
 {
-lean_object* x_15; lean_object* x_16; 
-x_15 = lean_ctor_get(x_13, 0);
-lean_dec(x_15);
-x_16 = lean_box(0);
-lean_ctor_set(x_13, 0, x_16);
-return x_13;
+lean_object* x_16; lean_object* x_17; 
+x_16 = lean_ctor_get(x_14, 0);
+lean_dec(x_16);
+x_17 = lean_box(0);
+lean_ctor_set(x_14, 0, x_17);
+return x_14;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_17 = lean_ctor_get(x_13, 1);
-lean_inc(x_17);
-lean_dec(x_13);
-x_18 = lean_box(0);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_17);
-return x_19;
+lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_18 = lean_ctor_get(x_14, 1);
+lean_inc(x_18);
+lean_dec(x_14);
+x_19 = lean_box(0);
+x_20 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_18);
+return x_20;
 }
 }
 else
 {
-uint8_t x_20; 
-x_20 = !lean_is_exclusive(x_13);
-if (x_20 == 0)
+uint8_t x_21; 
+x_21 = !lean_is_exclusive(x_14);
+if (x_21 == 0)
 {
-return x_13;
+return x_14;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_13, 0);
-x_22 = lean_ctor_get(x_13, 1);
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = lean_ctor_get(x_14, 0);
+x_23 = lean_ctor_get(x_14, 1);
+lean_inc(x_23);
 lean_inc(x_22);
-lean_inc(x_21);
-lean_dec(x_13);
-x_23 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_23, 0, x_21);
-lean_ctor_set(x_23, 1, x_22);
-return x_23;
+lean_dec(x_14);
+x_24 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_24, 0, x_22);
+lean_ctor_set(x_24, 1, x_23);
+return x_24;
 }
 }
 }
 else
 {
-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; 
-x_24 = lean_ctor_get(x_8, 0);
-x_25 = lean_ctor_get(x_8, 1);
-x_26 = lean_ctor_get(x_8, 2);
-x_27 = lean_ctor_get(x_8, 3);
+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; 
+x_25 = lean_ctor_get(x_9, 0);
+x_26 = lean_ctor_get(x_9, 1);
+x_27 = lean_ctor_get(x_9, 2);
+x_28 = lean_ctor_get(x_9, 3);
+lean_inc(x_28);
 lean_inc(x_27);
 lean_inc(x_26);
 lean_inc(x_25);
-lean_inc(x_24);
-lean_dec(x_8);
-x_28 = l_PersistentArray_push___rarg(x_25, x_5);
-x_29 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_29, 0, x_24);
-lean_ctor_set(x_29, 1, x_28);
-lean_ctor_set(x_29, 2, x_26);
-lean_ctor_set(x_29, 3, x_27);
-x_30 = l___private_Init_Lean_Elab_Command_3__setState(x_29, x_2, x_9);
-if (lean_obj_tag(x_30) == 0)
+lean_dec(x_9);
+x_29 = l_PersistentArray_push___rarg(x_26, x_7);
+x_30 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_30, 0, x_25);
+lean_ctor_set(x_30, 1, x_29);
+lean_ctor_set(x_30, 2, x_27);
+lean_ctor_set(x_30, 3, x_28);
+x_31 = l___private_Init_Lean_Elab_Command_3__setState(x_30, x_2, x_10);
+if (lean_obj_tag(x_31) == 0)
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_31 = lean_ctor_get(x_30, 1);
-lean_inc(x_31);
-if (lean_is_exclusive(x_30)) {
- lean_ctor_release(x_30, 0);
- lean_ctor_release(x_30, 1);
- x_32 = x_30;
+lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_32 = lean_ctor_get(x_31, 1);
+lean_inc(x_32);
+if (lean_is_exclusive(x_31)) {
+ lean_ctor_release(x_31, 0);
+ lean_ctor_release(x_31, 1);
+ x_33 = x_31;
 } else {
- lean_dec_ref(x_30);
- x_32 = lean_box(0);
+ lean_dec_ref(x_31);
+ x_33 = lean_box(0);
 }
-x_33 = lean_box(0);
-if (lean_is_scalar(x_32)) {
- x_34 = lean_alloc_ctor(0, 2, 0);
+x_34 = lean_box(0);
+if (lean_is_scalar(x_33)) {
+ x_35 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_34 = x_32;
+ x_35 = x_33;
 }
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_31);
-return x_34;
+lean_ctor_set(x_35, 0, x_34);
+lean_ctor_set(x_35, 1, x_32);
+return x_35;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_35 = lean_ctor_get(x_30, 0);
-lean_inc(x_35);
-x_36 = lean_ctor_get(x_30, 1);
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_36 = lean_ctor_get(x_31, 0);
 lean_inc(x_36);
-if (lean_is_exclusive(x_30)) {
- lean_ctor_release(x_30, 0);
- lean_ctor_release(x_30, 1);
- x_37 = x_30;
+x_37 = lean_ctor_get(x_31, 1);
+lean_inc(x_37);
+if (lean_is_exclusive(x_31)) {
+ lean_ctor_release(x_31, 0);
+ lean_ctor_release(x_31, 1);
+ x_38 = x_31;
 } else {
- lean_dec_ref(x_30);
- x_37 = lean_box(0);
+ lean_dec_ref(x_31);
+ x_38 = lean_box(0);
 }
-if (lean_is_scalar(x_37)) {
- x_38 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_38)) {
+ x_39 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_38 = x_37;
+ x_39 = x_38;
 }
-lean_ctor_set(x_38, 0, x_35);
-lean_ctor_set(x_38, 1, x_36);
-return x_38;
+lean_ctor_set(x_39, 0, x_36);
+lean_ctor_set(x_39, 1, x_37);
+return x_39;
 }
 }
 }
 else
 {
-uint8_t x_39; 
-lean_dec(x_5);
-lean_dec(x_2);
-x_39 = !lean_is_exclusive(x_7);
-if (x_39 == 0)
-{
-return x_7;
-}
-else
-{
-lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-x_40 = lean_ctor_get(x_7, 0);
-x_41 = lean_ctor_get(x_7, 1);
-lean_inc(x_41);
-lean_inc(x_40);
+uint8_t x_40; 
 lean_dec(x_7);
-x_42 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_42, 0, x_40);
-lean_ctor_set(x_42, 1, x_41);
-return x_42;
+lean_dec(x_2);
+x_40 = !lean_is_exclusive(x_8);
+if (x_40 == 0)
+{
+return x_8;
 }
+else
+{
+lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_41 = lean_ctor_get(x_8, 0);
+x_42 = lean_ctor_get(x_8, 1);
+lean_inc(x_42);
+lean_inc(x_41);
+lean_dec(x_8);
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_41);
+lean_ctor_set(x_43, 1, x_42);
+return x_43;
+}
+}
+}
+else
+{
+lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_44 = lean_ctor_get(x_4, 1);
+lean_inc(x_44);
+lean_dec(x_4);
+x_45 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
+x_46 = l_unreachable_x21___rarg(x_45);
+x_47 = lean_apply_2(x_46, x_2, x_44);
+return x_47;
 }
 }
 }
@@ -6472,179 +5656,245 @@ return x_8;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+lean_object* x_9; 
 x_9 = lean_ctor_get(x_4, 0);
 lean_inc(x_9);
+if (lean_obj_tag(x_9) == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
 x_10 = lean_ctor_get(x_4, 1);
 lean_inc(x_10);
 lean_dec(x_4);
+x_11 = lean_ctor_get(x_9, 0);
+lean_inc(x_11);
+lean_dec(x_9);
 lean_inc(x_2);
-x_11 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_10);
-if (lean_obj_tag(x_11) == 0)
+x_12 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_10);
+if (lean_obj_tag(x_12) == 0)
 {
-lean_object* x_12; lean_object* x_13; uint8_t x_14; 
-x_12 = lean_ctor_get(x_11, 0);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_11, 1);
+lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+x_13 = lean_ctor_get(x_12, 0);
 lean_inc(x_13);
-lean_dec(x_11);
-x_14 = !lean_is_exclusive(x_12);
-if (x_14 == 0)
+x_14 = lean_ctor_get(x_12, 1);
+lean_inc(x_14);
+lean_dec(x_12);
+x_15 = !lean_is_exclusive(x_13);
+if (x_15 == 0)
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_15 = lean_ctor_get(x_12, 1);
-x_16 = l_PersistentArray_push___rarg(x_15, x_9);
-lean_ctor_set(x_12, 1, x_16);
-x_17 = l___private_Init_Lean_Elab_Command_3__setState(x_12, x_2, x_13);
-if (lean_obj_tag(x_17) == 0)
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = lean_ctor_get(x_13, 1);
+x_17 = l_PersistentArray_push___rarg(x_16, x_11);
+lean_ctor_set(x_13, 1, x_17);
+x_18 = l___private_Init_Lean_Elab_Command_3__setState(x_13, x_2, x_14);
+if (lean_obj_tag(x_18) == 0)
 {
-uint8_t x_18; 
-x_18 = !lean_is_exclusive(x_17);
-if (x_18 == 0)
+uint8_t x_19; 
+x_19 = !lean_is_exclusive(x_18);
+if (x_19 == 0)
 {
-lean_object* x_19; lean_object* x_20; 
-x_19 = lean_ctor_get(x_17, 0);
-lean_dec(x_19);
-x_20 = lean_box(0);
-lean_ctor_set(x_17, 0, x_20);
-return x_17;
+lean_object* x_20; lean_object* x_21; 
+x_20 = lean_ctor_get(x_18, 0);
+lean_dec(x_20);
+x_21 = lean_box(0);
+lean_ctor_set(x_18, 0, x_21);
+return x_18;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_17, 1);
-lean_inc(x_21);
-lean_dec(x_17);
-x_22 = lean_box(0);
-x_23 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_23, 0, x_22);
-lean_ctor_set(x_23, 1, x_21);
-return x_23;
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = lean_ctor_get(x_18, 1);
+lean_inc(x_22);
+lean_dec(x_18);
+x_23 = lean_box(0);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_23);
+lean_ctor_set(x_24, 1, x_22);
+return x_24;
 }
 }
 else
 {
-uint8_t x_24; 
-x_24 = !lean_is_exclusive(x_17);
-if (x_24 == 0)
+uint8_t x_25; 
+x_25 = !lean_is_exclusive(x_18);
+if (x_25 == 0)
 {
-lean_object* x_25; lean_object* x_26; 
-x_25 = lean_ctor_get(x_17, 0);
-lean_dec(x_25);
-x_26 = lean_box(0);
-lean_ctor_set_tag(x_17, 0);
-lean_ctor_set(x_17, 0, x_26);
-return x_17;
+lean_object* x_26; lean_object* x_27; 
+x_26 = lean_ctor_get(x_18, 0);
+lean_dec(x_26);
+x_27 = lean_box(0);
+lean_ctor_set_tag(x_18, 0);
+lean_ctor_set(x_18, 0, x_27);
+return x_18;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_17, 1);
-lean_inc(x_27);
-lean_dec(x_17);
-x_28 = lean_box(0);
-x_29 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_27);
-return x_29;
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_18, 1);
+lean_inc(x_28);
+lean_dec(x_18);
+x_29 = lean_box(0);
+x_30 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 1, x_28);
+return x_30;
 }
 }
 }
 else
 {
-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; 
-x_30 = lean_ctor_get(x_12, 0);
-x_31 = lean_ctor_get(x_12, 1);
-x_32 = lean_ctor_get(x_12, 2);
-x_33 = lean_ctor_get(x_12, 3);
+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; 
+x_31 = lean_ctor_get(x_13, 0);
+x_32 = lean_ctor_get(x_13, 1);
+x_33 = lean_ctor_get(x_13, 2);
+x_34 = lean_ctor_get(x_13, 3);
+lean_inc(x_34);
 lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
-lean_inc(x_30);
-lean_dec(x_12);
-x_34 = l_PersistentArray_push___rarg(x_31, x_9);
-x_35 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_35, 0, x_30);
-lean_ctor_set(x_35, 1, x_34);
-lean_ctor_set(x_35, 2, x_32);
-lean_ctor_set(x_35, 3, x_33);
-x_36 = l___private_Init_Lean_Elab_Command_3__setState(x_35, x_2, x_13);
-if (lean_obj_tag(x_36) == 0)
+lean_dec(x_13);
+x_35 = l_PersistentArray_push___rarg(x_32, x_11);
+x_36 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_36, 0, x_31);
+lean_ctor_set(x_36, 1, x_35);
+lean_ctor_set(x_36, 2, x_33);
+lean_ctor_set(x_36, 3, x_34);
+x_37 = l___private_Init_Lean_Elab_Command_3__setState(x_36, x_2, x_14);
+if (lean_obj_tag(x_37) == 0)
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_37 = lean_ctor_get(x_36, 1);
-lean_inc(x_37);
-if (lean_is_exclusive(x_36)) {
- lean_ctor_release(x_36, 0);
- lean_ctor_release(x_36, 1);
- x_38 = x_36;
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_38 = lean_ctor_get(x_37, 1);
+lean_inc(x_38);
+if (lean_is_exclusive(x_37)) {
+ lean_ctor_release(x_37, 0);
+ lean_ctor_release(x_37, 1);
+ x_39 = x_37;
 } else {
- lean_dec_ref(x_36);
- x_38 = lean_box(0);
+ lean_dec_ref(x_37);
+ x_39 = lean_box(0);
 }
-x_39 = lean_box(0);
-if (lean_is_scalar(x_38)) {
- x_40 = lean_alloc_ctor(0, 2, 0);
+x_40 = lean_box(0);
+if (lean_is_scalar(x_39)) {
+ x_41 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_40 = x_38;
+ x_41 = x_39;
 }
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_37);
-return x_40;
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_41, 1, x_38);
+return x_41;
 }
 else
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_41 = lean_ctor_get(x_36, 1);
-lean_inc(x_41);
-if (lean_is_exclusive(x_36)) {
- lean_ctor_release(x_36, 0);
- lean_ctor_release(x_36, 1);
- x_42 = x_36;
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_42 = lean_ctor_get(x_37, 1);
+lean_inc(x_42);
+if (lean_is_exclusive(x_37)) {
+ lean_ctor_release(x_37, 0);
+ lean_ctor_release(x_37, 1);
+ x_43 = x_37;
 } else {
- lean_dec_ref(x_36);
- x_42 = lean_box(0);
+ lean_dec_ref(x_37);
+ x_43 = lean_box(0);
 }
-x_43 = lean_box(0);
-if (lean_is_scalar(x_42)) {
- x_44 = lean_alloc_ctor(0, 2, 0);
+x_44 = lean_box(0);
+if (lean_is_scalar(x_43)) {
+ x_45 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_44 = x_42;
- lean_ctor_set_tag(x_44, 0);
+ x_45 = x_43;
+ lean_ctor_set_tag(x_45, 0);
 }
-lean_ctor_set(x_44, 0, x_43);
-lean_ctor_set(x_44, 1, x_41);
-return x_44;
+lean_ctor_set(x_45, 0, x_44);
+lean_ctor_set(x_45, 1, x_42);
+return x_45;
 }
 }
 }
 else
 {
-uint8_t x_45; 
-lean_dec(x_9);
-lean_dec(x_2);
-x_45 = !lean_is_exclusive(x_11);
-if (x_45 == 0)
-{
-lean_object* x_46; lean_object* x_47; 
-x_46 = lean_ctor_get(x_11, 0);
-lean_dec(x_46);
-x_47 = lean_box(0);
-lean_ctor_set_tag(x_11, 0);
-lean_ctor_set(x_11, 0, x_47);
-return x_11;
-}
-else
-{
-lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_48 = lean_ctor_get(x_11, 1);
-lean_inc(x_48);
+uint8_t x_46; 
 lean_dec(x_11);
-x_49 = lean_box(0);
-x_50 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_50, 0, x_49);
-lean_ctor_set(x_50, 1, x_48);
-return x_50;
+lean_dec(x_2);
+x_46 = !lean_is_exclusive(x_12);
+if (x_46 == 0)
+{
+lean_object* x_47; lean_object* x_48; 
+x_47 = lean_ctor_get(x_12, 0);
+lean_dec(x_47);
+x_48 = lean_box(0);
+lean_ctor_set_tag(x_12, 0);
+lean_ctor_set(x_12, 0, x_48);
+return x_12;
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+x_49 = lean_ctor_get(x_12, 1);
+lean_inc(x_49);
+lean_dec(x_12);
+x_50 = lean_box(0);
+x_51 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_51, 0, x_50);
+lean_ctor_set(x_51, 1, x_49);
+return x_51;
+}
+}
+}
+else
+{
+lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+x_52 = lean_ctor_get(x_4, 1);
+lean_inc(x_52);
+lean_dec(x_4);
+x_53 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
+x_54 = l_unreachable_x21___rarg(x_53);
+x_55 = lean_apply_2(x_54, x_2, x_52);
+if (lean_obj_tag(x_55) == 0)
+{
+uint8_t x_56; 
+x_56 = !lean_is_exclusive(x_55);
+if (x_56 == 0)
+{
+return x_55;
+}
+else
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_ctor_get(x_55, 0);
+x_58 = lean_ctor_get(x_55, 1);
+lean_inc(x_58);
+lean_inc(x_57);
+lean_dec(x_55);
+x_59 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_59, 0, x_57);
+lean_ctor_set(x_59, 1, x_58);
+return x_59;
+}
+}
+else
+{
+uint8_t x_60; 
+x_60 = !lean_is_exclusive(x_55);
+if (x_60 == 0)
+{
+lean_object* x_61; lean_object* x_62; 
+x_61 = lean_ctor_get(x_55, 0);
+lean_dec(x_61);
+x_62 = lean_box(0);
+lean_ctor_set_tag(x_55, 0);
+lean_ctor_set(x_55, 0, x_62);
+return x_55;
+}
+else
+{
+lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+x_63 = lean_ctor_get(x_55, 1);
+lean_inc(x_63);
+lean_dec(x_55);
+x_64 = lean_box(0);
+x_65 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_65, 0, x_64);
+lean_ctor_set(x_65, 1, x_63);
+return x_65;
+}
 }
 }
 }
@@ -6891,7 +6141,7 @@ return x_14;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_12__addScope(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_Command_13__addScope(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; 
@@ -7191,7 +6441,7 @@ return x_71;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -7199,27 +6449,27 @@ x_1 = lean_mk_string("invalid scope");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__1;
+x_1 = l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__2;
+x_1 = l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___main(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___main(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 switch (lean_obj_tag(x_4)) {
@@ -7245,7 +6495,7 @@ lean_inc(x_10);
 lean_dec(x_4);
 lean_inc(x_5);
 lean_inc(x_2);
-x_11 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_1, x_2, x_3, x_9, x_5, x_6);
+x_11 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_1, x_2, x_3, x_9, x_5, x_6);
 if (lean_obj_tag(x_11) == 0)
 {
 lean_object* x_12; lean_object* x_13; 
@@ -7264,7 +6514,7 @@ lean_inc(x_14);
 x_15 = lean_ctor_get(x_13, 1);
 lean_inc(x_15);
 lean_dec(x_13);
-x_16 = l___private_Init_Lean_Elab_Command_12__addScope(x_2, x_10, x_14, x_5, x_15);
+x_16 = l___private_Init_Lean_Elab_Command_13__addScope(x_2, x_10, x_14, x_5, x_15);
 return x_16;
 }
 else
@@ -7280,7 +6530,7 @@ lean_inc(x_10);
 x_20 = lean_name_mk_string(x_19, x_10);
 x_21 = l_Lean_Name_append___main(x_17, x_20);
 lean_dec(x_17);
-x_22 = l___private_Init_Lean_Elab_Command_12__addScope(x_2, x_10, x_21, x_5, x_18);
+x_22 = l___private_Init_Lean_Elab_Command_13__addScope(x_2, x_10, x_21, x_5, x_18);
 return x_22;
 }
 }
@@ -7341,61 +6591,51 @@ default:
 lean_object* x_31; lean_object* x_32; 
 lean_dec(x_4);
 lean_dec(x_2);
-x_31 = l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__3;
+x_31 = l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__3;
 x_32 = l_Lean_Elab_Command_throwError___rarg(x_1, x_31, x_5, x_6);
 return x_32;
 }
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 uint8_t x_7; lean_object* x_8; 
 x_7 = lean_unbox(x_3);
 lean_dec(x_3);
-x_8 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_1, x_2, x_7, x_4, x_5, x_6);
+x_8 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_1, x_2, x_7, x_4, x_5, x_6);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_1, x_2, x_3, x_4, x_5, x_6);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 uint8_t x_7; lean_object* x_8; 
 x_7 = lean_unbox(x_3);
 lean_dec(x_3);
-x_8 = l___private_Init_Lean_Elab_Command_13__addScopes(x_1, x_2, x_7, x_4, x_5, x_6);
+x_8 = l___private_Init_Lean_Elab_Command_14__addScopes(x_1, x_2, x_7, x_4, x_5, x_6);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_14__addNamespace(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Command_15__addNamespace(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; uint8_t x_6; lean_object* x_7; 
 x_5 = l_Lean_Parser_Command_namespace___elambda__1___closed__1;
 x_6 = 1;
-x_7 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_1, x_5, x_6, x_2, x_3, x_4);
+x_7 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_1, x_5, x_6, x_2, x_3, x_4);
 return x_7;
 }
 }
-lean_object* _init_l_Lean_Elab_Command_elabNamespace___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_namespace___elambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
 lean_object* l_Lean_Elab_Command_elabNamespace(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -7406,8 +6646,12 @@ x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Command_elabNamespace___closed__1;
-x_7 = l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_6 = lean_box(1);
+x_7 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_7, 0, x_6);
+lean_ctor_set(x_7, 1, x_3);
 return x_7;
 }
 else
@@ -7422,8 +6666,12 @@ lean_dec(x_9);
 if (x_11 == 0)
 {
 lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Command_elabNamespace___closed__1;
-x_13 = l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_12 = lean_box(1);
+x_13 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_3);
 return x_13;
 }
 else
@@ -7435,7 +6683,7 @@ x_16 = l_Lean_Syntax_getId(x_15);
 lean_dec(x_15);
 x_17 = l_Lean_Parser_Command_namespace___elambda__1___closed__1;
 x_18 = 1;
-x_19 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_1, x_17, x_18, x_16, x_2, x_3);
+x_19 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_1, x_17, x_18, x_16, x_2, x_3);
 return x_19;
 }
 }
@@ -7478,16 +6726,6 @@ x_5 = l_Lean_Elab_Command_addBuiltinCommandElab(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* _init_l_Lean_Elab_Command_elabSection___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_section___elambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
 lean_object* l_Lean_Elab_Command_elabSection(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -7498,8 +6736,12 @@ x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Command_elabSection___closed__1;
-x_7 = l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_6 = lean_box(1);
+x_7 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_7, 0, x_6);
+lean_ctor_set(x_7, 1, x_3);
 return x_7;
 }
 else
@@ -7514,8 +6756,12 @@ lean_dec(x_9);
 if (x_11 == 0)
 {
 lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Command_elabSection___closed__1;
-x_13 = l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_12 = lean_box(1);
+x_13 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_3);
 return x_13;
 }
 else
@@ -7530,8 +6776,12 @@ if (x_17 == 0)
 {
 lean_object* x_18; lean_object* x_19; 
 lean_dec(x_15);
-x_18 = l_Lean_Elab_Command_elabSection___closed__1;
-x_19 = l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(x_1, x_18, x_2, x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_18 = lean_box(1);
+x_19 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_3);
 return x_19;
 }
 else
@@ -7545,20 +6795,23 @@ if (x_22 == 0)
 {
 lean_object* x_23; uint8_t x_24; 
 lean_dec(x_15);
+lean_dec(x_1);
 x_23 = lean_unsigned_to_nat(0u);
 x_24 = lean_nat_dec_eq(x_21, x_23);
 lean_dec(x_21);
 if (x_24 == 0)
 {
 lean_object* x_25; lean_object* x_26; 
-x_25 = l_Lean_Elab_Command_elabSection___closed__1;
-x_26 = l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(x_1, x_25, x_2, x_3);
+lean_dec(x_2);
+x_25 = lean_box(1);
+x_26 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_26, 0, x_25);
+lean_ctor_set(x_26, 1, x_3);
 return x_26;
 }
 else
 {
 lean_object* x_27; 
-lean_dec(x_1);
 lean_inc(x_2);
 x_27 = l_Lean_Elab_Command_getCurrNamespace(x_2, x_3);
 if (lean_obj_tag(x_27) == 0)
@@ -7571,7 +6824,7 @@ lean_inc(x_29);
 lean_dec(x_27);
 x_30 = l_Lean_Parser_Command_section___elambda__1___closed__1;
 x_31 = l_String_splitAux___main___closed__1;
-x_32 = l___private_Init_Lean_Elab_Command_12__addScope(x_30, x_31, x_28, x_2, x_29);
+x_32 = l___private_Init_Lean_Elab_Command_13__addScope(x_30, x_31, x_28, x_2, x_29);
 return x_32;
 }
 else
@@ -7613,8 +6866,12 @@ if (x_40 == 0)
 {
 lean_object* x_41; lean_object* x_42; 
 lean_dec(x_38);
-x_41 = l_Lean_Elab_Command_elabSection___closed__1;
-x_42 = l_Lean_Elab_Command_throwUnexpectedSyntax___rarg(x_1, x_41, x_2, x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_41 = lean_box(1);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_41);
+lean_ctor_set(x_42, 1, x_3);
 return x_42;
 }
 else
@@ -7624,7 +6881,7 @@ x_43 = l_Lean_Syntax_getId(x_38);
 lean_dec(x_38);
 x_44 = l_Lean_Parser_Command_section___elambda__1___closed__1;
 x_45 = 0;
-x_46 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_1, x_44, x_45, x_43, x_2, x_3);
+x_46 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_1, x_44, x_45, x_43, x_2, x_3);
 return x_46;
 }
 }
@@ -7730,7 +6987,7 @@ return x_14;
 }
 }
 }
-uint8_t l___private_Init_Lean_Elab_Command_15__checkAnonymousScope(lean_object* x_1) {
+uint8_t l___private_Init_Lean_Elab_Command_16__checkAnonymousScope(lean_object* x_1) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -7761,17 +7018,17 @@ return x_8;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_15__checkAnonymousScope___boxed(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_Command_16__checkAnonymousScope___boxed(lean_object* x_1) {
 _start:
 {
 uint8_t x_2; lean_object* x_3; 
-x_2 = l___private_Init_Lean_Elab_Command_15__checkAnonymousScope(x_1);
+x_2 = l___private_Init_Lean_Elab_Command_16__checkAnonymousScope(x_1);
 lean_dec(x_1);
 x_3 = lean_box(x_2);
 return x_3;
 }
 }
-uint8_t l___private_Init_Lean_Elab_Command_16__checkEndHeader___main(lean_object* x_1, lean_object* x_2) {
+uint8_t l___private_Init_Lean_Elab_Command_17__checkEndHeader___main(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 switch (lean_obj_tag(x_1)) {
@@ -7821,30 +7078,30 @@ return x_13;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_16__checkEndHeader___main___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_Elab_Command_17__checkEndHeader___main___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
-x_3 = l___private_Init_Lean_Elab_Command_16__checkEndHeader___main(x_1, x_2);
+x_3 = l___private_Init_Lean_Elab_Command_17__checkEndHeader___main(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 x_4 = lean_box(x_3);
 return x_4;
 }
 }
-uint8_t l___private_Init_Lean_Elab_Command_16__checkEndHeader(lean_object* x_1, lean_object* x_2) {
+uint8_t l___private_Init_Lean_Elab_Command_17__checkEndHeader(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; 
-x_3 = l___private_Init_Lean_Elab_Command_16__checkEndHeader___main(x_1, x_2);
+x_3 = l___private_Init_Lean_Elab_Command_17__checkEndHeader___main(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Command_16__checkEndHeader___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_Elab_Command_17__checkEndHeader___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 uint8_t x_3; lean_object* x_4; 
-x_3 = l___private_Init_Lean_Elab_Command_16__checkEndHeader(x_1, x_2);
+x_3 = l___private_Init_Lean_Elab_Command_17__checkEndHeader(x_1, x_2);
 lean_dec(x_2);
 lean_dec(x_1);
 x_4 = lean_box(x_3);
@@ -7938,495 +7195,491 @@ return x_2;
 lean_object* l_Lean_Elab_Command_elabEnd(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_4 = lean_ctor_get(x_1, 1);
-lean_inc(x_4);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_99; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = l_Lean_Syntax_getOptionalIdent_x3f(x_5);
+lean_dec(x_5);
 lean_inc(x_2);
-x_5 = l_Lean_Elab_Command_getScopes(x_2, x_3);
-x_6 = l_Lean_stxInh;
-x_7 = lean_unsigned_to_nat(1u);
-x_8 = lean_array_get(x_6, x_4, x_7);
-lean_dec(x_4);
-x_9 = l_Lean_Syntax_getOptionalIdent_x3f(x_8);
-lean_dec(x_8);
-if (lean_obj_tag(x_9) == 0)
+x_99 = l_Lean_Elab_Command_getScopes(x_2, x_3);
+if (lean_obj_tag(x_6) == 0)
 {
-if (lean_obj_tag(x_5) == 0)
+if (lean_obj_tag(x_99) == 0)
 {
-lean_object* x_102; lean_object* x_103; 
-x_102 = lean_ctor_get(x_5, 0);
-lean_inc(x_102);
-x_103 = lean_ctor_get(x_5, 1);
+lean_object* x_100; lean_object* x_101; 
+x_100 = lean_ctor_get(x_99, 0);
+lean_inc(x_100);
+x_101 = lean_ctor_get(x_99, 1);
+lean_inc(x_101);
+lean_dec(x_99);
+x_7 = x_4;
+x_8 = x_100;
+x_9 = x_101;
+goto block_98;
+}
+else
+{
+uint8_t x_102; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_102 = !lean_is_exclusive(x_99);
+if (x_102 == 0)
+{
+return x_99;
+}
+else
+{
+lean_object* x_103; lean_object* x_104; lean_object* x_105; 
+x_103 = lean_ctor_get(x_99, 0);
+x_104 = lean_ctor_get(x_99, 1);
+lean_inc(x_104);
 lean_inc(x_103);
-lean_dec(x_5);
-x_10 = x_7;
-x_11 = x_102;
-x_12 = x_103;
-goto block_101;
+lean_dec(x_99);
+x_105 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_105, 0, x_103);
+lean_ctor_set(x_105, 1, x_104);
+return x_105;
+}
+}
 }
 else
 {
-uint8_t x_104; 
-lean_dec(x_2);
-lean_dec(x_1);
-x_104 = !lean_is_exclusive(x_5);
-if (x_104 == 0)
+if (lean_obj_tag(x_99) == 0)
 {
-return x_5;
-}
-else
-{
-lean_object* x_105; lean_object* x_106; lean_object* x_107; 
-x_105 = lean_ctor_get(x_5, 0);
-x_106 = lean_ctor_get(x_5, 1);
+lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; 
+x_106 = lean_ctor_get(x_6, 0);
 lean_inc(x_106);
-lean_inc(x_105);
-lean_dec(x_5);
-x_107 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_107, 0, x_105);
-lean_ctor_set(x_107, 1, x_106);
-return x_107;
-}
-}
-}
-else
-{
-if (lean_obj_tag(x_5) == 0)
-{
-lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-x_108 = lean_ctor_get(x_9, 0);
+x_107 = lean_ctor_get(x_99, 0);
+lean_inc(x_107);
+x_108 = lean_ctor_get(x_99, 1);
 lean_inc(x_108);
-x_109 = lean_ctor_get(x_5, 0);
-lean_inc(x_109);
-x_110 = lean_ctor_get(x_5, 1);
-lean_inc(x_110);
-lean_dec(x_5);
-x_111 = l_Lean_Name_getNumParts___main(x_108);
-lean_dec(x_108);
-x_10 = x_111;
-x_11 = x_109;
-x_12 = x_110;
-goto block_101;
+lean_dec(x_99);
+x_109 = l_Lean_Name_getNumParts___main(x_106);
+lean_dec(x_106);
+x_7 = x_109;
+x_8 = x_107;
+x_9 = x_108;
+goto block_98;
 }
 else
 {
-uint8_t x_112; 
-lean_dec(x_9);
+uint8_t x_110; 
+lean_dec(x_6);
 lean_dec(x_2);
 lean_dec(x_1);
-x_112 = !lean_is_exclusive(x_5);
-if (x_112 == 0)
+x_110 = !lean_is_exclusive(x_99);
+if (x_110 == 0)
 {
-return x_5;
+return x_99;
 }
 else
 {
-lean_object* x_113; lean_object* x_114; lean_object* x_115; 
-x_113 = lean_ctor_get(x_5, 0);
-x_114 = lean_ctor_get(x_5, 1);
-lean_inc(x_114);
-lean_inc(x_113);
-lean_dec(x_5);
-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;
+lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+x_111 = lean_ctor_get(x_99, 0);
+x_112 = lean_ctor_get(x_99, 1);
+lean_inc(x_112);
+lean_inc(x_111);
+lean_dec(x_99);
+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;
 }
 }
 }
-block_101:
+block_98:
 {
-lean_object* x_13; lean_object* x_26; lean_object* x_27; uint8_t x_28; 
-x_26 = lean_unsigned_to_nat(0u);
-x_27 = l_List_lengthAux___main___rarg(x_11, x_26);
-x_28 = lean_nat_dec_lt(x_10, x_27);
-lean_dec(x_27);
-if (x_28 == 0)
+lean_object* x_10; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
+x_23 = lean_unsigned_to_nat(0u);
+x_24 = l_List_lengthAux___main___rarg(x_8, x_23);
+x_25 = lean_nat_dec_lt(x_7, x_24);
+lean_dec(x_24);
+if (x_25 == 0)
 {
-lean_object* x_29; 
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
+lean_object* x_26; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
 lean_inc(x_2);
-x_29 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_12);
-if (lean_obj_tag(x_29) == 0)
+x_26 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_9);
+if (lean_obj_tag(x_26) == 0)
 {
-lean_object* x_30; lean_object* x_31; uint8_t x_32; 
-x_30 = lean_ctor_get(x_29, 0);
-lean_inc(x_30);
-x_31 = lean_ctor_get(x_29, 1);
-lean_inc(x_31);
-lean_dec(x_29);
-x_32 = !lean_is_exclusive(x_30);
-if (x_32 == 0)
+lean_object* x_27; lean_object* x_28; uint8_t x_29; 
+x_27 = lean_ctor_get(x_26, 0);
+lean_inc(x_27);
+x_28 = lean_ctor_get(x_26, 1);
+lean_inc(x_28);
+lean_dec(x_26);
+x_29 = !lean_is_exclusive(x_27);
+if (x_29 == 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_30, 2);
-x_34 = l_List_lengthAux___main___rarg(x_33, x_26);
-x_35 = lean_nat_sub(x_34, x_7);
+lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_30 = lean_ctor_get(x_27, 2);
+x_31 = l_List_lengthAux___main___rarg(x_30, x_23);
+x_32 = lean_nat_sub(x_31, x_4);
+lean_dec(x_31);
+x_33 = l_List_drop___main___rarg(x_32, x_30);
+lean_dec(x_30);
+lean_ctor_set(x_27, 2, x_33);
+lean_inc(x_2);
+x_34 = l___private_Init_Lean_Elab_Command_3__setState(x_27, x_2, x_28);
+if (lean_obj_tag(x_34) == 0)
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; uint8_t x_38; 
+x_35 = lean_ctor_get(x_34, 1);
+lean_inc(x_35);
 lean_dec(x_34);
-x_36 = l_List_drop___main___rarg(x_35, x_33);
-lean_dec(x_33);
-lean_ctor_set(x_30, 2, x_36);
-lean_inc(x_2);
-x_37 = l___private_Init_Lean_Elab_Command_3__setState(x_30, x_2, x_31);
-if (lean_obj_tag(x_37) == 0)
-{
-lean_object* x_38; lean_object* x_39; lean_object* x_40; uint8_t x_41; 
-x_38 = lean_ctor_get(x_37, 1);
-lean_inc(x_38);
-lean_dec(x_37);
-x_39 = l_Lean_Elab_Command_elabEnd___closed__9;
-x_40 = l_Lean_Elab_Command_throwError___rarg(x_1, x_39, x_2, x_38);
-x_41 = !lean_is_exclusive(x_40);
-if (x_41 == 0)
-{
-return x_40;
-}
-else
-{
-lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_42 = lean_ctor_get(x_40, 0);
-x_43 = lean_ctor_get(x_40, 1);
-lean_inc(x_43);
-lean_inc(x_42);
-lean_dec(x_40);
-x_44 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_44, 0, x_42);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
-}
-}
-else
-{
-uint8_t x_45; 
-lean_dec(x_2);
-lean_dec(x_1);
-x_45 = !lean_is_exclusive(x_37);
-if (x_45 == 0)
+x_36 = l_Lean_Elab_Command_elabEnd___closed__9;
+x_37 = l_Lean_Elab_Command_throwError___rarg(x_1, x_36, x_2, x_35);
+x_38 = !lean_is_exclusive(x_37);
+if (x_38 == 0)
 {
 return x_37;
 }
 else
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_46 = lean_ctor_get(x_37, 0);
-x_47 = lean_ctor_get(x_37, 1);
-lean_inc(x_47);
-lean_inc(x_46);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_37, 0);
+x_40 = lean_ctor_get(x_37, 1);
+lean_inc(x_40);
+lean_inc(x_39);
 lean_dec(x_37);
-x_48 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-return x_48;
-}
+x_41 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_41, 0, x_39);
+lean_ctor_set(x_41, 1, x_40);
+return x_41;
 }
 }
 else
 {
-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; 
-x_49 = lean_ctor_get(x_30, 0);
-x_50 = lean_ctor_get(x_30, 1);
-x_51 = lean_ctor_get(x_30, 2);
-x_52 = lean_ctor_get(x_30, 3);
-lean_inc(x_52);
-lean_inc(x_51);
-lean_inc(x_50);
-lean_inc(x_49);
-lean_dec(x_30);
-x_53 = l_List_lengthAux___main___rarg(x_51, x_26);
-x_54 = lean_nat_sub(x_53, x_7);
-lean_dec(x_53);
-x_55 = l_List_drop___main___rarg(x_54, x_51);
-lean_dec(x_51);
-x_56 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_56, 0, x_49);
-lean_ctor_set(x_56, 1, x_50);
-lean_ctor_set(x_56, 2, x_55);
-lean_ctor_set(x_56, 3, x_52);
-lean_inc(x_2);
-x_57 = l___private_Init_Lean_Elab_Command_3__setState(x_56, x_2, x_31);
-if (lean_obj_tag(x_57) == 0)
-{
-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; 
-x_58 = lean_ctor_get(x_57, 1);
-lean_inc(x_58);
-lean_dec(x_57);
-x_59 = l_Lean_Elab_Command_elabEnd___closed__9;
-x_60 = l_Lean_Elab_Command_throwError___rarg(x_1, x_59, x_2, x_58);
-x_61 = lean_ctor_get(x_60, 0);
-lean_inc(x_61);
-x_62 = lean_ctor_get(x_60, 1);
-lean_inc(x_62);
-if (lean_is_exclusive(x_60)) {
- lean_ctor_release(x_60, 0);
- lean_ctor_release(x_60, 1);
- x_63 = x_60;
-} else {
- lean_dec_ref(x_60);
- x_63 = lean_box(0);
-}
-if (lean_is_scalar(x_63)) {
- x_64 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_64 = x_63;
-}
-lean_ctor_set(x_64, 0, x_61);
-lean_ctor_set(x_64, 1, x_62);
-return x_64;
-}
-else
-{
-lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+uint8_t x_42; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_65 = lean_ctor_get(x_57, 0);
-lean_inc(x_65);
-x_66 = lean_ctor_get(x_57, 1);
-lean_inc(x_66);
+x_42 = !lean_is_exclusive(x_34);
+if (x_42 == 0)
+{
+return x_34;
+}
+else
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_43 = lean_ctor_get(x_34, 0);
+x_44 = lean_ctor_get(x_34, 1);
+lean_inc(x_44);
+lean_inc(x_43);
+lean_dec(x_34);
+x_45 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_45, 0, x_43);
+lean_ctor_set(x_45, 1, x_44);
+return x_45;
+}
+}
+}
+else
+{
+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; 
+x_46 = lean_ctor_get(x_27, 0);
+x_47 = lean_ctor_get(x_27, 1);
+x_48 = lean_ctor_get(x_27, 2);
+x_49 = lean_ctor_get(x_27, 3);
+lean_inc(x_49);
+lean_inc(x_48);
+lean_inc(x_47);
+lean_inc(x_46);
+lean_dec(x_27);
+x_50 = l_List_lengthAux___main___rarg(x_48, x_23);
+x_51 = lean_nat_sub(x_50, x_4);
+lean_dec(x_50);
+x_52 = l_List_drop___main___rarg(x_51, x_48);
+lean_dec(x_48);
+x_53 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_53, 0, x_46);
+lean_ctor_set(x_53, 1, x_47);
+lean_ctor_set(x_53, 2, x_52);
+lean_ctor_set(x_53, 3, x_49);
+lean_inc(x_2);
+x_54 = l___private_Init_Lean_Elab_Command_3__setState(x_53, x_2, x_28);
+if (lean_obj_tag(x_54) == 0)
+{
+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; 
+x_55 = lean_ctor_get(x_54, 1);
+lean_inc(x_55);
+lean_dec(x_54);
+x_56 = l_Lean_Elab_Command_elabEnd___closed__9;
+x_57 = l_Lean_Elab_Command_throwError___rarg(x_1, x_56, x_2, x_55);
+x_58 = lean_ctor_get(x_57, 0);
+lean_inc(x_58);
+x_59 = lean_ctor_get(x_57, 1);
+lean_inc(x_59);
 if (lean_is_exclusive(x_57)) {
  lean_ctor_release(x_57, 0);
  lean_ctor_release(x_57, 1);
- x_67 = x_57;
+ x_60 = x_57;
 } else {
  lean_dec_ref(x_57);
- x_67 = lean_box(0);
+ x_60 = lean_box(0);
 }
-if (lean_is_scalar(x_67)) {
- x_68 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_60)) {
+ x_61 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_68 = x_67;
-}
-lean_ctor_set(x_68, 0, x_65);
-lean_ctor_set(x_68, 1, x_66);
-return x_68;
-}
+ x_61 = x_60;
 }
+lean_ctor_set(x_61, 0, x_58);
+lean_ctor_set(x_61, 1, x_59);
+return x_61;
 }
 else
 {
-uint8_t x_69; 
+lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_69 = !lean_is_exclusive(x_29);
-if (x_69 == 0)
-{
-return x_29;
+x_62 = lean_ctor_get(x_54, 0);
+lean_inc(x_62);
+x_63 = lean_ctor_get(x_54, 1);
+lean_inc(x_63);
+if (lean_is_exclusive(x_54)) {
+ lean_ctor_release(x_54, 0);
+ lean_ctor_release(x_54, 1);
+ x_64 = x_54;
+} else {
+ lean_dec_ref(x_54);
+ x_64 = lean_box(0);
+}
+if (lean_is_scalar(x_64)) {
+ x_65 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_65 = x_64;
+}
+lean_ctor_set(x_65, 0, x_62);
+lean_ctor_set(x_65, 1, x_63);
+return x_65;
+}
+}
 }
 else
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_70 = lean_ctor_get(x_29, 0);
-x_71 = lean_ctor_get(x_29, 1);
+uint8_t x_66; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_66 = !lean_is_exclusive(x_26);
+if (x_66 == 0)
+{
+return x_26;
+}
+else
+{
+lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+x_67 = lean_ctor_get(x_26, 0);
+x_68 = lean_ctor_get(x_26, 1);
+lean_inc(x_68);
+lean_inc(x_67);
+lean_dec(x_26);
+x_69 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_69, 0, x_67);
+lean_ctor_set(x_69, 1, x_68);
+return x_69;
+}
+}
+}
+else
+{
+lean_object* x_70; 
+lean_inc(x_2);
+x_70 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_9);
+if (lean_obj_tag(x_70) == 0)
+{
+lean_object* x_71; lean_object* x_72; uint8_t x_73; 
+x_71 = lean_ctor_get(x_70, 0);
 lean_inc(x_71);
-lean_inc(x_70);
-lean_dec(x_29);
-x_72 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_72, 0, x_70);
-lean_ctor_set(x_72, 1, x_71);
-return x_72;
-}
-}
+x_72 = lean_ctor_get(x_70, 1);
+lean_inc(x_72);
+lean_dec(x_70);
+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, 2);
+x_75 = l_List_drop___main___rarg(x_7, x_74);
+lean_dec(x_74);
+lean_ctor_set(x_71, 2, x_75);
+lean_inc(x_2);
+x_76 = l___private_Init_Lean_Elab_Command_3__setState(x_71, x_2, x_72);
+if (lean_obj_tag(x_76) == 0)
+{
+lean_object* x_77; 
+x_77 = lean_ctor_get(x_76, 1);
+lean_inc(x_77);
+lean_dec(x_76);
+x_10 = x_77;
+goto block_22;
 }
 else
 {
-lean_object* x_73; 
-lean_inc(x_2);
-x_73 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_12);
-if (lean_obj_tag(x_73) == 0)
-{
-lean_object* x_74; lean_object* x_75; uint8_t x_76; 
-x_74 = lean_ctor_get(x_73, 0);
-lean_inc(x_74);
-x_75 = lean_ctor_get(x_73, 1);
-lean_inc(x_75);
-lean_dec(x_73);
-x_76 = !lean_is_exclusive(x_74);
-if (x_76 == 0)
-{
-lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_77 = lean_ctor_get(x_74, 2);
-x_78 = l_List_drop___main___rarg(x_10, x_77);
-lean_dec(x_77);
-lean_ctor_set(x_74, 2, x_78);
-lean_inc(x_2);
-x_79 = l___private_Init_Lean_Elab_Command_3__setState(x_74, x_2, x_75);
-if (lean_obj_tag(x_79) == 0)
-{
-lean_object* x_80; 
-x_80 = lean_ctor_get(x_79, 1);
-lean_inc(x_80);
-lean_dec(x_79);
-x_13 = x_80;
-goto block_25;
-}
-else
-{
-uint8_t x_81; 
-lean_dec(x_11);
-lean_dec(x_9);
+uint8_t x_78; 
+lean_dec(x_8);
+lean_dec(x_6);
 lean_dec(x_2);
 lean_dec(x_1);
-x_81 = !lean_is_exclusive(x_79);
-if (x_81 == 0)
+x_78 = !lean_is_exclusive(x_76);
+if (x_78 == 0)
 {
-return x_79;
+return x_76;
 }
 else
 {
-lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_82 = lean_ctor_get(x_79, 0);
-x_83 = lean_ctor_get(x_79, 1);
+lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_79 = lean_ctor_get(x_76, 0);
+x_80 = lean_ctor_get(x_76, 1);
+lean_inc(x_80);
+lean_inc(x_79);
+lean_dec(x_76);
+x_81 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_81, 0, x_79);
+lean_ctor_set(x_81, 1, x_80);
+return x_81;
+}
+}
+}
+else
+{
+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_82 = lean_ctor_get(x_71, 0);
+x_83 = lean_ctor_get(x_71, 1);
+x_84 = lean_ctor_get(x_71, 2);
+x_85 = lean_ctor_get(x_71, 3);
+lean_inc(x_85);
+lean_inc(x_84);
 lean_inc(x_83);
 lean_inc(x_82);
-lean_dec(x_79);
-x_84 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_84, 0, x_82);
-lean_ctor_set(x_84, 1, x_83);
-return x_84;
-}
-}
-}
-else
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_85 = lean_ctor_get(x_74, 0);
-x_86 = lean_ctor_get(x_74, 1);
-x_87 = lean_ctor_get(x_74, 2);
-x_88 = lean_ctor_get(x_74, 3);
-lean_inc(x_88);
-lean_inc(x_87);
-lean_inc(x_86);
-lean_inc(x_85);
-lean_dec(x_74);
-x_89 = l_List_drop___main___rarg(x_10, x_87);
-lean_dec(x_87);
-x_90 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_90, 0, x_85);
-lean_ctor_set(x_90, 1, x_86);
-lean_ctor_set(x_90, 2, x_89);
-lean_ctor_set(x_90, 3, x_88);
+lean_dec(x_71);
+x_86 = l_List_drop___main___rarg(x_7, x_84);
+lean_dec(x_84);
+x_87 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_87, 0, x_82);
+lean_ctor_set(x_87, 1, x_83);
+lean_ctor_set(x_87, 2, x_86);
+lean_ctor_set(x_87, 3, x_85);
 lean_inc(x_2);
-x_91 = l___private_Init_Lean_Elab_Command_3__setState(x_90, x_2, x_75);
-if (lean_obj_tag(x_91) == 0)
+x_88 = l___private_Init_Lean_Elab_Command_3__setState(x_87, x_2, x_72);
+if (lean_obj_tag(x_88) == 0)
 {
-lean_object* x_92; 
-x_92 = lean_ctor_get(x_91, 1);
-lean_inc(x_92);
-lean_dec(x_91);
-x_13 = x_92;
-goto block_25;
+lean_object* x_89; 
+x_89 = lean_ctor_get(x_88, 1);
+lean_inc(x_89);
+lean_dec(x_88);
+x_10 = x_89;
+goto block_22;
 }
 else
 {
-lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-lean_dec(x_11);
-lean_dec(x_9);
+lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+lean_dec(x_8);
+lean_dec(x_6);
 lean_dec(x_2);
 lean_dec(x_1);
-x_93 = lean_ctor_get(x_91, 0);
-lean_inc(x_93);
-x_94 = lean_ctor_get(x_91, 1);
-lean_inc(x_94);
-if (lean_is_exclusive(x_91)) {
- lean_ctor_release(x_91, 0);
- lean_ctor_release(x_91, 1);
- x_95 = x_91;
+x_90 = lean_ctor_get(x_88, 0);
+lean_inc(x_90);
+x_91 = lean_ctor_get(x_88, 1);
+lean_inc(x_91);
+if (lean_is_exclusive(x_88)) {
+ lean_ctor_release(x_88, 0);
+ lean_ctor_release(x_88, 1);
+ x_92 = x_88;
 } else {
- lean_dec_ref(x_91);
- x_95 = lean_box(0);
+ lean_dec_ref(x_88);
+ x_92 = lean_box(0);
 }
-if (lean_is_scalar(x_95)) {
- x_96 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_92)) {
+ x_93 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_96 = x_95;
+ x_93 = x_92;
 }
-lean_ctor_set(x_96, 0, x_93);
-lean_ctor_set(x_96, 1, x_94);
-return x_96;
+lean_ctor_set(x_93, 0, x_90);
+lean_ctor_set(x_93, 1, x_91);
+return x_93;
 }
 }
 }
 else
 {
-uint8_t x_97; 
-lean_dec(x_11);
-lean_dec(x_10);
-lean_dec(x_9);
+uint8_t x_94; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
 lean_dec(x_2);
 lean_dec(x_1);
-x_97 = !lean_is_exclusive(x_73);
-if (x_97 == 0)
+x_94 = !lean_is_exclusive(x_70);
+if (x_94 == 0)
 {
-return x_73;
+return x_70;
 }
 else
 {
-lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_98 = lean_ctor_get(x_73, 0);
-x_99 = lean_ctor_get(x_73, 1);
-lean_inc(x_99);
-lean_inc(x_98);
-lean_dec(x_73);
-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_95; lean_object* x_96; lean_object* x_97; 
+x_95 = lean_ctor_get(x_70, 0);
+x_96 = lean_ctor_get(x_70, 1);
+lean_inc(x_96);
+lean_inc(x_95);
+lean_dec(x_70);
+x_97 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_97, 0, x_95);
+lean_ctor_set(x_97, 1, x_96);
+return x_97;
 }
 }
 }
-block_25:
+block_22:
 {
-if (lean_obj_tag(x_9) == 0)
+if (lean_obj_tag(x_6) == 0)
 {
-uint8_t x_14; 
-x_14 = l___private_Init_Lean_Elab_Command_15__checkAnonymousScope(x_11);
-lean_dec(x_11);
-if (x_14 == 0)
+uint8_t x_11; 
+x_11 = l___private_Init_Lean_Elab_Command_16__checkAnonymousScope(x_8);
+lean_dec(x_8);
+if (x_11 == 0)
 {
-lean_object* x_15; lean_object* x_16; 
-x_15 = l_Lean_Elab_Command_elabEnd___closed__3;
-x_16 = l_Lean_Elab_Command_throwError___rarg(x_1, x_15, x_2, x_13);
-return x_16;
+lean_object* x_12; lean_object* x_13; 
+x_12 = l_Lean_Elab_Command_elabEnd___closed__3;
+x_13 = l_Lean_Elab_Command_throwError___rarg(x_1, x_12, x_2, x_10);
+return x_13;
 }
 else
 {
-lean_object* x_17; lean_object* x_18; 
+lean_object* x_14; lean_object* x_15; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_17 = lean_box(0);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_13);
-return x_18;
+x_14 = lean_box(0);
+x_15 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_15, 0, x_14);
+lean_ctor_set(x_15, 1, x_10);
+return x_15;
 }
 }
 else
 {
-lean_object* x_19; uint8_t x_20; 
-x_19 = lean_ctor_get(x_9, 0);
-lean_inc(x_19);
-lean_dec(x_9);
-x_20 = l___private_Init_Lean_Elab_Command_16__checkEndHeader___main(x_19, x_11);
-lean_dec(x_11);
-lean_dec(x_19);
-if (x_20 == 0)
+lean_object* x_16; uint8_t x_17; 
+x_16 = lean_ctor_get(x_6, 0);
+lean_inc(x_16);
+lean_dec(x_6);
+x_17 = l___private_Init_Lean_Elab_Command_17__checkEndHeader___main(x_16, x_8);
+lean_dec(x_8);
+lean_dec(x_16);
+if (x_17 == 0)
 {
-lean_object* x_21; lean_object* x_22; 
-x_21 = l_Lean_Elab_Command_elabEnd___closed__6;
-x_22 = l_Lean_Elab_Command_throwError___rarg(x_1, x_21, x_2, x_13);
-return x_22;
+lean_object* x_18; lean_object* x_19; 
+x_18 = l_Lean_Elab_Command_elabEnd___closed__6;
+x_19 = l_Lean_Elab_Command_throwError___rarg(x_1, x_18, x_2, x_10);
+return x_19;
 }
 else
 {
-lean_object* x_23; lean_object* x_24; 
+lean_object* x_20; lean_object* x_21; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_23 = lean_box(0);
-x_24 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_24, 0, x_23);
-lean_ctor_set(x_24, 1, x_13);
-return x_24;
+x_20 = lean_box(0);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_10);
+return x_21;
 }
 }
 }
@@ -8478,7 +7731,7 @@ x_6 = l_Lean_Parser_Command_namespace___elambda__1___closed__1;
 x_7 = 1;
 lean_inc(x_4);
 lean_inc(x_2);
-x_8 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_1, x_6, x_7, x_2, x_4, x_5);
+x_8 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_1, x_6, x_7, x_2, x_4, x_5);
 if (lean_obj_tag(x_8) == 0)
 {
 lean_object* x_9; lean_object* x_10; 
@@ -9892,13 +9145,11 @@ return x_14;
 lean_object* l_Lean_Elab_Command_elabUniverse(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
-x_4 = lean_ctor_get(x_1, 1);
-x_5 = l_Lean_stxInh;
-x_6 = lean_unsigned_to_nat(1u);
-x_7 = lean_array_get(x_5, x_4, x_6);
-x_8 = l_Lean_Elab_Command_addUnivLevel(x_7, x_2, x_3);
-return x_8;
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = l_Lean_Elab_Command_addUnivLevel(x_5, x_2, x_3);
+return x_6;
 }
 }
 lean_object* l_Lean_Elab_Command_elabUniverse___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
@@ -10016,18 +9267,16 @@ return x_19;
 lean_object* l_Lean_Elab_Command_elabUniverses(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_4 = lean_ctor_get(x_1, 1);
-x_5 = l_Lean_stxInh;
-x_6 = lean_unsigned_to_nat(1u);
-x_7 = lean_array_get(x_5, x_4, x_6);
-x_8 = l_Lean_Syntax_getArgs(x_7);
-lean_dec(x_7);
-x_9 = lean_unsigned_to_nat(0u);
-x_10 = lean_box(0);
-x_11 = l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabUniverses___spec__1(x_6, x_8, x_9, x_10, x_2, x_3);
-lean_dec(x_8);
-return x_11;
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = l_Lean_Syntax_getArgs(x_5);
+lean_dec(x_5);
+x_7 = lean_unsigned_to_nat(0u);
+x_8 = lean_box(0);
+x_9 = l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabUniverses___spec__1(x_4, x_6, x_7, x_8, x_2, x_3);
+lean_dec(x_6);
+return x_9;
 }
 }
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Elab_Command_elabUniverses___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
@@ -10532,7 +9781,7 @@ x_9 = l_Lean_Elab_Command_logUnknownDecl___closed__2;
 x_10 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_10, 0, x_9);
 lean_ctor_set(x_10, 1, x_8);
-x_11 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_11 = l_Lean_Elab_Term_mkConst___closed__4;
 x_12 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
@@ -10571,92 +9820,6 @@ lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l_Lean_Elab_throwErrorUsingCmdPos___at_Lean_Elab_Command_resolveNamespace___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; lean_object* x_5; uint8_t x_6; lean_object* x_7; 
-x_4 = lean_ctor_get(x_2, 3);
-lean_inc(x_4);
-x_5 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_5, 0, x_4);
-x_6 = 2;
-x_7 = l_Lean_Elab_mkMessageAt___at_Lean_Elab_Command_throwError___spec__3(x_1, x_6, x_5, x_2, x_3);
-lean_dec(x_5);
-if (lean_obj_tag(x_7) == 0)
-{
-uint8_t x_8; 
-x_8 = !lean_is_exclusive(x_7);
-if (x_8 == 0)
-{
-lean_ctor_set_tag(x_7, 1);
-return x_7;
-}
-else
-{
-lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_9 = lean_ctor_get(x_7, 0);
-x_10 = lean_ctor_get(x_7, 1);
-lean_inc(x_10);
-lean_inc(x_9);
-lean_dec(x_7);
-x_11 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_11, 0, x_9);
-lean_ctor_set(x_11, 1, x_10);
-return x_11;
-}
-}
-else
-{
-uint8_t x_12; 
-x_12 = !lean_is_exclusive(x_7);
-if (x_12 == 0)
-{
-return x_7;
-}
-else
-{
-lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_13 = lean_ctor_get(x_7, 0);
-x_14 = lean_ctor_get(x_7, 1);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_dec(x_7);
-x_15 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_15, 0, x_13);
-lean_ctor_set(x_15, 1, x_14);
-return x_15;
-}
-}
-}
-}
-lean_object* _init_l_Lean_Elab_Command_resolveNamespace___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("unknown namespace '");
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Command_resolveNamespace___closed__2() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Command_resolveNamespace___closed__1;
-x_2 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Command_resolveNamespace___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Command_resolveNamespace___closed__2;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
 lean_object* l_Lean_Elab_Command_resolveNamespace(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -10681,7 +9844,6 @@ lean_inc(x_8);
 x_9 = lean_ctor_get(x_7, 1);
 lean_inc(x_9);
 lean_dec(x_7);
-lean_inc(x_2);
 x_10 = l_Lean_Elab_Command_getOpenDecls(x_2, x_9);
 if (lean_obj_tag(x_10) == 0)
 {
@@ -10689,170 +9851,138 @@ uint8_t x_11;
 x_11 = !lean_is_exclusive(x_10);
 if (x_11 == 0)
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+lean_object* x_12; lean_object* x_13; 
 x_12 = lean_ctor_get(x_10, 0);
-x_13 = lean_ctor_get(x_10, 1);
-lean_inc(x_1);
-x_14 = l_Lean_Elab_resolveNamespace(x_5, x_8, x_12, x_1);
+x_13 = l_Lean_Elab_resolveNamespace(x_5, x_8, x_12, x_1);
 lean_dec(x_12);
 lean_dec(x_8);
 lean_dec(x_5);
-if (lean_obj_tag(x_14) == 0)
+if (lean_obj_tag(x_13) == 0)
 {
-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_free_object(x_10);
-x_15 = l_Lean_Name_toString___closed__1;
-x_16 = l_Lean_Name_toStringWithSep___main(x_15, x_1);
-x_17 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_17, 0, x_16);
-x_18 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_18, 0, x_17);
-x_19 = l_Lean_Elab_Command_resolveNamespace___closed__3;
-x_20 = lean_alloc_ctor(8, 2, 0);
+lean_object* x_14; 
+x_14 = lean_box(1);
+lean_ctor_set_tag(x_10, 1);
+lean_ctor_set(x_10, 0, x_14);
+return x_10;
+}
+else
+{
+lean_object* x_15; 
+x_15 = lean_ctor_get(x_13, 0);
+lean_inc(x_15);
+lean_dec(x_13);
+lean_ctor_set(x_10, 0, x_15);
+return x_10;
+}
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = lean_ctor_get(x_10, 0);
+x_17 = lean_ctor_get(x_10, 1);
+lean_inc(x_17);
+lean_inc(x_16);
+lean_dec(x_10);
+x_18 = l_Lean_Elab_resolveNamespace(x_5, x_8, x_16, x_1);
+lean_dec(x_16);
+lean_dec(x_8);
+lean_dec(x_5);
+if (lean_obj_tag(x_18) == 0)
+{
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_box(1);
+x_20 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_20, 0, x_19);
-lean_ctor_set(x_20, 1, x_18);
-x_21 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
-x_22 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_22, 0, x_20);
-lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_Elab_throwErrorUsingCmdPos___at_Lean_Elab_Command_resolveNamespace___spec__1(x_22, x_2, x_13);
-return x_23;
+lean_ctor_set(x_20, 1, x_17);
+return x_20;
 }
 else
 {
-lean_object* x_24; 
-lean_dec(x_2);
+lean_object* x_21; lean_object* x_22; 
+x_21 = lean_ctor_get(x_18, 0);
+lean_inc(x_21);
+lean_dec(x_18);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_21);
+lean_ctor_set(x_22, 1, x_17);
+return x_22;
+}
+}
+}
+else
+{
+uint8_t x_23; 
+lean_dec(x_8);
+lean_dec(x_5);
 lean_dec(x_1);
-x_24 = lean_ctor_get(x_14, 0);
-lean_inc(x_24);
-lean_dec(x_14);
-lean_ctor_set(x_10, 0, x_24);
+x_23 = !lean_is_exclusive(x_10);
+if (x_23 == 0)
+{
 return x_10;
 }
-}
 else
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_10, 0);
-x_26 = lean_ctor_get(x_10, 1);
-lean_inc(x_26);
+lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_10, 0);
+x_25 = lean_ctor_get(x_10, 1);
 lean_inc(x_25);
+lean_inc(x_24);
 lean_dec(x_10);
-lean_inc(x_1);
-x_27 = l_Lean_Elab_resolveNamespace(x_5, x_8, x_25, x_1);
-lean_dec(x_25);
-lean_dec(x_8);
-lean_dec(x_5);
-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; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_28 = l_Lean_Name_toString___closed__1;
-x_29 = l_Lean_Name_toStringWithSep___main(x_28, x_1);
-x_30 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_30, 0, x_29);
-x_31 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_31, 0, x_30);
-x_32 = l_Lean_Elab_Command_resolveNamespace___closed__3;
-x_33 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_33, 0, x_32);
-lean_ctor_set(x_33, 1, x_31);
-x_34 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
-x_35 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_35, 0, x_33);
-lean_ctor_set(x_35, 1, x_34);
-x_36 = l_Lean_Elab_throwErrorUsingCmdPos___at_Lean_Elab_Command_resolveNamespace___spec__1(x_35, x_2, x_26);
-return x_36;
-}
-else
-{
-lean_object* x_37; lean_object* x_38; 
-lean_dec(x_2);
-lean_dec(x_1);
-x_37 = lean_ctor_get(x_27, 0);
-lean_inc(x_37);
-lean_dec(x_27);
-x_38 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_38, 0, x_37);
-lean_ctor_set(x_38, 1, x_26);
-return x_38;
+x_26 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_26, 0, x_24);
+lean_ctor_set(x_26, 1, x_25);
+return x_26;
 }
 }
 }
 else
 {
-uint8_t x_39; 
-lean_dec(x_8);
+uint8_t x_27; 
 lean_dec(x_5);
 lean_dec(x_2);
 lean_dec(x_1);
-x_39 = !lean_is_exclusive(x_10);
-if (x_39 == 0)
-{
-return x_10;
-}
-else
-{
-lean_object* x_40; lean_object* x_41; lean_object* x_42; 
-x_40 = lean_ctor_get(x_10, 0);
-x_41 = lean_ctor_get(x_10, 1);
-lean_inc(x_41);
-lean_inc(x_40);
-lean_dec(x_10);
-x_42 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_42, 0, x_40);
-lean_ctor_set(x_42, 1, x_41);
-return x_42;
-}
-}
-}
-else
-{
-uint8_t x_43; 
-lean_dec(x_5);
-lean_dec(x_2);
-lean_dec(x_1);
-x_43 = !lean_is_exclusive(x_7);
-if (x_43 == 0)
+x_27 = !lean_is_exclusive(x_7);
+if (x_27 == 0)
 {
 return x_7;
 }
 else
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_44 = lean_ctor_get(x_7, 0);
-x_45 = lean_ctor_get(x_7, 1);
-lean_inc(x_45);
-lean_inc(x_44);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_7, 0);
+x_29 = lean_ctor_get(x_7, 1);
+lean_inc(x_29);
+lean_inc(x_28);
 lean_dec(x_7);
-x_46 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_46, 0, x_44);
-lean_ctor_set(x_46, 1, x_45);
-return x_46;
+x_30 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_30, 0, x_28);
+lean_ctor_set(x_30, 1, x_29);
+return x_30;
 }
 }
 }
 else
 {
-uint8_t x_47; 
+uint8_t x_31; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_47 = !lean_is_exclusive(x_4);
-if (x_47 == 0)
+x_31 = !lean_is_exclusive(x_4);
+if (x_31 == 0)
 {
 return x_4;
 }
 else
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_48 = lean_ctor_get(x_4, 0);
-x_49 = lean_ctor_get(x_4, 1);
-lean_inc(x_49);
-lean_inc(x_48);
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_4, 0);
+x_33 = lean_ctor_get(x_4, 1);
+lean_inc(x_33);
+lean_inc(x_32);
 lean_dec(x_4);
-x_50 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_50, 0, x_48);
-lean_ctor_set(x_50, 1, x_49);
-return x_50;
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+return x_34;
 }
 }
 }
@@ -11007,363 +10137,354 @@ return x_2;
 lean_object* l_Lean_Elab_Command_elabExport(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_4 = lean_ctor_get(x_1, 1);
-lean_inc(x_4);
-x_5 = l_Lean_stxInh;
-x_6 = lean_unsigned_to_nat(1u);
-x_7 = lean_array_get(x_5, x_4, x_6);
-x_8 = l_Lean_Syntax_getId(x_7);
-lean_dec(x_7);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getIdAt(x_1, x_4);
 lean_inc(x_2);
-x_9 = l_Lean_Elab_Command_resolveNamespace(x_8, x_2, x_3);
+x_6 = l_Lean_Elab_Command_resolveNamespace(x_5, x_2, x_3);
+if (lean_obj_tag(x_6) == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
+x_8 = lean_ctor_get(x_6, 1);
+lean_inc(x_8);
+lean_dec(x_6);
+lean_inc(x_2);
+x_9 = l_Lean_Elab_Command_getCurrNamespace(x_2, x_8);
 if (lean_obj_tag(x_9) == 0)
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_69; 
 x_10 = lean_ctor_get(x_9, 0);
 lean_inc(x_10);
 x_11 = lean_ctor_get(x_9, 1);
 lean_inc(x_11);
 lean_dec(x_9);
-lean_inc(x_2);
-x_12 = l_Lean_Elab_Command_getCurrNamespace(x_2, x_11);
-if (lean_obj_tag(x_12) == 0)
+x_69 = lean_name_eq(x_7, x_10);
+if (x_69 == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_72; 
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-x_14 = lean_ctor_get(x_12, 1);
-lean_inc(x_14);
-lean_dec(x_12);
-x_72 = lean_name_eq(x_10, x_13);
+x_12 = x_11;
+goto block_68;
+}
+else
+{
+lean_object* x_70; lean_object* x_71; uint8_t x_72; 
+lean_dec(x_10);
+lean_dec(x_7);
+x_70 = l_Lean_Elab_Command_elabExport___closed__3;
+x_71 = l_Lean_Elab_Command_throwError___rarg(x_1, x_70, x_2, x_11);
+x_72 = !lean_is_exclusive(x_71);
 if (x_72 == 0)
 {
-lean_dec(x_1);
-x_15 = x_14;
-goto block_71;
+return x_71;
 }
 else
 {
-lean_object* x_73; lean_object* x_74; uint8_t x_75; 
-lean_dec(x_13);
-lean_dec(x_10);
-lean_dec(x_4);
-x_73 = l_Lean_Elab_Command_elabExport___closed__3;
-x_74 = l_Lean_Elab_Command_throwError___rarg(x_1, x_73, x_2, x_14);
-x_75 = !lean_is_exclusive(x_74);
-if (x_75 == 0)
-{
-return x_74;
-}
-else
-{
-lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_76 = lean_ctor_get(x_74, 0);
-x_77 = lean_ctor_get(x_74, 1);
-lean_inc(x_77);
-lean_inc(x_76);
-lean_dec(x_74);
-x_78 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_78, 0, x_76);
-lean_ctor_set(x_78, 1, x_77);
-return x_78;
+lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_73 = lean_ctor_get(x_71, 0);
+x_74 = lean_ctor_get(x_71, 1);
+lean_inc(x_74);
+lean_inc(x_73);
+lean_dec(x_71);
+x_75 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_75, 0, x_73);
+lean_ctor_set(x_75, 1, x_74);
+return x_75;
 }
 }
-block_71:
+block_68:
 {
-lean_object* x_16; 
+lean_object* x_13; 
 lean_inc(x_2);
-x_16 = l_Lean_Elab_Command_getEnv(x_2, x_15);
-if (lean_obj_tag(x_16) == 0)
+x_13 = l_Lean_Elab_Command_getEnv(x_2, x_12);
+if (lean_obj_tag(x_13) == 0)
 {
-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; 
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-x_18 = lean_ctor_get(x_16, 1);
-lean_inc(x_18);
-lean_dec(x_16);
+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; 
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_13, 1);
+lean_inc(x_15);
+lean_dec(x_13);
+x_16 = lean_unsigned_to_nat(3u);
+x_17 = l_Lean_Syntax_getArg(x_1, x_16);
+x_18 = l_Lean_Syntax_getArgs(x_17);
+lean_dec(x_17);
 x_19 = lean_box(0);
-x_20 = lean_unsigned_to_nat(3u);
-x_21 = lean_array_get(x_5, x_4, x_20);
-x_22 = l_Lean_Syntax_getArgs(x_21);
-lean_dec(x_21);
-x_23 = lean_unsigned_to_nat(0u);
+x_20 = lean_unsigned_to_nat(0u);
 lean_inc(x_2);
-x_24 = l_Array_iterateMAux___main___at_Lean_Elab_Command_elabExport___spec__1(x_4, x_10, x_13, x_17, x_22, x_23, x_19, x_2, x_18);
-lean_dec(x_22);
-lean_dec(x_13);
+x_21 = l_Array_iterateMAux___main___at_Lean_Elab_Command_elabExport___spec__1(x_1, x_7, x_10, x_14, x_18, x_20, x_19, x_2, x_15);
+lean_dec(x_18);
 lean_dec(x_10);
-lean_dec(x_4);
+lean_dec(x_7);
+lean_dec(x_1);
+if (lean_obj_tag(x_21) == 0)
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = lean_ctor_get(x_21, 0);
+lean_inc(x_22);
+x_23 = lean_ctor_get(x_21, 1);
+lean_inc(x_23);
+lean_dec(x_21);
+lean_inc(x_2);
+x_24 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_23);
 if (lean_obj_tag(x_24) == 0)
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+lean_object* x_25; lean_object* x_26; uint8_t x_27; 
 x_25 = lean_ctor_get(x_24, 0);
 lean_inc(x_25);
 x_26 = lean_ctor_get(x_24, 1);
 lean_inc(x_26);
 lean_dec(x_24);
-lean_inc(x_2);
-x_27 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_26);
-if (lean_obj_tag(x_27) == 0)
+x_27 = !lean_is_exclusive(x_25);
+if (x_27 == 0)
 {
-lean_object* x_28; lean_object* x_29; uint8_t x_30; 
-x_28 = lean_ctor_get(x_27, 0);
-lean_inc(x_28);
-x_29 = lean_ctor_get(x_27, 1);
-lean_inc(x_29);
-lean_dec(x_27);
-x_30 = !lean_is_exclusive(x_28);
-if (x_30 == 0)
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_25, 0);
+x_29 = l_List_foldl___main___at_Lean_Elab_Command_elabExport___spec__2(x_28, x_22);
+lean_ctor_set(x_25, 0, x_29);
+x_30 = l___private_Init_Lean_Elab_Command_3__setState(x_25, x_2, x_26);
+if (lean_obj_tag(x_30) == 0)
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_31 = lean_ctor_get(x_28, 0);
-x_32 = l_List_foldl___main___at_Lean_Elab_Command_elabExport___spec__2(x_31, x_25);
-lean_ctor_set(x_28, 0, x_32);
-x_33 = l___private_Init_Lean_Elab_Command_3__setState(x_28, x_2, x_29);
-if (lean_obj_tag(x_33) == 0)
+uint8_t x_31; 
+x_31 = !lean_is_exclusive(x_30);
+if (x_31 == 0)
 {
-uint8_t x_34; 
-x_34 = !lean_is_exclusive(x_33);
-if (x_34 == 0)
-{
-lean_object* x_35; lean_object* x_36; 
-x_35 = lean_ctor_get(x_33, 0);
-lean_dec(x_35);
-x_36 = lean_box(0);
-lean_ctor_set(x_33, 0, x_36);
-return x_33;
+lean_object* x_32; lean_object* x_33; 
+x_32 = lean_ctor_get(x_30, 0);
+lean_dec(x_32);
+x_33 = lean_box(0);
+lean_ctor_set(x_30, 0, x_33);
+return x_30;
 }
 else
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_37 = lean_ctor_get(x_33, 1);
-lean_inc(x_37);
-lean_dec(x_33);
-x_38 = lean_box(0);
-x_39 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_39, 0, x_38);
-lean_ctor_set(x_39, 1, x_37);
-return x_39;
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_34 = lean_ctor_get(x_30, 1);
+lean_inc(x_34);
+lean_dec(x_30);
+x_35 = lean_box(0);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_34);
+return x_36;
 }
 }
 else
 {
-uint8_t x_40; 
-x_40 = !lean_is_exclusive(x_33);
-if (x_40 == 0)
+uint8_t x_37; 
+x_37 = !lean_is_exclusive(x_30);
+if (x_37 == 0)
 {
-return x_33;
+return x_30;
 }
 else
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_41 = lean_ctor_get(x_33, 0);
-x_42 = lean_ctor_get(x_33, 1);
+lean_object* x_38; lean_object* x_39; lean_object* x_40; 
+x_38 = lean_ctor_get(x_30, 0);
+x_39 = lean_ctor_get(x_30, 1);
+lean_inc(x_39);
+lean_inc(x_38);
+lean_dec(x_30);
+x_40 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_40, 0, x_38);
+lean_ctor_set(x_40, 1, x_39);
+return x_40;
+}
+}
+}
+else
+{
+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; 
+x_41 = lean_ctor_get(x_25, 0);
+x_42 = lean_ctor_get(x_25, 1);
+x_43 = lean_ctor_get(x_25, 2);
+x_44 = lean_ctor_get(x_25, 3);
+lean_inc(x_44);
+lean_inc(x_43);
 lean_inc(x_42);
 lean_inc(x_41);
-lean_dec(x_33);
-x_43 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_43, 0, x_41);
-lean_ctor_set(x_43, 1, x_42);
-return x_43;
-}
-}
-}
-else
-{
-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; 
-x_44 = lean_ctor_get(x_28, 0);
-x_45 = lean_ctor_get(x_28, 1);
-x_46 = lean_ctor_get(x_28, 2);
-x_47 = lean_ctor_get(x_28, 3);
-lean_inc(x_47);
-lean_inc(x_46);
-lean_inc(x_45);
-lean_inc(x_44);
-lean_dec(x_28);
-x_48 = l_List_foldl___main___at_Lean_Elab_Command_elabExport___spec__2(x_44, x_25);
-x_49 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_49, 0, x_48);
-lean_ctor_set(x_49, 1, x_45);
-lean_ctor_set(x_49, 2, x_46);
-lean_ctor_set(x_49, 3, x_47);
-x_50 = l___private_Init_Lean_Elab_Command_3__setState(x_49, x_2, x_29);
-if (lean_obj_tag(x_50) == 0)
-{
-lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_51 = lean_ctor_get(x_50, 1);
-lean_inc(x_51);
-if (lean_is_exclusive(x_50)) {
- lean_ctor_release(x_50, 0);
- lean_ctor_release(x_50, 1);
- x_52 = x_50;
-} else {
- lean_dec_ref(x_50);
- x_52 = lean_box(0);
-}
-x_53 = lean_box(0);
-if (lean_is_scalar(x_52)) {
- x_54 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_54 = x_52;
-}
-lean_ctor_set(x_54, 0, x_53);
-lean_ctor_set(x_54, 1, x_51);
-return x_54;
-}
-else
-{
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_55 = lean_ctor_get(x_50, 0);
-lean_inc(x_55);
-x_56 = lean_ctor_get(x_50, 1);
-lean_inc(x_56);
-if (lean_is_exclusive(x_50)) {
- lean_ctor_release(x_50, 0);
- lean_ctor_release(x_50, 1);
- x_57 = x_50;
-} else {
- lean_dec_ref(x_50);
- x_57 = lean_box(0);
-}
-if (lean_is_scalar(x_57)) {
- x_58 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_58 = x_57;
-}
-lean_ctor_set(x_58, 0, x_55);
-lean_ctor_set(x_58, 1, x_56);
-return x_58;
-}
-}
-}
-else
-{
-uint8_t x_59; 
 lean_dec(x_25);
-lean_dec(x_2);
-x_59 = !lean_is_exclusive(x_27);
-if (x_59 == 0)
+x_45 = l_List_foldl___main___at_Lean_Elab_Command_elabExport___spec__2(x_41, x_22);
+x_46 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_46, 0, x_45);
+lean_ctor_set(x_46, 1, x_42);
+lean_ctor_set(x_46, 2, x_43);
+lean_ctor_set(x_46, 3, x_44);
+x_47 = l___private_Init_Lean_Elab_Command_3__setState(x_46, x_2, x_26);
+if (lean_obj_tag(x_47) == 0)
 {
-return x_27;
+lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+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_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;
 }
 else
 {
-lean_object* x_60; lean_object* x_61; lean_object* x_62; 
-x_60 = lean_ctor_get(x_27, 0);
-x_61 = lean_ctor_get(x_27, 1);
-lean_inc(x_61);
-lean_inc(x_60);
-lean_dec(x_27);
-x_62 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_62, 0, x_60);
-lean_ctor_set(x_62, 1, x_61);
-return x_62;
+lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
+x_52 = lean_ctor_get(x_47, 0);
+lean_inc(x_52);
+x_53 = lean_ctor_get(x_47, 1);
+lean_inc(x_53);
+if (lean_is_exclusive(x_47)) {
+ lean_ctor_release(x_47, 0);
+ lean_ctor_release(x_47, 1);
+ x_54 = x_47;
+} else {
+ lean_dec_ref(x_47);
+ x_54 = lean_box(0);
+}
+if (lean_is_scalar(x_54)) {
+ x_55 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_55 = x_54;
+}
+lean_ctor_set(x_55, 0, x_52);
+lean_ctor_set(x_55, 1, x_53);
+return x_55;
 }
 }
 }
 else
 {
-uint8_t x_63; 
+uint8_t x_56; 
+lean_dec(x_22);
 lean_dec(x_2);
-x_63 = !lean_is_exclusive(x_24);
-if (x_63 == 0)
+x_56 = !lean_is_exclusive(x_24);
+if (x_56 == 0)
 {
 return x_24;
 }
 else
 {
-lean_object* x_64; lean_object* x_65; lean_object* x_66; 
-x_64 = lean_ctor_get(x_24, 0);
-x_65 = lean_ctor_get(x_24, 1);
-lean_inc(x_65);
-lean_inc(x_64);
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_ctor_get(x_24, 0);
+x_58 = lean_ctor_get(x_24, 1);
+lean_inc(x_58);
+lean_inc(x_57);
 lean_dec(x_24);
-x_66 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_66, 0, x_64);
-lean_ctor_set(x_66, 1, x_65);
-return x_66;
+x_59 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_59, 0, x_57);
+lean_ctor_set(x_59, 1, x_58);
+return x_59;
 }
 }
 }
 else
 {
-uint8_t x_67; 
+uint8_t x_60; 
+lean_dec(x_2);
+x_60 = !lean_is_exclusive(x_21);
+if (x_60 == 0)
+{
+return x_21;
+}
+else
+{
+lean_object* x_61; lean_object* x_62; lean_object* x_63; 
+x_61 = lean_ctor_get(x_21, 0);
+x_62 = lean_ctor_get(x_21, 1);
+lean_inc(x_62);
+lean_inc(x_61);
+lean_dec(x_21);
+x_63 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_63, 0, x_61);
+lean_ctor_set(x_63, 1, x_62);
+return x_63;
+}
+}
+}
+else
+{
+uint8_t x_64; 
+lean_dec(x_10);
+lean_dec(x_7);
+lean_dec(x_2);
+lean_dec(x_1);
+x_64 = !lean_is_exclusive(x_13);
+if (x_64 == 0)
+{
+return x_13;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_13, 0);
+x_66 = lean_ctor_get(x_13, 1);
+lean_inc(x_66);
+lean_inc(x_65);
 lean_dec(x_13);
-lean_dec(x_10);
-lean_dec(x_4);
-lean_dec(x_2);
-x_67 = !lean_is_exclusive(x_16);
-if (x_67 == 0)
-{
-return x_16;
-}
-else
-{
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_68 = lean_ctor_get(x_16, 0);
-x_69 = lean_ctor_get(x_16, 1);
-lean_inc(x_69);
-lean_inc(x_68);
-lean_dec(x_16);
-x_70 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_70, 0, x_68);
-lean_ctor_set(x_70, 1, x_69);
-return x_70;
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
 }
 }
 }
 }
 else
 {
-uint8_t x_79; 
-lean_dec(x_10);
-lean_dec(x_4);
+uint8_t x_76; 
+lean_dec(x_7);
 lean_dec(x_2);
 lean_dec(x_1);
-x_79 = !lean_is_exclusive(x_12);
-if (x_79 == 0)
-{
-return x_12;
-}
-else
-{
-lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_80 = lean_ctor_get(x_12, 0);
-x_81 = lean_ctor_get(x_12, 1);
-lean_inc(x_81);
-lean_inc(x_80);
-lean_dec(x_12);
-x_82 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_82, 0, x_80);
-lean_ctor_set(x_82, 1, x_81);
-return x_82;
-}
-}
-}
-else
-{
-uint8_t x_83; 
-lean_dec(x_4);
-lean_dec(x_2);
-lean_dec(x_1);
-x_83 = !lean_is_exclusive(x_9);
-if (x_83 == 0)
+x_76 = !lean_is_exclusive(x_9);
+if (x_76 == 0)
 {
 return x_9;
 }
 else
 {
-lean_object* x_84; lean_object* x_85; lean_object* x_86; 
-x_84 = lean_ctor_get(x_9, 0);
-x_85 = lean_ctor_get(x_9, 1);
-lean_inc(x_85);
-lean_inc(x_84);
+lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_77 = lean_ctor_get(x_9, 0);
+x_78 = lean_ctor_get(x_9, 1);
+lean_inc(x_78);
+lean_inc(x_77);
 lean_dec(x_9);
-x_86 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_86, 0, x_84);
-lean_ctor_set(x_86, 1, x_85);
-return x_86;
+x_79 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_79, 0, x_77);
+lean_ctor_set(x_79, 1, x_78);
+return x_79;
+}
+}
+}
+else
+{
+uint8_t x_80; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_80 = !lean_is_exclusive(x_6);
+if (x_80 == 0)
+{
+return x_6;
+}
+else
+{
+lean_object* x_81; lean_object* x_82; lean_object* x_83; 
+x_81 = lean_ctor_get(x_6, 0);
+x_82 = lean_ctor_get(x_6, 1);
+lean_inc(x_82);
+lean_inc(x_81);
+lean_dec(x_6);
+x_83 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_83, 0, x_81);
+lean_ctor_set(x_83, 1, x_82);
+return x_83;
 }
 }
 }
@@ -12852,61 +11973,59 @@ return x_4;
 lean_object* l_Lean_Elab_Command_elabOpen(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_4 = lean_ctor_get(x_1, 1);
-x_5 = l_Lean_stxInh;
-x_6 = lean_unsigned_to_nat(1u);
-x_7 = lean_array_get(x_5, x_4, x_6);
-x_8 = l_Lean_Syntax_asNode(x_7);
-lean_dec(x_7);
-x_9 = lean_ctor_get(x_8, 0);
-lean_inc(x_9);
-x_10 = l_Lean_Parser_Command_openSimple___elambda__1___closed__2;
-x_11 = lean_name_eq(x_9, x_10);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = l_Lean_Syntax_asNode(x_5);
+lean_dec(x_5);
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
+x_8 = l_Lean_Parser_Command_openSimple___elambda__1___closed__2;
+x_9 = lean_name_eq(x_7, x_8);
+if (x_9 == 0)
+{
+lean_object* x_10; uint8_t x_11; 
+x_10 = l_Lean_Parser_Command_openOnly___elambda__1___closed__2;
+x_11 = lean_name_eq(x_7, x_10);
 if (x_11 == 0)
 {
 lean_object* x_12; uint8_t x_13; 
-x_12 = l_Lean_Parser_Command_openOnly___elambda__1___closed__2;
-x_13 = lean_name_eq(x_9, x_12);
+x_12 = l_Lean_Parser_Command_openHiding___elambda__1___closed__2;
+x_13 = lean_name_eq(x_7, x_12);
+lean_dec(x_7);
 if (x_13 == 0)
 {
-lean_object* x_14; uint8_t x_15; 
-x_14 = l_Lean_Parser_Command_openHiding___elambda__1___closed__2;
-x_15 = lean_name_eq(x_9, x_14);
-lean_dec(x_9);
-if (x_15 == 0)
+lean_object* x_14; 
+x_14 = l_Lean_Elab_Command_elabOpenRenaming(x_6, x_2, x_3);
+lean_dec(x_6);
+return x_14;
+}
+else
+{
+lean_object* x_15; 
+x_15 = l_Lean_Elab_Command_elabOpenHiding(x_6, x_2, x_3);
+lean_dec(x_6);
+return x_15;
+}
+}
+else
 {
 lean_object* x_16; 
-x_16 = l_Lean_Elab_Command_elabOpenRenaming(x_8, x_2, x_3);
-lean_dec(x_8);
+lean_dec(x_7);
+x_16 = l_Lean_Elab_Command_elabOpenOnly(x_6, x_2, x_3);
+lean_dec(x_6);
 return x_16;
 }
+}
 else
 {
 lean_object* x_17; 
-x_17 = l_Lean_Elab_Command_elabOpenHiding(x_8, x_2, x_3);
-lean_dec(x_8);
+lean_dec(x_7);
+x_17 = l_Lean_Elab_Command_elabOpenSimple(x_6, x_2, x_3);
+lean_dec(x_6);
 return x_17;
 }
 }
-else
-{
-lean_object* x_18; 
-lean_dec(x_9);
-x_18 = l_Lean_Elab_Command_elabOpenOnly(x_8, x_2, x_3);
-lean_dec(x_8);
-return x_18;
-}
-}
-else
-{
-lean_object* x_19; 
-lean_dec(x_9);
-x_19 = l_Lean_Elab_Command_elabOpenSimple(x_8, x_2, x_3);
-lean_dec(x_8);
-return x_19;
-}
-}
 }
 lean_object* l_Lean_Elab_Command_elabOpen___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
@@ -13717,427 +12836,427 @@ return x_8;
 lean_object* l_Lean_Elab_Command_elabVariable(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_4 = lean_ctor_get(x_1, 1);
-x_5 = lean_box(0);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = lean_box(0);
+lean_inc(x_5);
+x_7 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabVariable___lambda__1___boxed), 4, 1);
+lean_closure_set(x_7, 0, x_5);
 lean_inc(x_2);
-x_6 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
-if (lean_obj_tag(x_6) == 0)
+x_8 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
+if (lean_obj_tag(x_8) == 0)
 {
-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; 
-x_7 = lean_ctor_get(x_6, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_6, 1);
-lean_inc(x_8);
-lean_dec(x_6);
-x_9 = l_Lean_stxInh;
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_array_get(x_9, x_4, x_10);
-lean_inc(x_11);
-x_12 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabVariable___lambda__1___boxed), 4, 1);
-lean_closure_set(x_12, 0, x_11);
-x_13 = l___private_Init_Lean_Elab_Command_10__getVarDecls(x_7);
-x_14 = l___private_Init_Lean_Elab_Command_8__mkTermContext(x_2, x_7, x_5);
-x_15 = l___private_Init_Lean_Elab_Command_9__mkTermState(x_7);
-lean_dec(x_7);
-x_16 = l_Lean_Elab_Term_elabBinders___rarg(x_13, x_12, x_14, x_15);
-lean_dec(x_13);
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_9 = lean_ctor_get(x_8, 0);
+lean_inc(x_9);
+x_10 = lean_ctor_get(x_8, 1);
+lean_inc(x_10);
+lean_dec(x_8);
+x_11 = l___private_Init_Lean_Elab_Command_11__getVarDecls(x_9);
+x_12 = l___private_Init_Lean_Elab_Command_9__mkTermContext(x_2, x_9, x_6);
+x_13 = l___private_Init_Lean_Elab_Command_10__mkTermState(x_9);
+lean_dec(x_9);
+x_14 = l_Lean_Elab_Term_elabBinders___rarg(x_11, x_7, x_12, x_13);
+lean_dec(x_11);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_ctor_get(x_14, 1);
+lean_inc(x_15);
+lean_dec(x_14);
+lean_inc(x_2);
+x_16 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_10);
 if (lean_obj_tag(x_16) == 0)
 {
-lean_object* x_17; lean_object* x_18; 
-x_17 = lean_ctor_get(x_16, 1);
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
+x_17 = lean_ctor_get(x_15, 0);
 lean_inc(x_17);
-lean_dec(x_16);
-lean_inc(x_2);
-x_18 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_8);
-if (lean_obj_tag(x_18) == 0)
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; 
-x_19 = lean_ctor_get(x_17, 0);
+x_18 = lean_ctor_get(x_16, 0);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_16, 1);
 lean_inc(x_19);
-x_20 = lean_ctor_get(x_18, 0);
+lean_dec(x_16);
+x_20 = lean_ctor_get(x_17, 0);
 lean_inc(x_20);
-x_21 = lean_ctor_get(x_18, 1);
-lean_inc(x_21);
-lean_dec(x_18);
-x_22 = lean_ctor_get(x_19, 0);
-lean_inc(x_22);
-lean_dec(x_19);
-x_23 = lean_ctor_get(x_17, 2);
-lean_inc(x_23);
 lean_dec(x_17);
-x_24 = !lean_is_exclusive(x_20);
-if (x_24 == 0)
+x_21 = lean_ctor_get(x_15, 2);
+lean_inc(x_21);
+lean_dec(x_15);
+x_22 = !lean_is_exclusive(x_18);
+if (x_22 == 0)
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_25 = lean_ctor_get(x_20, 1);
-lean_dec(x_25);
-x_26 = lean_ctor_get(x_20, 0);
-lean_dec(x_26);
-lean_ctor_set(x_20, 1, x_23);
-lean_ctor_set(x_20, 0, x_22);
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_18, 1);
+lean_dec(x_23);
+x_24 = lean_ctor_get(x_18, 0);
+lean_dec(x_24);
+lean_ctor_set(x_18, 1, x_21);
+lean_ctor_set(x_18, 0, x_20);
 lean_inc(x_2);
-x_27 = l___private_Init_Lean_Elab_Command_3__setState(x_20, x_2, x_21);
-if (lean_obj_tag(x_27) == 0)
-{
-lean_object* x_28; lean_object* x_29; 
-x_28 = lean_ctor_get(x_27, 1);
-lean_inc(x_28);
-lean_dec(x_27);
-x_29 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariable___spec__1(x_11, x_2, x_28);
-return x_29;
-}
-else
-{
-uint8_t x_30; 
-lean_dec(x_11);
-lean_dec(x_2);
-x_30 = !lean_is_exclusive(x_27);
-if (x_30 == 0)
+x_25 = l___private_Init_Lean_Elab_Command_3__setState(x_18, x_2, x_19);
+if (lean_obj_tag(x_25) == 0)
 {
+lean_object* x_26; lean_object* x_27; 
+x_26 = lean_ctor_get(x_25, 1);
+lean_inc(x_26);
+lean_dec(x_25);
+x_27 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariable___spec__1(x_5, x_2, x_26);
 return x_27;
 }
 else
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_31 = lean_ctor_get(x_27, 0);
-x_32 = lean_ctor_get(x_27, 1);
+uint8_t x_28; 
+lean_dec(x_5);
+lean_dec(x_2);
+x_28 = !lean_is_exclusive(x_25);
+if (x_28 == 0)
+{
+return x_25;
+}
+else
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_29 = lean_ctor_get(x_25, 0);
+x_30 = lean_ctor_get(x_25, 1);
+lean_inc(x_30);
+lean_inc(x_29);
+lean_dec(x_25);
+x_31 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_31, 0, x_29);
+lean_ctor_set(x_31, 1, x_30);
+return x_31;
+}
+}
+}
+else
+{
+lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_32 = lean_ctor_get(x_18, 2);
+x_33 = lean_ctor_get(x_18, 3);
+lean_inc(x_33);
 lean_inc(x_32);
-lean_inc(x_31);
-lean_dec(x_27);
-x_33 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_33, 0, x_31);
-lean_ctor_set(x_33, 1, x_32);
-return x_33;
-}
-}
-}
-else
-{
-lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_34 = lean_ctor_get(x_20, 2);
-x_35 = lean_ctor_get(x_20, 3);
-lean_inc(x_35);
-lean_inc(x_34);
-lean_dec(x_20);
-x_36 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_36, 0, x_22);
-lean_ctor_set(x_36, 1, x_23);
-lean_ctor_set(x_36, 2, x_34);
-lean_ctor_set(x_36, 3, x_35);
-lean_inc(x_2);
-x_37 = l___private_Init_Lean_Elab_Command_3__setState(x_36, x_2, x_21);
-if (lean_obj_tag(x_37) == 0)
-{
-lean_object* x_38; lean_object* x_39; 
-x_38 = lean_ctor_get(x_37, 1);
-lean_inc(x_38);
-lean_dec(x_37);
-x_39 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariable___spec__1(x_11, x_2, x_38);
-return x_39;
-}
-else
-{
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-lean_dec(x_11);
-lean_dec(x_2);
-x_40 = lean_ctor_get(x_37, 0);
-lean_inc(x_40);
-x_41 = lean_ctor_get(x_37, 1);
-lean_inc(x_41);
-if (lean_is_exclusive(x_37)) {
- lean_ctor_release(x_37, 0);
- lean_ctor_release(x_37, 1);
- x_42 = x_37;
-} else {
- lean_dec_ref(x_37);
- x_42 = lean_box(0);
-}
-if (lean_is_scalar(x_42)) {
- x_43 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_43 = x_42;
-}
-lean_ctor_set(x_43, 0, x_40);
-lean_ctor_set(x_43, 1, x_41);
-return x_43;
-}
-}
-}
-else
-{
-uint8_t x_44; 
-lean_dec(x_17);
-lean_dec(x_11);
-lean_dec(x_2);
-x_44 = !lean_is_exclusive(x_18);
-if (x_44 == 0)
-{
-return x_18;
-}
-else
-{
-lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_45 = lean_ctor_get(x_18, 0);
-x_46 = lean_ctor_get(x_18, 1);
-lean_inc(x_46);
-lean_inc(x_45);
 lean_dec(x_18);
-x_47 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_47, 0, x_45);
-lean_ctor_set(x_47, 1, x_46);
-return x_47;
+x_34 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_34, 0, x_20);
+lean_ctor_set(x_34, 1, x_21);
+lean_ctor_set(x_34, 2, x_32);
+lean_ctor_set(x_34, 3, x_33);
+lean_inc(x_2);
+x_35 = l___private_Init_Lean_Elab_Command_3__setState(x_34, x_2, x_19);
+if (lean_obj_tag(x_35) == 0)
+{
+lean_object* x_36; lean_object* x_37; 
+x_36 = lean_ctor_get(x_35, 1);
+lean_inc(x_36);
+lean_dec(x_35);
+x_37 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariable___spec__1(x_5, x_2, x_36);
+return x_37;
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+lean_dec(x_5);
+lean_dec(x_2);
+x_38 = lean_ctor_get(x_35, 0);
+lean_inc(x_38);
+x_39 = lean_ctor_get(x_35, 1);
+lean_inc(x_39);
+if (lean_is_exclusive(x_35)) {
+ lean_ctor_release(x_35, 0);
+ lean_ctor_release(x_35, 1);
+ x_40 = x_35;
+} else {
+ lean_dec_ref(x_35);
+ x_40 = lean_box(0);
+}
+if (lean_is_scalar(x_40)) {
+ x_41 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_41 = x_40;
+}
+lean_ctor_set(x_41, 0, x_38);
+lean_ctor_set(x_41, 1, x_39);
+return x_41;
 }
 }
 }
 else
 {
-lean_object* x_48; 
-x_48 = lean_ctor_get(x_16, 0);
+uint8_t x_42; 
+lean_dec(x_15);
+lean_dec(x_5);
+lean_dec(x_2);
+x_42 = !lean_is_exclusive(x_16);
+if (x_42 == 0)
+{
+return x_16;
+}
+else
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_43 = lean_ctor_get(x_16, 0);
+x_44 = lean_ctor_get(x_16, 1);
+lean_inc(x_44);
+lean_inc(x_43);
+lean_dec(x_16);
+x_45 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_45, 0, x_43);
+lean_ctor_set(x_45, 1, x_44);
+return x_45;
+}
+}
+}
+else
+{
+lean_object* x_46; 
+x_46 = lean_ctor_get(x_14, 0);
+lean_inc(x_46);
+if (lean_obj_tag(x_46) == 0)
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+lean_dec(x_5);
+x_47 = lean_ctor_get(x_14, 1);
+lean_inc(x_47);
+lean_dec(x_14);
+x_48 = lean_ctor_get(x_46, 0);
 lean_inc(x_48);
-if (lean_obj_tag(x_48) == 0)
+lean_dec(x_46);
+lean_inc(x_2);
+x_49 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_10);
+if (lean_obj_tag(x_49) == 0)
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-lean_dec(x_11);
-x_49 = lean_ctor_get(x_16, 1);
-lean_inc(x_49);
-lean_dec(x_16);
-x_50 = lean_ctor_get(x_48, 0);
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
+x_50 = lean_ctor_get(x_47, 0);
 lean_inc(x_50);
-lean_dec(x_48);
-lean_inc(x_2);
-x_51 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_8);
-if (lean_obj_tag(x_51) == 0)
-{
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; uint8_t x_57; 
-x_52 = lean_ctor_get(x_49, 0);
+x_51 = lean_ctor_get(x_49, 0);
+lean_inc(x_51);
+x_52 = lean_ctor_get(x_49, 1);
 lean_inc(x_52);
-x_53 = lean_ctor_get(x_51, 0);
+lean_dec(x_49);
+x_53 = lean_ctor_get(x_50, 0);
 lean_inc(x_53);
-x_54 = lean_ctor_get(x_51, 1);
+lean_dec(x_50);
+x_54 = lean_ctor_get(x_47, 2);
 lean_inc(x_54);
-lean_dec(x_51);
-x_55 = lean_ctor_get(x_52, 0);
-lean_inc(x_55);
-lean_dec(x_52);
-x_56 = lean_ctor_get(x_49, 2);
-lean_inc(x_56);
-lean_dec(x_49);
-x_57 = !lean_is_exclusive(x_53);
-if (x_57 == 0)
+lean_dec(x_47);
+x_55 = !lean_is_exclusive(x_51);
+if (x_55 == 0)
 {
-lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_58 = lean_ctor_get(x_53, 1);
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_51, 1);
+lean_dec(x_56);
+x_57 = lean_ctor_get(x_51, 0);
+lean_dec(x_57);
+lean_ctor_set(x_51, 1, x_54);
+lean_ctor_set(x_51, 0, x_53);
+x_58 = l___private_Init_Lean_Elab_Command_3__setState(x_51, x_2, x_52);
+if (lean_obj_tag(x_58) == 0)
+{
+uint8_t x_59; 
+x_59 = !lean_is_exclusive(x_58);
+if (x_59 == 0)
+{
+lean_object* x_60; 
+x_60 = lean_ctor_get(x_58, 0);
+lean_dec(x_60);
+lean_ctor_set_tag(x_58, 1);
+lean_ctor_set(x_58, 0, x_48);
+return x_58;
+}
+else
+{
+lean_object* x_61; lean_object* x_62; 
+x_61 = lean_ctor_get(x_58, 1);
+lean_inc(x_61);
 lean_dec(x_58);
-x_59 = lean_ctor_get(x_53, 0);
-lean_dec(x_59);
-lean_ctor_set(x_53, 1, x_56);
-lean_ctor_set(x_53, 0, x_55);
-x_60 = l___private_Init_Lean_Elab_Command_3__setState(x_53, x_2, x_54);
-if (lean_obj_tag(x_60) == 0)
-{
-uint8_t x_61; 
-x_61 = !lean_is_exclusive(x_60);
-if (x_61 == 0)
-{
-lean_object* x_62; 
-x_62 = lean_ctor_get(x_60, 0);
-lean_dec(x_62);
-lean_ctor_set_tag(x_60, 1);
-lean_ctor_set(x_60, 0, x_50);
-return x_60;
-}
-else
-{
-lean_object* x_63; lean_object* x_64; 
-x_63 = lean_ctor_get(x_60, 1);
-lean_inc(x_63);
-lean_dec(x_60);
-x_64 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_64, 0, x_50);
-lean_ctor_set(x_64, 1, x_63);
-return x_64;
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_48);
+lean_ctor_set(x_62, 1, x_61);
+return x_62;
 }
 }
 else
 {
-uint8_t x_65; 
-lean_dec(x_50);
-x_65 = !lean_is_exclusive(x_60);
-if (x_65 == 0)
+uint8_t x_63; 
+lean_dec(x_48);
+x_63 = !lean_is_exclusive(x_58);
+if (x_63 == 0)
 {
-return x_60;
+return x_58;
 }
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_66 = lean_ctor_get(x_60, 0);
-x_67 = lean_ctor_get(x_60, 1);
+lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_64 = lean_ctor_get(x_58, 0);
+x_65 = lean_ctor_get(x_58, 1);
+lean_inc(x_65);
+lean_inc(x_64);
+lean_dec(x_58);
+x_66 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_66, 0, x_64);
+lean_ctor_set(x_66, 1, x_65);
+return x_66;
+}
+}
+}
+else
+{
+lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_67 = lean_ctor_get(x_51, 2);
+x_68 = lean_ctor_get(x_51, 3);
+lean_inc(x_68);
 lean_inc(x_67);
-lean_inc(x_66);
-lean_dec(x_60);
-x_68 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_68, 0, x_66);
-lean_ctor_set(x_68, 1, x_67);
-return x_68;
-}
-}
-}
-else
-{
-lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_69 = lean_ctor_get(x_53, 2);
-x_70 = lean_ctor_get(x_53, 3);
-lean_inc(x_70);
-lean_inc(x_69);
-lean_dec(x_53);
-x_71 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_71, 0, x_55);
-lean_ctor_set(x_71, 1, x_56);
-lean_ctor_set(x_71, 2, x_69);
-lean_ctor_set(x_71, 3, x_70);
-x_72 = l___private_Init_Lean_Elab_Command_3__setState(x_71, x_2, x_54);
-if (lean_obj_tag(x_72) == 0)
-{
-lean_object* x_73; lean_object* x_74; lean_object* x_75; 
-x_73 = lean_ctor_get(x_72, 1);
-lean_inc(x_73);
-if (lean_is_exclusive(x_72)) {
- lean_ctor_release(x_72, 0);
- lean_ctor_release(x_72, 1);
- x_74 = x_72;
-} else {
- lean_dec_ref(x_72);
- x_74 = lean_box(0);
-}
-if (lean_is_scalar(x_74)) {
- x_75 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_75 = x_74;
- lean_ctor_set_tag(x_75, 1);
-}
-lean_ctor_set(x_75, 0, x_50);
-lean_ctor_set(x_75, 1, x_73);
-return x_75;
-}
-else
-{
-lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-lean_dec(x_50);
-x_76 = lean_ctor_get(x_72, 0);
-lean_inc(x_76);
-x_77 = lean_ctor_get(x_72, 1);
-lean_inc(x_77);
-if (lean_is_exclusive(x_72)) {
- lean_ctor_release(x_72, 0);
- lean_ctor_release(x_72, 1);
- x_78 = x_72;
-} else {
- lean_dec_ref(x_72);
- x_78 = lean_box(0);
-}
-if (lean_is_scalar(x_78)) {
- x_79 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_79 = x_78;
-}
-lean_ctor_set(x_79, 0, x_76);
-lean_ctor_set(x_79, 1, x_77);
-return x_79;
-}
-}
-}
-else
-{
-uint8_t x_80; 
-lean_dec(x_50);
-lean_dec(x_49);
-lean_dec(x_2);
-x_80 = !lean_is_exclusive(x_51);
-if (x_80 == 0)
-{
-return x_51;
-}
-else
-{
-lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-x_81 = lean_ctor_get(x_51, 0);
-x_82 = lean_ctor_get(x_51, 1);
-lean_inc(x_82);
-lean_inc(x_81);
 lean_dec(x_51);
-x_83 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_83, 0, x_81);
-lean_ctor_set(x_83, 1, x_82);
-return x_83;
+x_69 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_69, 0, x_53);
+lean_ctor_set(x_69, 1, x_54);
+lean_ctor_set(x_69, 2, x_67);
+lean_ctor_set(x_69, 3, x_68);
+x_70 = l___private_Init_Lean_Elab_Command_3__setState(x_69, x_2, x_52);
+if (lean_obj_tag(x_70) == 0)
+{
+lean_object* x_71; lean_object* x_72; lean_object* x_73; 
+x_71 = lean_ctor_get(x_70, 1);
+lean_inc(x_71);
+if (lean_is_exclusive(x_70)) {
+ lean_ctor_release(x_70, 0);
+ lean_ctor_release(x_70, 1);
+ x_72 = x_70;
+} else {
+ lean_dec_ref(x_70);
+ x_72 = lean_box(0);
+}
+if (lean_is_scalar(x_72)) {
+ x_73 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_73 = x_72;
+ lean_ctor_set_tag(x_73, 1);
+}
+lean_ctor_set(x_73, 0, x_48);
+lean_ctor_set(x_73, 1, x_71);
+return x_73;
+}
+else
+{
+lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+lean_dec(x_48);
+x_74 = lean_ctor_get(x_70, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_70, 1);
+lean_inc(x_75);
+if (lean_is_exclusive(x_70)) {
+ lean_ctor_release(x_70, 0);
+ lean_ctor_release(x_70, 1);
+ x_76 = x_70;
+} else {
+ lean_dec_ref(x_70);
+ x_76 = lean_box(0);
+}
+if (lean_is_scalar(x_76)) {
+ x_77 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_77 = x_76;
+}
+lean_ctor_set(x_77, 0, x_74);
+lean_ctor_set(x_77, 1, x_75);
+return x_77;
 }
 }
 }
 else
 {
-lean_object* x_84; lean_object* x_85; lean_object* x_86; 
-lean_dec(x_16);
-x_84 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
-x_85 = l_unreachable_x21___rarg(x_84);
-lean_inc(x_2);
-x_86 = lean_apply_2(x_85, x_2, x_8);
-if (lean_obj_tag(x_86) == 0)
-{
-lean_object* x_87; lean_object* x_88; 
-x_87 = lean_ctor_get(x_86, 1);
-lean_inc(x_87);
-lean_dec(x_86);
-x_88 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariable___spec__1(x_11, x_2, x_87);
-return x_88;
-}
-else
-{
-uint8_t x_89; 
-lean_dec(x_11);
+uint8_t x_78; 
+lean_dec(x_48);
+lean_dec(x_47);
 lean_dec(x_2);
-x_89 = !lean_is_exclusive(x_86);
-if (x_89 == 0)
+x_78 = !lean_is_exclusive(x_49);
+if (x_78 == 0)
 {
+return x_49;
+}
+else
+{
+lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_79 = lean_ctor_get(x_49, 0);
+x_80 = lean_ctor_get(x_49, 1);
+lean_inc(x_80);
+lean_inc(x_79);
+lean_dec(x_49);
+x_81 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_81, 0, x_79);
+lean_ctor_set(x_81, 1, x_80);
+return x_81;
+}
+}
+}
+else
+{
+lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+lean_dec(x_14);
+x_82 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
+x_83 = l_unreachable_x21___rarg(x_82);
+lean_inc(x_2);
+x_84 = lean_apply_2(x_83, x_2, x_10);
+if (lean_obj_tag(x_84) == 0)
+{
+lean_object* x_85; lean_object* x_86; 
+x_85 = lean_ctor_get(x_84, 1);
+lean_inc(x_85);
+lean_dec(x_84);
+x_86 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariable___spec__1(x_5, x_2, x_85);
 return x_86;
 }
 else
 {
-lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_90 = lean_ctor_get(x_86, 0);
-x_91 = lean_ctor_get(x_86, 1);
-lean_inc(x_91);
-lean_inc(x_90);
-lean_dec(x_86);
-x_92 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_92, 0, x_90);
-lean_ctor_set(x_92, 1, x_91);
-return x_92;
-}
-}
-}
-}
-}
-else
-{
-uint8_t x_93; 
+uint8_t x_87; 
+lean_dec(x_5);
 lean_dec(x_2);
-x_93 = !lean_is_exclusive(x_6);
-if (x_93 == 0)
+x_87 = !lean_is_exclusive(x_84);
+if (x_87 == 0)
 {
-return x_6;
+return x_84;
 }
 else
 {
-lean_object* x_94; lean_object* x_95; lean_object* x_96; 
-x_94 = lean_ctor_get(x_6, 0);
-x_95 = lean_ctor_get(x_6, 1);
-lean_inc(x_95);
-lean_inc(x_94);
-lean_dec(x_6);
-x_96 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_96, 0, x_94);
-lean_ctor_set(x_96, 1, x_95);
-return x_96;
+lean_object* x_88; lean_object* x_89; lean_object* x_90; 
+x_88 = lean_ctor_get(x_84, 0);
+x_89 = lean_ctor_get(x_84, 1);
+lean_inc(x_89);
+lean_inc(x_88);
+lean_dec(x_84);
+x_90 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_90, 0, x_88);
+lean_ctor_set(x_90, 1, x_89);
+return x_90;
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_91; 
+lean_dec(x_7);
+lean_dec(x_5);
+lean_dec(x_2);
+x_91 = !lean_is_exclusive(x_8);
+if (x_91 == 0)
+{
+return x_8;
+}
+else
+{
+lean_object* x_92; lean_object* x_93; lean_object* x_94; 
+x_92 = lean_ctor_get(x_8, 0);
+x_93 = lean_ctor_get(x_8, 1);
+lean_inc(x_93);
+lean_inc(x_92);
+lean_dec(x_8);
+x_94 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_94, 0, x_92);
+lean_ctor_set(x_94, 1, x_93);
+return x_94;
 }
 }
 }
@@ -14761,432 +13880,432 @@ return x_6;
 lean_object* l_Lean_Elab_Command_elabVariables(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_4 = lean_ctor_get(x_1, 1);
-x_5 = lean_box(0);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = l_Lean_Syntax_getArgs(x_5);
+lean_dec(x_5);
+x_7 = lean_box(0);
+lean_inc(x_6);
+x_8 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabVariables___lambda__1___boxed), 4, 1);
+lean_closure_set(x_8, 0, x_6);
 lean_inc(x_2);
-x_6 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
-if (lean_obj_tag(x_6) == 0)
+x_9 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
+if (lean_obj_tag(x_9) == 0)
 {
-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; 
-x_7 = lean_ctor_get(x_6, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_6, 1);
-lean_inc(x_8);
-lean_dec(x_6);
-x_9 = l_Lean_stxInh;
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_array_get(x_9, x_4, x_10);
-x_12 = l_Lean_Syntax_getArgs(x_11);
-lean_dec(x_11);
-lean_inc(x_12);
-x_13 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabVariables___lambda__1___boxed), 4, 1);
-lean_closure_set(x_13, 0, x_12);
-x_14 = l___private_Init_Lean_Elab_Command_10__getVarDecls(x_7);
-x_15 = l___private_Init_Lean_Elab_Command_8__mkTermContext(x_2, x_7, x_5);
-x_16 = l___private_Init_Lean_Elab_Command_9__mkTermState(x_7);
-lean_dec(x_7);
-x_17 = l_Lean_Elab_Term_elabBinders___rarg(x_14, x_13, x_15, x_16);
-lean_dec(x_14);
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+x_11 = lean_ctor_get(x_9, 1);
+lean_inc(x_11);
+lean_dec(x_9);
+x_12 = l___private_Init_Lean_Elab_Command_11__getVarDecls(x_10);
+x_13 = l___private_Init_Lean_Elab_Command_9__mkTermContext(x_2, x_10, x_7);
+x_14 = l___private_Init_Lean_Elab_Command_10__mkTermState(x_10);
+lean_dec(x_10);
+x_15 = l_Lean_Elab_Term_elabBinders___rarg(x_12, x_8, x_13, x_14);
+lean_dec(x_12);
+if (lean_obj_tag(x_15) == 0)
+{
+lean_object* x_16; lean_object* x_17; 
+x_16 = lean_ctor_get(x_15, 1);
+lean_inc(x_16);
+lean_dec(x_15);
+lean_inc(x_2);
+x_17 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_11);
 if (lean_obj_tag(x_17) == 0)
 {
-lean_object* x_18; lean_object* x_19; 
-x_18 = lean_ctor_get(x_17, 1);
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
+x_18 = lean_ctor_get(x_16, 0);
 lean_inc(x_18);
-lean_dec(x_17);
-lean_inc(x_2);
-x_19 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_8);
-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; uint8_t x_25; 
-x_20 = lean_ctor_get(x_18, 0);
+x_19 = lean_ctor_get(x_17, 0);
+lean_inc(x_19);
+x_20 = lean_ctor_get(x_17, 1);
 lean_inc(x_20);
-x_21 = lean_ctor_get(x_19, 0);
+lean_dec(x_17);
+x_21 = lean_ctor_get(x_18, 0);
 lean_inc(x_21);
-x_22 = lean_ctor_get(x_19, 1);
-lean_inc(x_22);
-lean_dec(x_19);
-x_23 = lean_ctor_get(x_20, 0);
-lean_inc(x_23);
-lean_dec(x_20);
-x_24 = lean_ctor_get(x_18, 2);
-lean_inc(x_24);
 lean_dec(x_18);
-x_25 = !lean_is_exclusive(x_21);
-if (x_25 == 0)
+x_22 = lean_ctor_get(x_16, 2);
+lean_inc(x_22);
+lean_dec(x_16);
+x_23 = !lean_is_exclusive(x_19);
+if (x_23 == 0)
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_21, 1);
-lean_dec(x_26);
-x_27 = lean_ctor_get(x_21, 0);
-lean_dec(x_27);
-lean_ctor_set(x_21, 1, x_24);
-lean_ctor_set(x_21, 0, x_23);
+lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_19, 1);
+lean_dec(x_24);
+x_25 = lean_ctor_get(x_19, 0);
+lean_dec(x_25);
+lean_ctor_set(x_19, 1, x_22);
+lean_ctor_set(x_19, 0, x_21);
 lean_inc(x_2);
-x_28 = l___private_Init_Lean_Elab_Command_3__setState(x_21, x_2, x_22);
-if (lean_obj_tag(x_28) == 0)
-{
-lean_object* x_29; lean_object* x_30; 
-x_29 = lean_ctor_get(x_28, 1);
-lean_inc(x_29);
-lean_dec(x_28);
-x_30 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariables___spec__1(x_12, x_2, x_29);
-lean_dec(x_12);
-return x_30;
-}
-else
-{
-uint8_t x_31; 
-lean_dec(x_12);
-lean_dec(x_2);
-x_31 = !lean_is_exclusive(x_28);
-if (x_31 == 0)
+x_26 = l___private_Init_Lean_Elab_Command_3__setState(x_19, x_2, x_20);
+if (lean_obj_tag(x_26) == 0)
 {
+lean_object* x_27; lean_object* x_28; 
+x_27 = lean_ctor_get(x_26, 1);
+lean_inc(x_27);
+lean_dec(x_26);
+x_28 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariables___spec__1(x_6, x_2, x_27);
+lean_dec(x_6);
 return x_28;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_28, 0);
-x_33 = lean_ctor_get(x_28, 1);
+uint8_t x_29; 
+lean_dec(x_6);
+lean_dec(x_2);
+x_29 = !lean_is_exclusive(x_26);
+if (x_29 == 0)
+{
+return x_26;
+}
+else
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_26, 0);
+x_31 = lean_ctor_get(x_26, 1);
+lean_inc(x_31);
+lean_inc(x_30);
+lean_dec(x_26);
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_30);
+lean_ctor_set(x_32, 1, x_31);
+return x_32;
+}
+}
+}
+else
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_33 = lean_ctor_get(x_19, 2);
+x_34 = lean_ctor_get(x_19, 3);
+lean_inc(x_34);
 lean_inc(x_33);
-lean_inc(x_32);
-lean_dec(x_28);
-x_34 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_34, 0, x_32);
-lean_ctor_set(x_34, 1, x_33);
-return x_34;
-}
-}
-}
-else
-{
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_35 = lean_ctor_get(x_21, 2);
-x_36 = lean_ctor_get(x_21, 3);
-lean_inc(x_36);
-lean_inc(x_35);
-lean_dec(x_21);
-x_37 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_37, 0, x_23);
-lean_ctor_set(x_37, 1, x_24);
-lean_ctor_set(x_37, 2, x_35);
-lean_ctor_set(x_37, 3, x_36);
-lean_inc(x_2);
-x_38 = l___private_Init_Lean_Elab_Command_3__setState(x_37, x_2, x_22);
-if (lean_obj_tag(x_38) == 0)
-{
-lean_object* x_39; lean_object* x_40; 
-x_39 = lean_ctor_get(x_38, 1);
-lean_inc(x_39);
-lean_dec(x_38);
-x_40 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariables___spec__1(x_12, x_2, x_39);
-lean_dec(x_12);
-return x_40;
-}
-else
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-lean_dec(x_12);
-lean_dec(x_2);
-x_41 = lean_ctor_get(x_38, 0);
-lean_inc(x_41);
-x_42 = lean_ctor_get(x_38, 1);
-lean_inc(x_42);
-if (lean_is_exclusive(x_38)) {
- lean_ctor_release(x_38, 0);
- lean_ctor_release(x_38, 1);
- x_43 = x_38;
-} else {
- lean_dec_ref(x_38);
- x_43 = lean_box(0);
-}
-if (lean_is_scalar(x_43)) {
- x_44 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_44 = x_43;
-}
-lean_ctor_set(x_44, 0, x_41);
-lean_ctor_set(x_44, 1, x_42);
-return x_44;
-}
-}
-}
-else
-{
-uint8_t x_45; 
-lean_dec(x_18);
-lean_dec(x_12);
-lean_dec(x_2);
-x_45 = !lean_is_exclusive(x_19);
-if (x_45 == 0)
-{
-return x_19;
-}
-else
-{
-lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_46 = lean_ctor_get(x_19, 0);
-x_47 = lean_ctor_get(x_19, 1);
-lean_inc(x_47);
-lean_inc(x_46);
 lean_dec(x_19);
-x_48 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-return x_48;
+x_35 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_35, 0, x_21);
+lean_ctor_set(x_35, 1, x_22);
+lean_ctor_set(x_35, 2, x_33);
+lean_ctor_set(x_35, 3, x_34);
+lean_inc(x_2);
+x_36 = l___private_Init_Lean_Elab_Command_3__setState(x_35, x_2, x_20);
+if (lean_obj_tag(x_36) == 0)
+{
+lean_object* x_37; lean_object* x_38; 
+x_37 = lean_ctor_get(x_36, 1);
+lean_inc(x_37);
+lean_dec(x_36);
+x_38 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariables___spec__1(x_6, x_2, x_37);
+lean_dec(x_6);
+return x_38;
+}
+else
+{
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+lean_dec(x_6);
+lean_dec(x_2);
+x_39 = lean_ctor_get(x_36, 0);
+lean_inc(x_39);
+x_40 = lean_ctor_get(x_36, 1);
+lean_inc(x_40);
+if (lean_is_exclusive(x_36)) {
+ lean_ctor_release(x_36, 0);
+ lean_ctor_release(x_36, 1);
+ x_41 = x_36;
+} else {
+ lean_dec_ref(x_36);
+ x_41 = lean_box(0);
+}
+if (lean_is_scalar(x_41)) {
+ x_42 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_42 = x_41;
+}
+lean_ctor_set(x_42, 0, x_39);
+lean_ctor_set(x_42, 1, x_40);
+return x_42;
 }
 }
 }
 else
 {
-lean_object* x_49; 
-x_49 = lean_ctor_get(x_17, 0);
+uint8_t x_43; 
+lean_dec(x_16);
+lean_dec(x_6);
+lean_dec(x_2);
+x_43 = !lean_is_exclusive(x_17);
+if (x_43 == 0)
+{
+return x_17;
+}
+else
+{
+lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_44 = lean_ctor_get(x_17, 0);
+x_45 = lean_ctor_get(x_17, 1);
+lean_inc(x_45);
+lean_inc(x_44);
+lean_dec(x_17);
+x_46 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_46, 0, x_44);
+lean_ctor_set(x_46, 1, x_45);
+return x_46;
+}
+}
+}
+else
+{
+lean_object* x_47; 
+x_47 = lean_ctor_get(x_15, 0);
+lean_inc(x_47);
+if (lean_obj_tag(x_47) == 0)
+{
+lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+lean_dec(x_6);
+x_48 = lean_ctor_get(x_15, 1);
+lean_inc(x_48);
+lean_dec(x_15);
+x_49 = lean_ctor_get(x_47, 0);
 lean_inc(x_49);
-if (lean_obj_tag(x_49) == 0)
+lean_dec(x_47);
+lean_inc(x_2);
+x_50 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_11);
+if (lean_obj_tag(x_50) == 0)
 {
-lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-lean_dec(x_12);
-x_50 = lean_ctor_get(x_17, 1);
-lean_inc(x_50);
-lean_dec(x_17);
-x_51 = lean_ctor_get(x_49, 0);
+lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; uint8_t x_56; 
+x_51 = lean_ctor_get(x_48, 0);
 lean_inc(x_51);
-lean_dec(x_49);
-lean_inc(x_2);
-x_52 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_8);
-if (lean_obj_tag(x_52) == 0)
-{
-lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; uint8_t x_58; 
-x_53 = lean_ctor_get(x_50, 0);
+x_52 = lean_ctor_get(x_50, 0);
+lean_inc(x_52);
+x_53 = lean_ctor_get(x_50, 1);
 lean_inc(x_53);
-x_54 = lean_ctor_get(x_52, 0);
+lean_dec(x_50);
+x_54 = lean_ctor_get(x_51, 0);
 lean_inc(x_54);
-x_55 = lean_ctor_get(x_52, 1);
+lean_dec(x_51);
+x_55 = lean_ctor_get(x_48, 2);
 lean_inc(x_55);
-lean_dec(x_52);
-x_56 = lean_ctor_get(x_53, 0);
-lean_inc(x_56);
-lean_dec(x_53);
-x_57 = lean_ctor_get(x_50, 2);
-lean_inc(x_57);
-lean_dec(x_50);
-x_58 = !lean_is_exclusive(x_54);
-if (x_58 == 0)
+lean_dec(x_48);
+x_56 = !lean_is_exclusive(x_52);
+if (x_56 == 0)
 {
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_59 = lean_ctor_get(x_54, 1);
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_ctor_get(x_52, 1);
+lean_dec(x_57);
+x_58 = lean_ctor_get(x_52, 0);
+lean_dec(x_58);
+lean_ctor_set(x_52, 1, x_55);
+lean_ctor_set(x_52, 0, x_54);
+x_59 = l___private_Init_Lean_Elab_Command_3__setState(x_52, x_2, x_53);
+if (lean_obj_tag(x_59) == 0)
+{
+uint8_t x_60; 
+x_60 = !lean_is_exclusive(x_59);
+if (x_60 == 0)
+{
+lean_object* x_61; 
+x_61 = lean_ctor_get(x_59, 0);
+lean_dec(x_61);
+lean_ctor_set_tag(x_59, 1);
+lean_ctor_set(x_59, 0, x_49);
+return x_59;
+}
+else
+{
+lean_object* x_62; lean_object* x_63; 
+x_62 = lean_ctor_get(x_59, 1);
+lean_inc(x_62);
 lean_dec(x_59);
-x_60 = lean_ctor_get(x_54, 0);
-lean_dec(x_60);
-lean_ctor_set(x_54, 1, x_57);
-lean_ctor_set(x_54, 0, x_56);
-x_61 = l___private_Init_Lean_Elab_Command_3__setState(x_54, x_2, x_55);
-if (lean_obj_tag(x_61) == 0)
-{
-uint8_t x_62; 
-x_62 = !lean_is_exclusive(x_61);
-if (x_62 == 0)
-{
-lean_object* x_63; 
-x_63 = lean_ctor_get(x_61, 0);
-lean_dec(x_63);
-lean_ctor_set_tag(x_61, 1);
-lean_ctor_set(x_61, 0, x_51);
-return x_61;
-}
-else
-{
-lean_object* x_64; lean_object* x_65; 
-x_64 = lean_ctor_get(x_61, 1);
-lean_inc(x_64);
-lean_dec(x_61);
-x_65 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_65, 0, x_51);
-lean_ctor_set(x_65, 1, x_64);
-return x_65;
+x_63 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_63, 0, x_49);
+lean_ctor_set(x_63, 1, x_62);
+return x_63;
 }
 }
 else
 {
-uint8_t x_66; 
-lean_dec(x_51);
-x_66 = !lean_is_exclusive(x_61);
-if (x_66 == 0)
+uint8_t x_64; 
+lean_dec(x_49);
+x_64 = !lean_is_exclusive(x_59);
+if (x_64 == 0)
 {
-return x_61;
+return x_59;
 }
 else
 {
-lean_object* x_67; lean_object* x_68; lean_object* x_69; 
-x_67 = lean_ctor_get(x_61, 0);
-x_68 = lean_ctor_get(x_61, 1);
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_65 = lean_ctor_get(x_59, 0);
+x_66 = lean_ctor_get(x_59, 1);
+lean_inc(x_66);
+lean_inc(x_65);
+lean_dec(x_59);
+x_67 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_67, 0, x_65);
+lean_ctor_set(x_67, 1, x_66);
+return x_67;
+}
+}
+}
+else
+{
+lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_68 = lean_ctor_get(x_52, 2);
+x_69 = lean_ctor_get(x_52, 3);
+lean_inc(x_69);
 lean_inc(x_68);
-lean_inc(x_67);
-lean_dec(x_61);
-x_69 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_69, 0, x_67);
-lean_ctor_set(x_69, 1, x_68);
-return x_69;
-}
-}
-}
-else
-{
-lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_70 = lean_ctor_get(x_54, 2);
-x_71 = lean_ctor_get(x_54, 3);
-lean_inc(x_71);
-lean_inc(x_70);
-lean_dec(x_54);
-x_72 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_72, 0, x_56);
-lean_ctor_set(x_72, 1, x_57);
-lean_ctor_set(x_72, 2, x_70);
-lean_ctor_set(x_72, 3, x_71);
-x_73 = l___private_Init_Lean_Elab_Command_3__setState(x_72, x_2, x_55);
-if (lean_obj_tag(x_73) == 0)
-{
-lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_73, 1);
-lean_inc(x_74);
-if (lean_is_exclusive(x_73)) {
- lean_ctor_release(x_73, 0);
- lean_ctor_release(x_73, 1);
- x_75 = x_73;
-} else {
- lean_dec_ref(x_73);
- x_75 = lean_box(0);
-}
-if (lean_is_scalar(x_75)) {
- x_76 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_76 = x_75;
- lean_ctor_set_tag(x_76, 1);
-}
-lean_ctor_set(x_76, 0, x_51);
-lean_ctor_set(x_76, 1, x_74);
-return x_76;
-}
-else
-{
-lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-lean_dec(x_51);
-x_77 = lean_ctor_get(x_73, 0);
-lean_inc(x_77);
-x_78 = lean_ctor_get(x_73, 1);
-lean_inc(x_78);
-if (lean_is_exclusive(x_73)) {
- lean_ctor_release(x_73, 0);
- lean_ctor_release(x_73, 1);
- x_79 = x_73;
-} else {
- lean_dec_ref(x_73);
- x_79 = lean_box(0);
-}
-if (lean_is_scalar(x_79)) {
- x_80 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_80 = x_79;
-}
-lean_ctor_set(x_80, 0, x_77);
-lean_ctor_set(x_80, 1, x_78);
-return x_80;
-}
-}
-}
-else
-{
-uint8_t x_81; 
-lean_dec(x_51);
-lean_dec(x_50);
-lean_dec(x_2);
-x_81 = !lean_is_exclusive(x_52);
-if (x_81 == 0)
-{
-return x_52;
-}
-else
-{
-lean_object* x_82; lean_object* x_83; lean_object* x_84; 
-x_82 = lean_ctor_get(x_52, 0);
-x_83 = lean_ctor_get(x_52, 1);
-lean_inc(x_83);
-lean_inc(x_82);
 lean_dec(x_52);
-x_84 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_84, 0, x_82);
-lean_ctor_set(x_84, 1, x_83);
-return x_84;
+x_70 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_70, 0, x_54);
+lean_ctor_set(x_70, 1, x_55);
+lean_ctor_set(x_70, 2, x_68);
+lean_ctor_set(x_70, 3, x_69);
+x_71 = l___private_Init_Lean_Elab_Command_3__setState(x_70, x_2, x_53);
+if (lean_obj_tag(x_71) == 0)
+{
+lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_72 = lean_ctor_get(x_71, 1);
+lean_inc(x_72);
+if (lean_is_exclusive(x_71)) {
+ lean_ctor_release(x_71, 0);
+ lean_ctor_release(x_71, 1);
+ x_73 = x_71;
+} else {
+ lean_dec_ref(x_71);
+ x_73 = lean_box(0);
+}
+if (lean_is_scalar(x_73)) {
+ x_74 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_74 = x_73;
+ lean_ctor_set_tag(x_74, 1);
+}
+lean_ctor_set(x_74, 0, x_49);
+lean_ctor_set(x_74, 1, x_72);
+return x_74;
+}
+else
+{
+lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+lean_dec(x_49);
+x_75 = lean_ctor_get(x_71, 0);
+lean_inc(x_75);
+x_76 = lean_ctor_get(x_71, 1);
+lean_inc(x_76);
+if (lean_is_exclusive(x_71)) {
+ lean_ctor_release(x_71, 0);
+ lean_ctor_release(x_71, 1);
+ x_77 = x_71;
+} else {
+ lean_dec_ref(x_71);
+ x_77 = lean_box(0);
+}
+if (lean_is_scalar(x_77)) {
+ x_78 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_78 = x_77;
+}
+lean_ctor_set(x_78, 0, x_75);
+lean_ctor_set(x_78, 1, x_76);
+return x_78;
 }
 }
 }
 else
 {
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-lean_dec(x_17);
-x_85 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
-x_86 = l_unreachable_x21___rarg(x_85);
-lean_inc(x_2);
-x_87 = lean_apply_2(x_86, x_2, x_8);
-if (lean_obj_tag(x_87) == 0)
-{
-lean_object* x_88; lean_object* x_89; 
-x_88 = lean_ctor_get(x_87, 1);
-lean_inc(x_88);
-lean_dec(x_87);
-x_89 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariables___spec__1(x_12, x_2, x_88);
-lean_dec(x_12);
-return x_89;
-}
-else
-{
-uint8_t x_90; 
-lean_dec(x_12);
+uint8_t x_79; 
+lean_dec(x_49);
+lean_dec(x_48);
 lean_dec(x_2);
-x_90 = !lean_is_exclusive(x_87);
-if (x_90 == 0)
+x_79 = !lean_is_exclusive(x_50);
+if (x_79 == 0)
 {
+return x_50;
+}
+else
+{
+lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_80 = lean_ctor_get(x_50, 0);
+x_81 = lean_ctor_get(x_50, 1);
+lean_inc(x_81);
+lean_inc(x_80);
+lean_dec(x_50);
+x_82 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_82, 0, x_80);
+lean_ctor_set(x_82, 1, x_81);
+return x_82;
+}
+}
+}
+else
+{
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+lean_dec(x_15);
+x_83 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
+x_84 = l_unreachable_x21___rarg(x_83);
+lean_inc(x_2);
+x_85 = lean_apply_2(x_84, x_2, x_11);
+if (lean_obj_tag(x_85) == 0)
+{
+lean_object* x_86; lean_object* x_87; 
+x_86 = lean_ctor_get(x_85, 1);
+lean_inc(x_86);
+lean_dec(x_85);
+x_87 = l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabVariables___spec__1(x_6, x_2, x_86);
+lean_dec(x_6);
 return x_87;
 }
 else
 {
-lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-x_91 = lean_ctor_get(x_87, 0);
-x_92 = lean_ctor_get(x_87, 1);
-lean_inc(x_92);
-lean_inc(x_91);
-lean_dec(x_87);
-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
-{
-uint8_t x_94; 
-lean_dec(x_2);
-x_94 = !lean_is_exclusive(x_6);
-if (x_94 == 0)
-{
-return x_6;
-}
-else
-{
-lean_object* x_95; lean_object* x_96; lean_object* x_97; 
-x_95 = lean_ctor_get(x_6, 0);
-x_96 = lean_ctor_get(x_6, 1);
-lean_inc(x_96);
-lean_inc(x_95);
+uint8_t x_88; 
 lean_dec(x_6);
-x_97 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_97, 0, x_95);
-lean_ctor_set(x_97, 1, x_96);
-return x_97;
+lean_dec(x_2);
+x_88 = !lean_is_exclusive(x_85);
+if (x_88 == 0)
+{
+return x_85;
+}
+else
+{
+lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_89 = lean_ctor_get(x_85, 0);
+x_90 = lean_ctor_get(x_85, 1);
+lean_inc(x_90);
+lean_inc(x_89);
+lean_dec(x_85);
+x_91 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_91, 0, x_89);
+lean_ctor_set(x_91, 1, x_90);
+return x_91;
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_92; 
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_2);
+x_92 = !lean_is_exclusive(x_9);
+if (x_92 == 0)
+{
+return x_9;
+}
+else
+{
+lean_object* x_93; lean_object* x_94; lean_object* x_95; 
+x_93 = lean_ctor_get(x_9, 0);
+x_94 = lean_ctor_get(x_9, 1);
+lean_inc(x_94);
+lean_inc(x_93);
+lean_dec(x_9);
+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;
 }
 }
 }
@@ -15274,7 +14393,7 @@ lean_dec(x_8);
 x_11 = 0;
 x_12 = lean_box(0);
 lean_inc(x_5);
-x_13 = l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(x_11, x_12, x_5, x_10);
+x_13 = l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(x_11, x_12, x_5, x_10);
 if (lean_obj_tag(x_13) == 0)
 {
 lean_object* x_14; lean_object* x_15; 
@@ -15405,424 +14524,419 @@ return x_40;
 lean_object* l_Lean_Elab_Command_elabCheck(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_4 = lean_ctor_get(x_1, 1);
-lean_inc(x_4);
-x_5 = lean_box(0);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = lean_box(0);
+x_7 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabCheck___lambda__1___boxed), 6, 3);
+lean_closure_set(x_7, 0, x_5);
+lean_closure_set(x_7, 1, x_6);
+lean_closure_set(x_7, 2, x_1);
 lean_inc(x_2);
-x_6 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
-if (lean_obj_tag(x_6) == 0)
+x_8 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
+if (lean_obj_tag(x_8) == 0)
 {
-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; 
-x_7 = lean_ctor_get(x_6, 0);
-lean_inc(x_7);
-x_8 = lean_ctor_get(x_6, 1);
-lean_inc(x_8);
-lean_dec(x_6);
-x_9 = l_Lean_stxInh;
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_array_get(x_9, x_4, x_10);
-lean_dec(x_4);
-x_12 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabCheck___lambda__1___boxed), 6, 3);
-lean_closure_set(x_12, 0, x_11);
-lean_closure_set(x_12, 1, x_5);
-lean_closure_set(x_12, 2, x_1);
-x_13 = l___private_Init_Lean_Elab_Command_10__getVarDecls(x_7);
-x_14 = l___private_Init_Lean_Elab_Command_8__mkTermContext(x_2, x_7, x_5);
-x_15 = l___private_Init_Lean_Elab_Command_9__mkTermState(x_7);
-lean_dec(x_7);
-x_16 = l_Lean_Elab_Term_elabBinders___rarg(x_13, x_12, x_14, x_15);
-lean_dec(x_13);
-if (lean_obj_tag(x_16) == 0)
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_9 = lean_ctor_get(x_8, 0);
+lean_inc(x_9);
+x_10 = lean_ctor_get(x_8, 1);
+lean_inc(x_10);
+lean_dec(x_8);
+x_11 = l___private_Init_Lean_Elab_Command_11__getVarDecls(x_9);
+x_12 = l___private_Init_Lean_Elab_Command_9__mkTermContext(x_2, x_9, x_6);
+x_13 = l___private_Init_Lean_Elab_Command_10__mkTermState(x_9);
+lean_dec(x_9);
+x_14 = l_Lean_Elab_Term_elabBinders___rarg(x_11, x_7, x_12, x_13);
+lean_dec(x_11);
+if (lean_obj_tag(x_14) == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-x_18 = lean_ctor_get(x_16, 1);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+lean_inc(x_2);
+x_17 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_10);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
+x_18 = lean_ctor_get(x_16, 0);
 lean_inc(x_18);
-lean_dec(x_16);
-lean_inc(x_2);
-x_19 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_8);
-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; uint8_t x_25; 
-x_20 = lean_ctor_get(x_18, 0);
+x_19 = lean_ctor_get(x_17, 0);
+lean_inc(x_19);
+x_20 = lean_ctor_get(x_17, 1);
 lean_inc(x_20);
-x_21 = lean_ctor_get(x_19, 0);
+lean_dec(x_17);
+x_21 = lean_ctor_get(x_18, 0);
 lean_inc(x_21);
-x_22 = lean_ctor_get(x_19, 1);
+lean_dec(x_18);
+x_22 = lean_ctor_get(x_16, 2);
 lean_inc(x_22);
-lean_dec(x_19);
-x_23 = lean_ctor_get(x_20, 0);
-lean_inc(x_23);
-lean_dec(x_20);
-x_24 = lean_ctor_get(x_18, 2);
-lean_inc(x_24);
-lean_dec(x_18);
-x_25 = !lean_is_exclusive(x_21);
-if (x_25 == 0)
+lean_dec(x_16);
+x_23 = !lean_is_exclusive(x_19);
+if (x_23 == 0)
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_21, 1);
+lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_19, 1);
+lean_dec(x_24);
+x_25 = lean_ctor_get(x_19, 0);
+lean_dec(x_25);
+lean_ctor_set(x_19, 1, x_22);
+lean_ctor_set(x_19, 0, x_21);
+x_26 = l___private_Init_Lean_Elab_Command_3__setState(x_19, x_2, x_20);
+if (lean_obj_tag(x_26) == 0)
+{
+uint8_t x_27; 
+x_27 = !lean_is_exclusive(x_26);
+if (x_27 == 0)
+{
+lean_object* x_28; 
+x_28 = lean_ctor_get(x_26, 0);
+lean_dec(x_28);
+lean_ctor_set(x_26, 0, x_15);
+return x_26;
+}
+else
+{
+lean_object* x_29; lean_object* x_30; 
+x_29 = lean_ctor_get(x_26, 1);
+lean_inc(x_29);
 lean_dec(x_26);
-x_27 = lean_ctor_get(x_21, 0);
-lean_dec(x_27);
-lean_ctor_set(x_21, 1, x_24);
-lean_ctor_set(x_21, 0, x_23);
-x_28 = l___private_Init_Lean_Elab_Command_3__setState(x_21, x_2, x_22);
-if (lean_obj_tag(x_28) == 0)
-{
-uint8_t x_29; 
-x_29 = !lean_is_exclusive(x_28);
-if (x_29 == 0)
-{
-lean_object* x_30; 
-x_30 = lean_ctor_get(x_28, 0);
-lean_dec(x_30);
-lean_ctor_set(x_28, 0, x_17);
-return x_28;
-}
-else
-{
-lean_object* x_31; lean_object* x_32; 
-x_31 = lean_ctor_get(x_28, 1);
-lean_inc(x_31);
-lean_dec(x_28);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_17);
-lean_ctor_set(x_32, 1, x_31);
-return x_32;
+x_30 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_30, 0, x_15);
+lean_ctor_set(x_30, 1, x_29);
+return x_30;
 }
 }
 else
 {
-uint8_t x_33; 
-lean_dec(x_17);
-x_33 = !lean_is_exclusive(x_28);
-if (x_33 == 0)
+uint8_t x_31; 
+lean_dec(x_15);
+x_31 = !lean_is_exclusive(x_26);
+if (x_31 == 0)
 {
-return x_28;
+return x_26;
 }
 else
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_34 = lean_ctor_get(x_28, 0);
-x_35 = lean_ctor_get(x_28, 1);
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_26, 0);
+x_33 = lean_ctor_get(x_26, 1);
+lean_inc(x_33);
+lean_inc(x_32);
+lean_dec(x_26);
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+return x_34;
+}
+}
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_35 = lean_ctor_get(x_19, 2);
+x_36 = lean_ctor_get(x_19, 3);
+lean_inc(x_36);
 lean_inc(x_35);
-lean_inc(x_34);
-lean_dec(x_28);
-x_36 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_36, 0, x_34);
-lean_ctor_set(x_36, 1, x_35);
-return x_36;
-}
-}
-}
-else
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_37 = lean_ctor_get(x_21, 2);
-x_38 = lean_ctor_get(x_21, 3);
-lean_inc(x_38);
-lean_inc(x_37);
-lean_dec(x_21);
-x_39 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_39, 0, x_23);
-lean_ctor_set(x_39, 1, x_24);
-lean_ctor_set(x_39, 2, x_37);
-lean_ctor_set(x_39, 3, x_38);
-x_40 = l___private_Init_Lean_Elab_Command_3__setState(x_39, x_2, x_22);
-if (lean_obj_tag(x_40) == 0)
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-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_40);
- x_42 = lean_box(0);
-}
-if (lean_is_scalar(x_42)) {
- x_43 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_43 = x_42;
-}
-lean_ctor_set(x_43, 0, x_17);
-lean_ctor_set(x_43, 1, x_41);
-return x_43;
-}
-else
-{
-lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-lean_dec(x_17);
-x_44 = lean_ctor_get(x_40, 0);
-lean_inc(x_44);
-x_45 = lean_ctor_get(x_40, 1);
-lean_inc(x_45);
-if (lean_is_exclusive(x_40)) {
- lean_ctor_release(x_40, 0);
- lean_ctor_release(x_40, 1);
- x_46 = x_40;
-} else {
- lean_dec_ref(x_40);
- x_46 = lean_box(0);
-}
-if (lean_is_scalar(x_46)) {
- x_47 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_47 = x_46;
-}
-lean_ctor_set(x_47, 0, x_44);
-lean_ctor_set(x_47, 1, x_45);
-return x_47;
-}
-}
-}
-else
-{
-uint8_t x_48; 
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_2);
-x_48 = !lean_is_exclusive(x_19);
-if (x_48 == 0)
-{
-return x_19;
-}
-else
-{
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_49 = lean_ctor_get(x_19, 0);
-x_50 = lean_ctor_get(x_19, 1);
-lean_inc(x_50);
-lean_inc(x_49);
 lean_dec(x_19);
-x_51 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_51, 0, x_49);
-lean_ctor_set(x_51, 1, x_50);
-return x_51;
+x_37 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_37, 0, x_21);
+lean_ctor_set(x_37, 1, x_22);
+lean_ctor_set(x_37, 2, x_35);
+lean_ctor_set(x_37, 3, x_36);
+x_38 = l___private_Init_Lean_Elab_Command_3__setState(x_37, x_2, x_20);
+if (lean_obj_tag(x_38) == 0)
+{
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_38, 1);
+lean_inc(x_39);
+if (lean_is_exclusive(x_38)) {
+ lean_ctor_release(x_38, 0);
+ lean_ctor_release(x_38, 1);
+ x_40 = x_38;
+} else {
+ lean_dec_ref(x_38);
+ x_40 = lean_box(0);
+}
+if (lean_is_scalar(x_40)) {
+ x_41 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_41 = x_40;
+}
+lean_ctor_set(x_41, 0, x_15);
+lean_ctor_set(x_41, 1, x_39);
+return x_41;
+}
+else
+{
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+lean_dec(x_15);
+x_42 = lean_ctor_get(x_38, 0);
+lean_inc(x_42);
+x_43 = lean_ctor_get(x_38, 1);
+lean_inc(x_43);
+if (lean_is_exclusive(x_38)) {
+ lean_ctor_release(x_38, 0);
+ lean_ctor_release(x_38, 1);
+ x_44 = x_38;
+} else {
+ lean_dec_ref(x_38);
+ x_44 = lean_box(0);
+}
+if (lean_is_scalar(x_44)) {
+ x_45 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_45 = x_44;
+}
+lean_ctor_set(x_45, 0, x_42);
+lean_ctor_set(x_45, 1, x_43);
+return x_45;
 }
 }
 }
 else
 {
-lean_object* x_52; 
-x_52 = lean_ctor_get(x_16, 0);
+uint8_t x_46; 
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_2);
+x_46 = !lean_is_exclusive(x_17);
+if (x_46 == 0)
+{
+return x_17;
+}
+else
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_17, 0);
+x_48 = lean_ctor_get(x_17, 1);
+lean_inc(x_48);
+lean_inc(x_47);
+lean_dec(x_17);
+x_49 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+return x_49;
+}
+}
+}
+else
+{
+lean_object* x_50; 
+x_50 = lean_ctor_get(x_14, 0);
+lean_inc(x_50);
+if (lean_obj_tag(x_50) == 0)
+{
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_14, 1);
+lean_inc(x_51);
+lean_dec(x_14);
+x_52 = lean_ctor_get(x_50, 0);
 lean_inc(x_52);
-if (lean_obj_tag(x_52) == 0)
-{
-lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_53 = lean_ctor_get(x_16, 1);
-lean_inc(x_53);
-lean_dec(x_16);
-x_54 = lean_ctor_get(x_52, 0);
-lean_inc(x_54);
-lean_dec(x_52);
+lean_dec(x_50);
 lean_inc(x_2);
-x_55 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_8);
-if (lean_obj_tag(x_55) == 0)
+x_53 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_10);
+if (lean_obj_tag(x_53) == 0)
 {
-lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; uint8_t x_61; 
-x_56 = lean_ctor_get(x_53, 0);
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; uint8_t x_59; 
+x_54 = lean_ctor_get(x_51, 0);
+lean_inc(x_54);
+x_55 = lean_ctor_get(x_53, 0);
+lean_inc(x_55);
+x_56 = lean_ctor_get(x_53, 1);
 lean_inc(x_56);
-x_57 = lean_ctor_get(x_55, 0);
+lean_dec(x_53);
+x_57 = lean_ctor_get(x_54, 0);
 lean_inc(x_57);
-x_58 = lean_ctor_get(x_55, 1);
+lean_dec(x_54);
+x_58 = lean_ctor_get(x_51, 2);
 lean_inc(x_58);
-lean_dec(x_55);
-x_59 = lean_ctor_get(x_56, 0);
-lean_inc(x_59);
-lean_dec(x_56);
-x_60 = lean_ctor_get(x_53, 2);
-lean_inc(x_60);
-lean_dec(x_53);
-x_61 = !lean_is_exclusive(x_57);
-if (x_61 == 0)
+lean_dec(x_51);
+x_59 = !lean_is_exclusive(x_55);
+if (x_59 == 0)
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_57, 1);
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_55, 1);
+lean_dec(x_60);
+x_61 = lean_ctor_get(x_55, 0);
+lean_dec(x_61);
+lean_ctor_set(x_55, 1, x_58);
+lean_ctor_set(x_55, 0, x_57);
+x_62 = l___private_Init_Lean_Elab_Command_3__setState(x_55, x_2, x_56);
+if (lean_obj_tag(x_62) == 0)
+{
+uint8_t x_63; 
+x_63 = !lean_is_exclusive(x_62);
+if (x_63 == 0)
+{
+lean_object* x_64; 
+x_64 = lean_ctor_get(x_62, 0);
+lean_dec(x_64);
+lean_ctor_set_tag(x_62, 1);
+lean_ctor_set(x_62, 0, x_52);
+return x_62;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; 
+x_65 = lean_ctor_get(x_62, 1);
+lean_inc(x_65);
 lean_dec(x_62);
-x_63 = lean_ctor_get(x_57, 0);
-lean_dec(x_63);
-lean_ctor_set(x_57, 1, x_60);
-lean_ctor_set(x_57, 0, x_59);
-x_64 = l___private_Init_Lean_Elab_Command_3__setState(x_57, x_2, x_58);
-if (lean_obj_tag(x_64) == 0)
-{
-uint8_t x_65; 
-x_65 = !lean_is_exclusive(x_64);
-if (x_65 == 0)
-{
-lean_object* x_66; 
-x_66 = lean_ctor_get(x_64, 0);
-lean_dec(x_66);
-lean_ctor_set_tag(x_64, 1);
-lean_ctor_set(x_64, 0, x_54);
-return x_64;
-}
-else
-{
-lean_object* x_67; lean_object* x_68; 
-x_67 = lean_ctor_get(x_64, 1);
-lean_inc(x_67);
-lean_dec(x_64);
-x_68 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_68, 0, x_54);
-lean_ctor_set(x_68, 1, x_67);
-return x_68;
+x_66 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_66, 0, x_52);
+lean_ctor_set(x_66, 1, x_65);
+return x_66;
 }
 }
 else
 {
-uint8_t x_69; 
-lean_dec(x_54);
-x_69 = !lean_is_exclusive(x_64);
-if (x_69 == 0)
+uint8_t x_67; 
+lean_dec(x_52);
+x_67 = !lean_is_exclusive(x_62);
+if (x_67 == 0)
 {
-return x_64;
+return x_62;
 }
 else
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_70 = lean_ctor_get(x_64, 0);
-x_71 = lean_ctor_get(x_64, 1);
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_62, 0);
+x_69 = lean_ctor_get(x_62, 1);
+lean_inc(x_69);
+lean_inc(x_68);
+lean_dec(x_62);
+x_70 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_70, 0, x_68);
+lean_ctor_set(x_70, 1, x_69);
+return x_70;
+}
+}
+}
+else
+{
+lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_71 = lean_ctor_get(x_55, 2);
+x_72 = lean_ctor_get(x_55, 3);
+lean_inc(x_72);
 lean_inc(x_71);
-lean_inc(x_70);
-lean_dec(x_64);
-x_72 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_72, 0, x_70);
-lean_ctor_set(x_72, 1, x_71);
-return x_72;
-}
-}
-}
-else
-{
-lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_73 = lean_ctor_get(x_57, 2);
-x_74 = lean_ctor_get(x_57, 3);
-lean_inc(x_74);
-lean_inc(x_73);
-lean_dec(x_57);
-x_75 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_75, 0, x_59);
-lean_ctor_set(x_75, 1, x_60);
-lean_ctor_set(x_75, 2, x_73);
-lean_ctor_set(x_75, 3, x_74);
-x_76 = l___private_Init_Lean_Elab_Command_3__setState(x_75, x_2, x_58);
-if (lean_obj_tag(x_76) == 0)
-{
-lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_77 = lean_ctor_get(x_76, 1);
-lean_inc(x_77);
-if (lean_is_exclusive(x_76)) {
- lean_ctor_release(x_76, 0);
- lean_ctor_release(x_76, 1);
- x_78 = x_76;
-} else {
- lean_dec_ref(x_76);
- x_78 = lean_box(0);
-}
-if (lean_is_scalar(x_78)) {
- x_79 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_79 = x_78;
- lean_ctor_set_tag(x_79, 1);
-}
-lean_ctor_set(x_79, 0, x_54);
-lean_ctor_set(x_79, 1, x_77);
-return x_79;
-}
-else
-{
-lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-lean_dec(x_54);
-x_80 = lean_ctor_get(x_76, 0);
-lean_inc(x_80);
-x_81 = lean_ctor_get(x_76, 1);
-lean_inc(x_81);
-if (lean_is_exclusive(x_76)) {
- lean_ctor_release(x_76, 0);
- lean_ctor_release(x_76, 1);
- x_82 = x_76;
-} else {
- lean_dec_ref(x_76);
- x_82 = lean_box(0);
-}
-if (lean_is_scalar(x_82)) {
- x_83 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_83 = x_82;
-}
-lean_ctor_set(x_83, 0, x_80);
-lean_ctor_set(x_83, 1, x_81);
-return x_83;
-}
-}
-}
-else
-{
-uint8_t x_84; 
-lean_dec(x_54);
-lean_dec(x_53);
-lean_dec(x_2);
-x_84 = !lean_is_exclusive(x_55);
-if (x_84 == 0)
-{
-return x_55;
-}
-else
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_55, 0);
-x_86 = lean_ctor_get(x_55, 1);
-lean_inc(x_86);
-lean_inc(x_85);
 lean_dec(x_55);
-x_87 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_87, 0, x_85);
-lean_ctor_set(x_87, 1, x_86);
-return x_87;
+x_73 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_73, 0, x_57);
+lean_ctor_set(x_73, 1, x_58);
+lean_ctor_set(x_73, 2, x_71);
+lean_ctor_set(x_73, 3, x_72);
+x_74 = l___private_Init_Lean_Elab_Command_3__setState(x_73, x_2, x_56);
+if (lean_obj_tag(x_74) == 0)
+{
+lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+x_75 = lean_ctor_get(x_74, 1);
+lean_inc(x_75);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_76 = x_74;
+} else {
+ lean_dec_ref(x_74);
+ x_76 = lean_box(0);
+}
+if (lean_is_scalar(x_76)) {
+ x_77 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_77 = x_76;
+ lean_ctor_set_tag(x_77, 1);
+}
+lean_ctor_set(x_77, 0, x_52);
+lean_ctor_set(x_77, 1, x_75);
+return x_77;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+lean_dec(x_52);
+x_78 = lean_ctor_get(x_74, 0);
+lean_inc(x_78);
+x_79 = lean_ctor_get(x_74, 1);
+lean_inc(x_79);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_80 = x_74;
+} else {
+ lean_dec_ref(x_74);
+ x_80 = lean_box(0);
+}
+if (lean_is_scalar(x_80)) {
+ x_81 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_81 = x_80;
+}
+lean_ctor_set(x_81, 0, x_78);
+lean_ctor_set(x_81, 1, x_79);
+return x_81;
 }
 }
 }
 else
 {
-lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-lean_dec(x_16);
-x_88 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
-x_89 = l_unreachable_x21___rarg(x_88);
-x_90 = lean_apply_2(x_89, x_2, x_8);
-return x_90;
-}
-}
-}
-else
-{
-uint8_t x_91; 
-lean_dec(x_4);
+uint8_t x_82; 
+lean_dec(x_52);
+lean_dec(x_51);
 lean_dec(x_2);
-lean_dec(x_1);
-x_91 = !lean_is_exclusive(x_6);
-if (x_91 == 0)
+x_82 = !lean_is_exclusive(x_53);
+if (x_82 == 0)
 {
-return x_6;
+return x_53;
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_ctor_get(x_6, 0);
-x_93 = lean_ctor_get(x_6, 1);
-lean_inc(x_93);
-lean_inc(x_92);
-lean_dec(x_6);
-x_94 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_94, 0, x_92);
-lean_ctor_set(x_94, 1, x_93);
-return x_94;
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_83 = lean_ctor_get(x_53, 0);
+x_84 = lean_ctor_get(x_53, 1);
+lean_inc(x_84);
+lean_inc(x_83);
+lean_dec(x_53);
+x_85 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_85, 0, x_83);
+lean_ctor_set(x_85, 1, x_84);
+return x_85;
+}
+}
+}
+else
+{
+lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+lean_dec(x_14);
+x_86 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
+x_87 = l_unreachable_x21___rarg(x_86);
+x_88 = lean_apply_2(x_87, x_2, x_10);
+return x_88;
+}
+}
+}
+else
+{
+uint8_t x_89; 
+lean_dec(x_7);
+lean_dec(x_2);
+x_89 = !lean_is_exclusive(x_8);
+if (x_89 == 0)
+{
+return x_8;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_90 = lean_ctor_get(x_8, 0);
+x_91 = lean_ctor_get(x_8, 1);
+lean_inc(x_91);
+lean_inc(x_90);
+lean_dec(x_8);
+x_92 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_92, 0, x_90);
+lean_ctor_set(x_92, 1, x_91);
+return x_92;
 }
 }
 }
@@ -15903,7 +15017,7 @@ lean_dec(x_8);
 x_11 = 0;
 x_12 = lean_box(0);
 lean_inc(x_4);
-x_13 = l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(x_11, x_12, x_4, x_10);
+x_13 = l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(x_11, x_12, x_4, x_10);
 if (lean_obj_tag(x_13) == 0)
 {
 lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
@@ -15922,221 +15036,219 @@ lean_dec(x_15);
 x_19 = !lean_is_exclusive(x_17);
 if (x_19 == 0)
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
 x_20 = lean_ctor_get(x_17, 4);
 x_21 = lean_ctor_get(x_4, 0);
 lean_inc(x_21);
 x_22 = l_Lean_TraceState_Inhabited___closed__1;
 lean_ctor_set(x_17, 4, x_22);
-x_23 = lean_unsigned_to_nat(10000u);
-x_24 = l_Lean_Meta_synthInstance(x_18, x_23, x_21, x_17);
-if (lean_obj_tag(x_24) == 0)
+x_23 = l_Lean_Meta_synthInstance(x_18, x_21, x_17);
+if (lean_obj_tag(x_23) == 0)
 {
-lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; uint8_t x_29; lean_object* x_30; uint8_t x_31; 
-x_25 = lean_ctor_get(x_24, 0);
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; lean_object* x_29; uint8_t x_30; 
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+x_25 = lean_ctor_get(x_23, 1);
 lean_inc(x_25);
-x_26 = lean_ctor_get(x_24, 1);
-lean_inc(x_26);
-lean_dec(x_24);
+lean_dec(x_23);
 lean_inc(x_4);
-x_27 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_26, x_20);
-x_28 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_28, 0, x_25);
-x_29 = 0;
-x_30 = l_Lean_Elab_log___at_Lean_Elab_Term_logTrace___spec__1(x_2, x_29, x_28, x_4, x_27);
+x_26 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_25, x_20);
+x_27 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_27, 0, x_24);
+x_28 = 0;
+x_29 = l_Lean_Elab_log___at_Lean_Elab_Term_logTrace___spec__1(x_2, x_28, x_27, x_4, x_26);
 lean_dec(x_4);
-x_31 = !lean_is_exclusive(x_30);
-if (x_31 == 0)
+x_30 = !lean_is_exclusive(x_29);
+if (x_30 == 0)
 {
-lean_object* x_32; 
-x_32 = lean_ctor_get(x_30, 0);
-lean_dec(x_32);
-lean_ctor_set(x_30, 0, x_12);
-return x_30;
+lean_object* x_31; 
+x_31 = lean_ctor_get(x_29, 0);
+lean_dec(x_31);
+lean_ctor_set(x_29, 0, x_12);
+return x_29;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; 
-x_33 = lean_ctor_get(x_30, 1);
-lean_inc(x_33);
-lean_dec(x_30);
-x_34 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_34, 0, x_12);
-lean_ctor_set(x_34, 1, x_33);
-return x_34;
+lean_object* x_32; lean_object* x_33; 
+x_32 = lean_ctor_get(x_29, 1);
+lean_inc(x_32);
+lean_dec(x_29);
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_12);
+lean_ctor_set(x_33, 1, x_32);
+return x_33;
 }
 }
 else
 {
-uint8_t x_35; 
-x_35 = !lean_is_exclusive(x_24);
-if (x_35 == 0)
+uint8_t x_34; 
+x_34 = !lean_is_exclusive(x_23);
+if (x_34 == 0)
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_36 = lean_ctor_get(x_24, 0);
-x_37 = lean_ctor_get(x_24, 1);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_35 = lean_ctor_get(x_23, 0);
+x_36 = lean_ctor_get(x_23, 1);
 lean_inc(x_4);
-x_38 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_4, x_2, x_36);
-x_39 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_37, x_20);
-lean_ctor_set(x_24, 1, x_39);
-lean_ctor_set(x_24, 0, x_38);
-return x_24;
+x_37 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_4, x_2, x_35);
+x_38 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_36, x_20);
+lean_ctor_set(x_23, 1, x_38);
+lean_ctor_set(x_23, 0, x_37);
+return x_23;
 }
 else
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_40 = lean_ctor_get(x_24, 0);
-x_41 = lean_ctor_get(x_24, 1);
-lean_inc(x_41);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_39 = lean_ctor_get(x_23, 0);
+x_40 = lean_ctor_get(x_23, 1);
 lean_inc(x_40);
-lean_dec(x_24);
+lean_inc(x_39);
+lean_dec(x_23);
 lean_inc(x_4);
-x_42 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_4, x_2, x_40);
-x_43 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_41, x_20);
-x_44 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_44, 0, x_42);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+x_41 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_4, x_2, x_39);
+x_42 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_40, x_20);
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_41);
+lean_ctor_set(x_43, 1, x_42);
+return x_43;
 }
 }
 }
 else
 {
-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_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_45 = lean_ctor_get(x_17, 0);
-x_46 = lean_ctor_get(x_17, 1);
-x_47 = lean_ctor_get(x_17, 2);
-x_48 = lean_ctor_get(x_17, 3);
-x_49 = lean_ctor_get(x_17, 4);
-x_50 = lean_ctor_get(x_17, 5);
-lean_inc(x_50);
+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_52; lean_object* x_53; 
+x_44 = lean_ctor_get(x_17, 0);
+x_45 = lean_ctor_get(x_17, 1);
+x_46 = lean_ctor_get(x_17, 2);
+x_47 = lean_ctor_get(x_17, 3);
+x_48 = lean_ctor_get(x_17, 4);
+x_49 = lean_ctor_get(x_17, 5);
 lean_inc(x_49);
 lean_inc(x_48);
 lean_inc(x_47);
 lean_inc(x_46);
 lean_inc(x_45);
+lean_inc(x_44);
 lean_dec(x_17);
-x_51 = lean_ctor_get(x_4, 0);
-lean_inc(x_51);
-x_52 = l_Lean_TraceState_Inhabited___closed__1;
-x_53 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_53, 0, x_45);
-lean_ctor_set(x_53, 1, x_46);
-lean_ctor_set(x_53, 2, x_47);
-lean_ctor_set(x_53, 3, x_48);
-lean_ctor_set(x_53, 4, x_52);
-lean_ctor_set(x_53, 5, x_50);
-x_54 = lean_unsigned_to_nat(10000u);
-x_55 = l_Lean_Meta_synthInstance(x_18, x_54, x_51, x_53);
-if (lean_obj_tag(x_55) == 0)
+x_50 = lean_ctor_get(x_4, 0);
+lean_inc(x_50);
+x_51 = l_Lean_TraceState_Inhabited___closed__1;
+x_52 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_52, 0, x_44);
+lean_ctor_set(x_52, 1, x_45);
+lean_ctor_set(x_52, 2, x_46);
+lean_ctor_set(x_52, 3, x_47);
+lean_ctor_set(x_52, 4, x_51);
+lean_ctor_set(x_52, 5, x_49);
+x_53 = l_Lean_Meta_synthInstance(x_18, x_50, x_52);
+if (lean_obj_tag(x_53) == 0)
 {
-lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; uint8_t x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-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);
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; uint8_t x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+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);
 lean_inc(x_4);
-x_58 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_57, x_49);
-x_59 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_59, 0, x_56);
-x_60 = 0;
-x_61 = l_Lean_Elab_log___at_Lean_Elab_Term_logTrace___spec__1(x_2, x_60, x_59, x_4, x_58);
+x_56 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_55, x_48);
+x_57 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_57, 0, x_54);
+x_58 = 0;
+x_59 = l_Lean_Elab_log___at_Lean_Elab_Term_logTrace___spec__1(x_2, x_58, x_57, x_4, x_56);
 lean_dec(x_4);
-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;
+x_60 = lean_ctor_get(x_59, 1);
+lean_inc(x_60);
+if (lean_is_exclusive(x_59)) {
+ lean_ctor_release(x_59, 0);
+ lean_ctor_release(x_59, 1);
+ x_61 = x_59;
 } else {
- lean_dec_ref(x_61);
- x_63 = lean_box(0);
+ lean_dec_ref(x_59);
+ x_61 = lean_box(0);
 }
-if (lean_is_scalar(x_63)) {
- x_64 = lean_alloc_ctor(0, 2, 0);
+if (lean_is_scalar(x_61)) {
+ x_62 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_64 = x_63;
+ x_62 = x_61;
 }
-lean_ctor_set(x_64, 0, x_12);
-lean_ctor_set(x_64, 1, x_62);
-return x_64;
+lean_ctor_set(x_62, 0, x_12);
+lean_ctor_set(x_62, 1, x_60);
+return x_62;
 }
 else
 {
-lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_65 = lean_ctor_get(x_55, 0);
-lean_inc(x_65);
-x_66 = lean_ctor_get(x_55, 1);
-lean_inc(x_66);
-if (lean_is_exclusive(x_55)) {
- lean_ctor_release(x_55, 0);
- lean_ctor_release(x_55, 1);
- x_67 = x_55;
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; 
+x_63 = lean_ctor_get(x_53, 0);
+lean_inc(x_63);
+x_64 = lean_ctor_get(x_53, 1);
+lean_inc(x_64);
+if (lean_is_exclusive(x_53)) {
+ lean_ctor_release(x_53, 0);
+ lean_ctor_release(x_53, 1);
+ x_65 = x_53;
 } else {
- lean_dec_ref(x_55);
- x_67 = lean_box(0);
+ lean_dec_ref(x_53);
+ x_65 = lean_box(0);
 }
 lean_inc(x_4);
-x_68 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_4, x_2, x_65);
-x_69 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_66, x_49);
-if (lean_is_scalar(x_67)) {
- x_70 = lean_alloc_ctor(1, 2, 0);
+x_66 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_4, x_2, x_63);
+x_67 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_2, x_4, x_16, x_64, x_48);
+if (lean_is_scalar(x_65)) {
+ x_68 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_70 = x_67;
+ x_68 = x_65;
 }
-lean_ctor_set(x_70, 0, x_68);
-lean_ctor_set(x_70, 1, x_69);
-return x_70;
+lean_ctor_set(x_68, 0, x_66);
+lean_ctor_set(x_68, 1, x_67);
+return x_68;
 }
 }
 }
 else
 {
-uint8_t x_71; 
+uint8_t x_69; 
 lean_dec(x_9);
 lean_dec(x_4);
-x_71 = !lean_is_exclusive(x_13);
-if (x_71 == 0)
+x_69 = !lean_is_exclusive(x_13);
+if (x_69 == 0)
 {
 return x_13;
 }
 else
 {
-lean_object* x_72; lean_object* x_73; lean_object* x_74; 
-x_72 = lean_ctor_get(x_13, 0);
-x_73 = lean_ctor_get(x_13, 1);
-lean_inc(x_73);
-lean_inc(x_72);
+lean_object* x_70; lean_object* x_71; lean_object* x_72; 
+x_70 = lean_ctor_get(x_13, 0);
+x_71 = lean_ctor_get(x_13, 1);
+lean_inc(x_71);
+lean_inc(x_70);
 lean_dec(x_13);
-x_74 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_74, 0, x_72);
-lean_ctor_set(x_74, 1, x_73);
-return x_74;
+x_72 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_71);
+return x_72;
 }
 }
 }
 else
 {
-uint8_t x_75; 
+uint8_t x_73; 
 lean_dec(x_4);
-x_75 = !lean_is_exclusive(x_8);
-if (x_75 == 0)
+x_73 = !lean_is_exclusive(x_8);
+if (x_73 == 0)
 {
 return x_8;
 }
 else
 {
-lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_76 = lean_ctor_get(x_8, 0);
-x_77 = lean_ctor_get(x_8, 1);
-lean_inc(x_77);
-lean_inc(x_76);
+lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_74 = lean_ctor_get(x_8, 0);
+x_75 = lean_ctor_get(x_8, 1);
+lean_inc(x_75);
+lean_inc(x_74);
 lean_dec(x_8);
-x_78 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_78, 0, x_76);
-lean_ctor_set(x_78, 1, x_77);
-return x_78;
+x_76 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_76, 0, x_74);
+lean_ctor_set(x_76, 1, x_75);
+return x_76;
 }
 }
 }
@@ -16172,423 +15284,418 @@ return x_2;
 lean_object* l_Lean_Elab_Command_elabSynth(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; 
-x_4 = lean_ctor_get(x_1, 1);
-lean_inc(x_4);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabSynth___lambda__1___boxed), 5, 2);
+lean_closure_set(x_6, 0, x_5);
+lean_closure_set(x_6, 1, x_1);
 lean_inc(x_2);
-x_5 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
-if (lean_obj_tag(x_5) == 0)
+x_7 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_3);
+if (lean_obj_tag(x_7) == 0)
 {
-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; 
-x_6 = lean_ctor_get(x_5, 0);
-lean_inc(x_6);
-x_7 = lean_ctor_get(x_5, 1);
-lean_inc(x_7);
-lean_dec(x_5);
-x_8 = l_Lean_stxInh;
-x_9 = lean_unsigned_to_nat(1u);
-x_10 = lean_array_get(x_8, x_4, x_9);
-lean_dec(x_4);
-x_11 = lean_alloc_closure((void*)(l_Lean_Elab_Command_elabSynth___lambda__1___boxed), 5, 2);
-lean_closure_set(x_11, 0, x_10);
-lean_closure_set(x_11, 1, x_1);
-x_12 = l___private_Init_Lean_Elab_Command_10__getVarDecls(x_6);
-x_13 = l_Lean_Elab_Command_elabSynth___closed__3;
-x_14 = l___private_Init_Lean_Elab_Command_8__mkTermContext(x_2, x_6, x_13);
-x_15 = l___private_Init_Lean_Elab_Command_9__mkTermState(x_6);
-lean_dec(x_6);
-x_16 = l_Lean_Elab_Term_elabBinders___rarg(x_12, x_11, x_14, x_15);
-lean_dec(x_12);
-if (lean_obj_tag(x_16) == 0)
+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; 
+x_8 = lean_ctor_get(x_7, 0);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_7, 1);
+lean_inc(x_9);
+lean_dec(x_7);
+x_10 = l___private_Init_Lean_Elab_Command_11__getVarDecls(x_8);
+x_11 = l_Lean_Elab_Command_elabSynth___closed__3;
+x_12 = l___private_Init_Lean_Elab_Command_9__mkTermContext(x_2, x_8, x_11);
+x_13 = l___private_Init_Lean_Elab_Command_10__mkTermState(x_8);
+lean_dec(x_8);
+x_14 = l_Lean_Elab_Term_elabBinders___rarg(x_10, x_6, x_12, x_13);
+lean_dec(x_10);
+if (lean_obj_tag(x_14) == 0)
 {
-lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-x_18 = lean_ctor_get(x_16, 1);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+lean_inc(x_2);
+x_17 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_9);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
+x_18 = lean_ctor_get(x_16, 0);
 lean_inc(x_18);
-lean_dec(x_16);
-lean_inc(x_2);
-x_19 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_7);
-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; uint8_t x_25; 
-x_20 = lean_ctor_get(x_18, 0);
+x_19 = lean_ctor_get(x_17, 0);
+lean_inc(x_19);
+x_20 = lean_ctor_get(x_17, 1);
 lean_inc(x_20);
-x_21 = lean_ctor_get(x_19, 0);
+lean_dec(x_17);
+x_21 = lean_ctor_get(x_18, 0);
 lean_inc(x_21);
-x_22 = lean_ctor_get(x_19, 1);
+lean_dec(x_18);
+x_22 = lean_ctor_get(x_16, 2);
 lean_inc(x_22);
-lean_dec(x_19);
-x_23 = lean_ctor_get(x_20, 0);
-lean_inc(x_23);
-lean_dec(x_20);
-x_24 = lean_ctor_get(x_18, 2);
-lean_inc(x_24);
-lean_dec(x_18);
-x_25 = !lean_is_exclusive(x_21);
-if (x_25 == 0)
+lean_dec(x_16);
+x_23 = !lean_is_exclusive(x_19);
+if (x_23 == 0)
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_21, 1);
+lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_19, 1);
+lean_dec(x_24);
+x_25 = lean_ctor_get(x_19, 0);
+lean_dec(x_25);
+lean_ctor_set(x_19, 1, x_22);
+lean_ctor_set(x_19, 0, x_21);
+x_26 = l___private_Init_Lean_Elab_Command_3__setState(x_19, x_2, x_20);
+if (lean_obj_tag(x_26) == 0)
+{
+uint8_t x_27; 
+x_27 = !lean_is_exclusive(x_26);
+if (x_27 == 0)
+{
+lean_object* x_28; 
+x_28 = lean_ctor_get(x_26, 0);
+lean_dec(x_28);
+lean_ctor_set(x_26, 0, x_15);
+return x_26;
+}
+else
+{
+lean_object* x_29; lean_object* x_30; 
+x_29 = lean_ctor_get(x_26, 1);
+lean_inc(x_29);
 lean_dec(x_26);
-x_27 = lean_ctor_get(x_21, 0);
-lean_dec(x_27);
-lean_ctor_set(x_21, 1, x_24);
-lean_ctor_set(x_21, 0, x_23);
-x_28 = l___private_Init_Lean_Elab_Command_3__setState(x_21, x_2, x_22);
-if (lean_obj_tag(x_28) == 0)
-{
-uint8_t x_29; 
-x_29 = !lean_is_exclusive(x_28);
-if (x_29 == 0)
-{
-lean_object* x_30; 
-x_30 = lean_ctor_get(x_28, 0);
-lean_dec(x_30);
-lean_ctor_set(x_28, 0, x_17);
-return x_28;
-}
-else
-{
-lean_object* x_31; lean_object* x_32; 
-x_31 = lean_ctor_get(x_28, 1);
-lean_inc(x_31);
-lean_dec(x_28);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_17);
-lean_ctor_set(x_32, 1, x_31);
-return x_32;
+x_30 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_30, 0, x_15);
+lean_ctor_set(x_30, 1, x_29);
+return x_30;
 }
 }
 else
 {
-uint8_t x_33; 
-lean_dec(x_17);
-x_33 = !lean_is_exclusive(x_28);
-if (x_33 == 0)
+uint8_t x_31; 
+lean_dec(x_15);
+x_31 = !lean_is_exclusive(x_26);
+if (x_31 == 0)
 {
-return x_28;
+return x_26;
 }
 else
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_34 = lean_ctor_get(x_28, 0);
-x_35 = lean_ctor_get(x_28, 1);
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_26, 0);
+x_33 = lean_ctor_get(x_26, 1);
+lean_inc(x_33);
+lean_inc(x_32);
+lean_dec(x_26);
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+return x_34;
+}
+}
+}
+else
+{
+lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_35 = lean_ctor_get(x_19, 2);
+x_36 = lean_ctor_get(x_19, 3);
+lean_inc(x_36);
 lean_inc(x_35);
-lean_inc(x_34);
-lean_dec(x_28);
-x_36 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_36, 0, x_34);
-lean_ctor_set(x_36, 1, x_35);
-return x_36;
-}
-}
-}
-else
-{
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_37 = lean_ctor_get(x_21, 2);
-x_38 = lean_ctor_get(x_21, 3);
-lean_inc(x_38);
-lean_inc(x_37);
-lean_dec(x_21);
-x_39 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_39, 0, x_23);
-lean_ctor_set(x_39, 1, x_24);
-lean_ctor_set(x_39, 2, x_37);
-lean_ctor_set(x_39, 3, x_38);
-x_40 = l___private_Init_Lean_Elab_Command_3__setState(x_39, x_2, x_22);
-if (lean_obj_tag(x_40) == 0)
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-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_40);
- x_42 = lean_box(0);
-}
-if (lean_is_scalar(x_42)) {
- x_43 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_43 = x_42;
-}
-lean_ctor_set(x_43, 0, x_17);
-lean_ctor_set(x_43, 1, x_41);
-return x_43;
-}
-else
-{
-lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-lean_dec(x_17);
-x_44 = lean_ctor_get(x_40, 0);
-lean_inc(x_44);
-x_45 = lean_ctor_get(x_40, 1);
-lean_inc(x_45);
-if (lean_is_exclusive(x_40)) {
- lean_ctor_release(x_40, 0);
- lean_ctor_release(x_40, 1);
- x_46 = x_40;
-} else {
- lean_dec_ref(x_40);
- x_46 = lean_box(0);
-}
-if (lean_is_scalar(x_46)) {
- x_47 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_47 = x_46;
-}
-lean_ctor_set(x_47, 0, x_44);
-lean_ctor_set(x_47, 1, x_45);
-return x_47;
-}
-}
-}
-else
-{
-uint8_t x_48; 
-lean_dec(x_18);
-lean_dec(x_17);
-lean_dec(x_2);
-x_48 = !lean_is_exclusive(x_19);
-if (x_48 == 0)
-{
-return x_19;
-}
-else
-{
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_49 = lean_ctor_get(x_19, 0);
-x_50 = lean_ctor_get(x_19, 1);
-lean_inc(x_50);
-lean_inc(x_49);
 lean_dec(x_19);
-x_51 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_51, 0, x_49);
-lean_ctor_set(x_51, 1, x_50);
-return x_51;
+x_37 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_37, 0, x_21);
+lean_ctor_set(x_37, 1, x_22);
+lean_ctor_set(x_37, 2, x_35);
+lean_ctor_set(x_37, 3, x_36);
+x_38 = l___private_Init_Lean_Elab_Command_3__setState(x_37, x_2, x_20);
+if (lean_obj_tag(x_38) == 0)
+{
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_38, 1);
+lean_inc(x_39);
+if (lean_is_exclusive(x_38)) {
+ lean_ctor_release(x_38, 0);
+ lean_ctor_release(x_38, 1);
+ x_40 = x_38;
+} else {
+ lean_dec_ref(x_38);
+ x_40 = lean_box(0);
+}
+if (lean_is_scalar(x_40)) {
+ x_41 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_41 = x_40;
+}
+lean_ctor_set(x_41, 0, x_15);
+lean_ctor_set(x_41, 1, x_39);
+return x_41;
+}
+else
+{
+lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+lean_dec(x_15);
+x_42 = lean_ctor_get(x_38, 0);
+lean_inc(x_42);
+x_43 = lean_ctor_get(x_38, 1);
+lean_inc(x_43);
+if (lean_is_exclusive(x_38)) {
+ lean_ctor_release(x_38, 0);
+ lean_ctor_release(x_38, 1);
+ x_44 = x_38;
+} else {
+ lean_dec_ref(x_38);
+ x_44 = lean_box(0);
+}
+if (lean_is_scalar(x_44)) {
+ x_45 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_45 = x_44;
+}
+lean_ctor_set(x_45, 0, x_42);
+lean_ctor_set(x_45, 1, x_43);
+return x_45;
 }
 }
 }
 else
 {
-lean_object* x_52; 
-x_52 = lean_ctor_get(x_16, 0);
+uint8_t x_46; 
+lean_dec(x_16);
+lean_dec(x_15);
+lean_dec(x_2);
+x_46 = !lean_is_exclusive(x_17);
+if (x_46 == 0)
+{
+return x_17;
+}
+else
+{
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_17, 0);
+x_48 = lean_ctor_get(x_17, 1);
+lean_inc(x_48);
+lean_inc(x_47);
+lean_dec(x_17);
+x_49 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+return x_49;
+}
+}
+}
+else
+{
+lean_object* x_50; 
+x_50 = lean_ctor_get(x_14, 0);
+lean_inc(x_50);
+if (lean_obj_tag(x_50) == 0)
+{
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_14, 1);
+lean_inc(x_51);
+lean_dec(x_14);
+x_52 = lean_ctor_get(x_50, 0);
 lean_inc(x_52);
-if (lean_obj_tag(x_52) == 0)
-{
-lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_53 = lean_ctor_get(x_16, 1);
-lean_inc(x_53);
-lean_dec(x_16);
-x_54 = lean_ctor_get(x_52, 0);
-lean_inc(x_54);
-lean_dec(x_52);
+lean_dec(x_50);
 lean_inc(x_2);
-x_55 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_7);
-if (lean_obj_tag(x_55) == 0)
+x_53 = l___private_Init_Lean_Elab_Command_2__getState(x_2, x_9);
+if (lean_obj_tag(x_53) == 0)
 {
-lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; uint8_t x_61; 
-x_56 = lean_ctor_get(x_53, 0);
+lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; uint8_t x_59; 
+x_54 = lean_ctor_get(x_51, 0);
+lean_inc(x_54);
+x_55 = lean_ctor_get(x_53, 0);
+lean_inc(x_55);
+x_56 = lean_ctor_get(x_53, 1);
 lean_inc(x_56);
-x_57 = lean_ctor_get(x_55, 0);
+lean_dec(x_53);
+x_57 = lean_ctor_get(x_54, 0);
 lean_inc(x_57);
-x_58 = lean_ctor_get(x_55, 1);
+lean_dec(x_54);
+x_58 = lean_ctor_get(x_51, 2);
 lean_inc(x_58);
-lean_dec(x_55);
-x_59 = lean_ctor_get(x_56, 0);
-lean_inc(x_59);
-lean_dec(x_56);
-x_60 = lean_ctor_get(x_53, 2);
-lean_inc(x_60);
-lean_dec(x_53);
-x_61 = !lean_is_exclusive(x_57);
-if (x_61 == 0)
+lean_dec(x_51);
+x_59 = !lean_is_exclusive(x_55);
+if (x_59 == 0)
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; 
-x_62 = lean_ctor_get(x_57, 1);
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_55, 1);
+lean_dec(x_60);
+x_61 = lean_ctor_get(x_55, 0);
+lean_dec(x_61);
+lean_ctor_set(x_55, 1, x_58);
+lean_ctor_set(x_55, 0, x_57);
+x_62 = l___private_Init_Lean_Elab_Command_3__setState(x_55, x_2, x_56);
+if (lean_obj_tag(x_62) == 0)
+{
+uint8_t x_63; 
+x_63 = !lean_is_exclusive(x_62);
+if (x_63 == 0)
+{
+lean_object* x_64; 
+x_64 = lean_ctor_get(x_62, 0);
+lean_dec(x_64);
+lean_ctor_set_tag(x_62, 1);
+lean_ctor_set(x_62, 0, x_52);
+return x_62;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; 
+x_65 = lean_ctor_get(x_62, 1);
+lean_inc(x_65);
 lean_dec(x_62);
-x_63 = lean_ctor_get(x_57, 0);
-lean_dec(x_63);
-lean_ctor_set(x_57, 1, x_60);
-lean_ctor_set(x_57, 0, x_59);
-x_64 = l___private_Init_Lean_Elab_Command_3__setState(x_57, x_2, x_58);
-if (lean_obj_tag(x_64) == 0)
-{
-uint8_t x_65; 
-x_65 = !lean_is_exclusive(x_64);
-if (x_65 == 0)
-{
-lean_object* x_66; 
-x_66 = lean_ctor_get(x_64, 0);
-lean_dec(x_66);
-lean_ctor_set_tag(x_64, 1);
-lean_ctor_set(x_64, 0, x_54);
-return x_64;
-}
-else
-{
-lean_object* x_67; lean_object* x_68; 
-x_67 = lean_ctor_get(x_64, 1);
-lean_inc(x_67);
-lean_dec(x_64);
-x_68 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_68, 0, x_54);
-lean_ctor_set(x_68, 1, x_67);
-return x_68;
+x_66 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_66, 0, x_52);
+lean_ctor_set(x_66, 1, x_65);
+return x_66;
 }
 }
 else
 {
-uint8_t x_69; 
-lean_dec(x_54);
-x_69 = !lean_is_exclusive(x_64);
-if (x_69 == 0)
+uint8_t x_67; 
+lean_dec(x_52);
+x_67 = !lean_is_exclusive(x_62);
+if (x_67 == 0)
 {
-return x_64;
+return x_62;
 }
 else
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; 
-x_70 = lean_ctor_get(x_64, 0);
-x_71 = lean_ctor_get(x_64, 1);
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_62, 0);
+x_69 = lean_ctor_get(x_62, 1);
+lean_inc(x_69);
+lean_inc(x_68);
+lean_dec(x_62);
+x_70 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_70, 0, x_68);
+lean_ctor_set(x_70, 1, x_69);
+return x_70;
+}
+}
+}
+else
+{
+lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_71 = lean_ctor_get(x_55, 2);
+x_72 = lean_ctor_get(x_55, 3);
+lean_inc(x_72);
 lean_inc(x_71);
-lean_inc(x_70);
-lean_dec(x_64);
-x_72 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_72, 0, x_70);
-lean_ctor_set(x_72, 1, x_71);
-return x_72;
-}
-}
-}
-else
-{
-lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_73 = lean_ctor_get(x_57, 2);
-x_74 = lean_ctor_get(x_57, 3);
-lean_inc(x_74);
-lean_inc(x_73);
-lean_dec(x_57);
-x_75 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_75, 0, x_59);
-lean_ctor_set(x_75, 1, x_60);
-lean_ctor_set(x_75, 2, x_73);
-lean_ctor_set(x_75, 3, x_74);
-x_76 = l___private_Init_Lean_Elab_Command_3__setState(x_75, x_2, x_58);
-if (lean_obj_tag(x_76) == 0)
-{
-lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_77 = lean_ctor_get(x_76, 1);
-lean_inc(x_77);
-if (lean_is_exclusive(x_76)) {
- lean_ctor_release(x_76, 0);
- lean_ctor_release(x_76, 1);
- x_78 = x_76;
-} else {
- lean_dec_ref(x_76);
- x_78 = lean_box(0);
-}
-if (lean_is_scalar(x_78)) {
- x_79 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_79 = x_78;
- lean_ctor_set_tag(x_79, 1);
-}
-lean_ctor_set(x_79, 0, x_54);
-lean_ctor_set(x_79, 1, x_77);
-return x_79;
-}
-else
-{
-lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
-lean_dec(x_54);
-x_80 = lean_ctor_get(x_76, 0);
-lean_inc(x_80);
-x_81 = lean_ctor_get(x_76, 1);
-lean_inc(x_81);
-if (lean_is_exclusive(x_76)) {
- lean_ctor_release(x_76, 0);
- lean_ctor_release(x_76, 1);
- x_82 = x_76;
-} else {
- lean_dec_ref(x_76);
- x_82 = lean_box(0);
-}
-if (lean_is_scalar(x_82)) {
- x_83 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_83 = x_82;
-}
-lean_ctor_set(x_83, 0, x_80);
-lean_ctor_set(x_83, 1, x_81);
-return x_83;
-}
-}
-}
-else
-{
-uint8_t x_84; 
-lean_dec(x_54);
-lean_dec(x_53);
-lean_dec(x_2);
-x_84 = !lean_is_exclusive(x_55);
-if (x_84 == 0)
-{
-return x_55;
-}
-else
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_55, 0);
-x_86 = lean_ctor_get(x_55, 1);
-lean_inc(x_86);
-lean_inc(x_85);
 lean_dec(x_55);
-x_87 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_87, 0, x_85);
-lean_ctor_set(x_87, 1, x_86);
-return x_87;
+x_73 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_73, 0, x_57);
+lean_ctor_set(x_73, 1, x_58);
+lean_ctor_set(x_73, 2, x_71);
+lean_ctor_set(x_73, 3, x_72);
+x_74 = l___private_Init_Lean_Elab_Command_3__setState(x_73, x_2, x_56);
+if (lean_obj_tag(x_74) == 0)
+{
+lean_object* x_75; lean_object* x_76; lean_object* x_77; 
+x_75 = lean_ctor_get(x_74, 1);
+lean_inc(x_75);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_76 = x_74;
+} else {
+ lean_dec_ref(x_74);
+ x_76 = lean_box(0);
+}
+if (lean_is_scalar(x_76)) {
+ x_77 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_77 = x_76;
+ lean_ctor_set_tag(x_77, 1);
+}
+lean_ctor_set(x_77, 0, x_52);
+lean_ctor_set(x_77, 1, x_75);
+return x_77;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+lean_dec(x_52);
+x_78 = lean_ctor_get(x_74, 0);
+lean_inc(x_78);
+x_79 = lean_ctor_get(x_74, 1);
+lean_inc(x_79);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_80 = x_74;
+} else {
+ lean_dec_ref(x_74);
+ x_80 = lean_box(0);
+}
+if (lean_is_scalar(x_80)) {
+ x_81 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_81 = x_80;
+}
+lean_ctor_set(x_81, 0, x_78);
+lean_ctor_set(x_81, 1, x_79);
+return x_81;
 }
 }
 }
 else
 {
-lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-lean_dec(x_16);
-x_88 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
-x_89 = l_unreachable_x21___rarg(x_88);
-x_90 = lean_apply_2(x_89, x_2, x_7);
-return x_90;
-}
-}
-}
-else
-{
-uint8_t x_91; 
-lean_dec(x_4);
+uint8_t x_82; 
+lean_dec(x_52);
+lean_dec(x_51);
 lean_dec(x_2);
-lean_dec(x_1);
-x_91 = !lean_is_exclusive(x_5);
-if (x_91 == 0)
+x_82 = !lean_is_exclusive(x_53);
+if (x_82 == 0)
 {
-return x_5;
+return x_53;
 }
 else
 {
-lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_ctor_get(x_5, 0);
-x_93 = lean_ctor_get(x_5, 1);
-lean_inc(x_93);
-lean_inc(x_92);
-lean_dec(x_5);
-x_94 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_94, 0, x_92);
-lean_ctor_set(x_94, 1, x_93);
-return x_94;
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_83 = lean_ctor_get(x_53, 0);
+x_84 = lean_ctor_get(x_53, 1);
+lean_inc(x_84);
+lean_inc(x_83);
+lean_dec(x_53);
+x_85 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_85, 0, x_83);
+lean_ctor_set(x_85, 1, x_84);
+return x_85;
+}
+}
+}
+else
+{
+lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+lean_dec(x_14);
+x_86 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
+x_87 = l_unreachable_x21___rarg(x_86);
+x_88 = lean_apply_2(x_87, x_2, x_9);
+return x_88;
+}
+}
+}
+else
+{
+uint8_t x_89; 
+lean_dec(x_6);
+lean_dec(x_2);
+x_89 = !lean_is_exclusive(x_7);
+if (x_89 == 0)
+{
+return x_7;
+}
+else
+{
+lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_90 = lean_ctor_get(x_7, 0);
+x_91 = lean_ctor_get(x_7, 1);
+lean_inc(x_91);
+lean_inc(x_90);
+lean_dec(x_7);
+x_92 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_92, 0, x_90);
+lean_ctor_set(x_92, 1, x_91);
+return x_92;
 }
 }
 }
@@ -17833,27 +16940,31 @@ lean_dec(x_2);
 x_18 = !lean_is_exclusive(x_6);
 if (x_18 == 0)
 {
-lean_object* x_19; lean_object* x_20; 
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
 x_19 = lean_ctor_get(x_6, 0);
 x_20 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_4, x_1, x_19);
 lean_dec(x_1);
-lean_ctor_set(x_6, 0, x_20);
+x_21 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_6, 0, x_21);
 return x_6;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_21 = lean_ctor_get(x_6, 0);
-x_22 = lean_ctor_get(x_6, 1);
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_22 = lean_ctor_get(x_6, 0);
+x_23 = lean_ctor_get(x_6, 1);
+lean_inc(x_23);
 lean_inc(x_22);
-lean_inc(x_21);
 lean_dec(x_6);
-x_23 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_4, x_1, x_21);
+x_24 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_4, x_1, x_22);
 lean_dec(x_1);
-x_24 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_24, 0, x_23);
-lean_ctor_set(x_24, 1, x_22);
-return x_24;
+x_25 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_25, 0, x_24);
+x_26 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_26, 0, x_25);
+lean_ctor_set(x_26, 1, x_23);
+return x_26;
 }
 }
 }
@@ -17889,123 +17000,117 @@ return x_2;
 lean_object* l_Lean_Elab_Command_elabSetOption(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_24; 
-x_4 = lean_ctor_get(x_1, 1);
-lean_inc(x_4);
-x_5 = l_Lean_stxInh;
-x_6 = lean_unsigned_to_nat(1u);
-x_7 = lean_array_get(x_5, x_4, x_6);
-x_8 = l_Lean_Syntax_getId(x_7);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_21; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getIdAt(x_1, x_4);
+x_6 = lean_unsigned_to_nat(2u);
+x_7 = l_Lean_Syntax_getArg(x_1, x_6);
+x_21 = l_Lean_Syntax_isStrLit_x3f(x_7);
+if (lean_obj_tag(x_21) == 0)
+{
+lean_object* x_22; lean_object* x_23; 
+x_22 = l_Lean_numLitKind;
+x_23 = l_Lean_Syntax_isNatLitAux(x_22, x_7);
+if (lean_obj_tag(x_23) == 0)
+{
+if (lean_obj_tag(x_7) == 2)
+{
+lean_object* x_24; lean_object* x_25; uint8_t x_26; 
+x_24 = lean_ctor_get(x_7, 1);
+lean_inc(x_24);
+x_25 = l_Bool_HasRepr___closed__2;
+x_26 = lean_string_dec_eq(x_24, x_25);
+if (x_26 == 0)
+{
+lean_object* x_27; uint8_t x_28; 
+x_27 = l_Bool_HasRepr___closed__1;
+x_28 = lean_string_dec_eq(x_24, x_27);
+lean_dec(x_24);
+if (x_28 == 0)
+{
+lean_object* x_29; 
+lean_dec(x_5);
+lean_dec(x_1);
+x_29 = lean_box(0);
+x_8 = x_29;
+goto block_20;
+}
+else
+{
+lean_object* x_30; lean_object* x_31; 
 lean_dec(x_7);
-x_9 = lean_unsigned_to_nat(2u);
-x_10 = lean_array_get(x_5, x_4, x_9);
-lean_dec(x_4);
-x_24 = l_Lean_Syntax_isStrLit_x3f(x_10);
-if (lean_obj_tag(x_24) == 0)
+x_30 = l_Lean_registerTraceClass___closed__1;
+x_31 = l_Lean_Elab_Command_setOption(x_1, x_5, x_30, x_2, x_3);
+return x_31;
+}
+}
+else
 {
-lean_object* x_25; lean_object* x_26; 
-x_25 = l_Lean_numLitKind;
-x_26 = l_Lean_Syntax_isNatLitAux(x_25, x_10);
-if (lean_obj_tag(x_26) == 0)
+lean_object* x_32; lean_object* x_33; 
+lean_dec(x_24);
+lean_dec(x_7);
+x_32 = l_Lean_verboseOption___closed__3;
+x_33 = l_Lean_Elab_Command_setOption(x_1, x_5, x_32, x_2, x_3);
+return x_33;
+}
+}
+else
 {
-if (lean_obj_tag(x_10) == 2)
-{
-lean_object* x_27; lean_object* x_28; uint8_t x_29; 
-x_27 = lean_ctor_get(x_10, 1);
-lean_inc(x_27);
-x_28 = l_Bool_HasRepr___closed__2;
-x_29 = lean_string_dec_eq(x_27, x_28);
-if (x_29 == 0)
-{
-lean_object* x_30; uint8_t x_31; 
-x_30 = l_Bool_HasRepr___closed__1;
-x_31 = lean_string_dec_eq(x_27, x_30);
-lean_dec(x_27);
-if (x_31 == 0)
-{
-lean_object* x_32; 
-lean_dec(x_8);
+lean_object* x_34; 
+lean_dec(x_5);
 lean_dec(x_1);
-x_32 = lean_box(0);
-x_11 = x_32;
-goto block_23;
-}
-else
-{
-lean_object* x_33; lean_object* x_34; 
-lean_dec(x_10);
-x_33 = l_Lean_registerTraceClass___closed__1;
-x_34 = l_Lean_Elab_Command_setOption(x_1, x_8, x_33, x_2, x_3);
-return x_34;
+x_34 = lean_box(0);
+x_8 = x_34;
+goto block_20;
 }
 }
 else
 {
-lean_object* x_35; lean_object* x_36; 
-lean_dec(x_27);
-lean_dec(x_10);
-x_35 = l_Lean_verboseOption___closed__3;
-x_36 = l_Lean_Elab_Command_setOption(x_1, x_8, x_35, x_2, x_3);
-return x_36;
-}
-}
-else
-{
-lean_object* x_37; 
-lean_dec(x_8);
-lean_dec(x_1);
-x_37 = lean_box(0);
-x_11 = x_37;
-goto block_23;
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+lean_dec(x_7);
+x_35 = lean_ctor_get(x_23, 0);
+lean_inc(x_35);
+lean_dec(x_23);
+x_36 = lean_alloc_ctor(3, 1, 0);
+lean_ctor_set(x_36, 0, x_35);
+x_37 = l_Lean_Elab_Command_setOption(x_1, x_5, x_36, x_2, x_3);
+return x_37;
 }
 }
 else
 {
 lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-lean_dec(x_10);
-x_38 = lean_ctor_get(x_26, 0);
+lean_dec(x_7);
+x_38 = lean_ctor_get(x_21, 0);
 lean_inc(x_38);
-lean_dec(x_26);
-x_39 = lean_alloc_ctor(3, 1, 0);
+lean_dec(x_21);
+x_39 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_39, 0, x_38);
-x_40 = l_Lean_Elab_Command_setOption(x_1, x_8, x_39, x_2, x_3);
+x_40 = l_Lean_Elab_Command_setOption(x_1, x_5, x_39, x_2, x_3);
 return x_40;
 }
-}
-else
+block_20:
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-lean_dec(x_10);
-x_41 = lean_ctor_get(x_24, 0);
-lean_inc(x_41);
-lean_dec(x_24);
-x_42 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_42, 0, x_41);
-x_43 = l_Lean_Elab_Command_setOption(x_1, x_8, x_42, x_2, x_3);
-return x_43;
-}
-block_23:
-{
-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; uint8_t x_21; lean_object* x_22; 
-lean_dec(x_11);
-x_12 = lean_box(0);
-x_13 = lean_unsigned_to_nat(0u);
-lean_inc(x_10);
-x_14 = l_Lean_Syntax_formatStxAux___main(x_12, x_13, x_10);
-x_15 = l_Lean_Options_empty;
-x_16 = l_Lean_Format_pretty(x_14, x_15);
-x_17 = lean_alloc_ctor(2, 1, 0);
+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; uint8_t x_18; lean_object* x_19; 
+lean_dec(x_8);
+x_9 = lean_box(0);
+x_10 = lean_unsigned_to_nat(0u);
+lean_inc(x_7);
+x_11 = l_Lean_Syntax_formatStxAux___main(x_9, x_10, x_7);
+x_12 = l_Lean_Options_empty;
+x_13 = l_Lean_Format_pretty(x_11, x_12);
+x_14 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_14, 0, x_13);
+x_15 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+x_16 = l_Lean_Elab_Command_elabSetOption___closed__3;
+x_17 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_17, 0, x_16);
-x_18 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_18, 0, x_17);
-x_19 = l_Lean_Elab_Command_elabSetOption___closed__3;
-x_20 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_20, 0, x_19);
-lean_ctor_set(x_20, 1, x_18);
-x_21 = 2;
-x_22 = l_Lean_Elab_log___at_Lean_Elab_Command_logUnknownDecl___spec__1(x_10, x_21, x_20, x_2, x_3);
-lean_dec(x_10);
-return x_22;
+lean_ctor_set(x_17, 1, x_15);
+x_18 = 2;
+x_19 = l_Lean_Elab_log___at_Lean_Elab_Command_logUnknownDecl___spec__1(x_7, x_18, x_17, x_2, x_3);
+lean_dec(x_7);
+return x_19;
 }
 }
 }
@@ -20399,7 +19504,7 @@ x_16 = l_Lean_Parser_Command_namespace___elambda__1___closed__1;
 x_17 = 1;
 lean_inc(x_3);
 lean_inc(x_14);
-x_18 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_1, x_16, x_17, x_14, x_3, x_13);
+x_18 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_1, x_16, x_17, x_14, x_3, x_13);
 if (lean_obj_tag(x_18) == 0)
 {
 lean_object* x_19; lean_object* x_20; 
@@ -21455,6 +20560,8 @@ l_Lean_Elab_Command_State_inhabited___closed__4 = _init_l_Lean_Elab_Command_Stat
 lean_mark_persistent(l_Lean_Elab_Command_State_inhabited___closed__4);
 l_Lean_Elab_Command_State_inhabited = _init_l_Lean_Elab_Command_State_inhabited();
 lean_mark_persistent(l_Lean_Elab_Command_State_inhabited);
+l_Lean_Elab_Command_Exception_inhabited = _init_l_Lean_Elab_Command_Exception_inhabited();
+lean_mark_persistent(l_Lean_Elab_Command_Exception_inhabited);
 l_Lean_Elab_Command_CommandElabCoreM_monadState___closed__1 = _init_l_Lean_Elab_Command_CommandElabCoreM_monadState___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_CommandElabCoreM_monadState___closed__1);
 l_Lean_Elab_Command_CommandElabCoreM_monadState___closed__2 = _init_l_Lean_Elab_Command_CommandElabCoreM_monadState___closed__2();
@@ -21580,20 +20687,18 @@ l_Lean_Elab_Command_elabCommand___closed__5 = _init_l_Lean_Elab_Command_elabComm
 lean_mark_persistent(l_Lean_Elab_Command_elabCommand___closed__5);
 l_Lean_Elab_Command_elabCommand___closed__6 = _init_l_Lean_Elab_Command_elabCommand___closed__6();
 lean_mark_persistent(l_Lean_Elab_Command_elabCommand___closed__6);
-l___private_Init_Lean_Elab_Command_11__toCommandResult___rarg___closed__1 = _init_l___private_Init_Lean_Elab_Command_11__toCommandResult___rarg___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_Command_11__toCommandResult___rarg___closed__1);
+l___private_Init_Lean_Elab_Command_12__toCommandResult___rarg___closed__1 = _init_l___private_Init_Lean_Elab_Command_12__toCommandResult___rarg___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_Command_12__toCommandResult___rarg___closed__1);
 l_Lean_Elab_Command_CommandElabM_inhabited___closed__1 = _init_l_Lean_Elab_Command_CommandElabM_inhabited___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_CommandElabM_inhabited___closed__1);
 l_Lean_Elab_Command_runTermElabM___rarg___closed__1 = _init_l_Lean_Elab_Command_runTermElabM___rarg___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_runTermElabM___rarg___closed__1);
-l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__1 = _init_l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__1);
-l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__2 = _init_l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__2);
-l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__3 = _init_l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_Command_13__addScopes___main___closed__3);
-l_Lean_Elab_Command_elabNamespace___closed__1 = _init_l_Lean_Elab_Command_elabNamespace___closed__1();
-lean_mark_persistent(l_Lean_Elab_Command_elabNamespace___closed__1);
+l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__1 = _init_l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__1);
+l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__2 = _init_l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__2);
+l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__3 = _init_l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_Command_14__addScopes___main___closed__3);
 l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace___closed__1 = _init_l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace___closed__1();
 lean_mark_persistent(l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace___closed__1);
 l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace___closed__2 = _init_l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace___closed__2();
@@ -21603,8 +20708,6 @@ lean_mark_persistent(l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace__
 res = l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Elab_Command_elabSection___closed__1 = _init_l_Lean_Elab_Command_elabSection___closed__1();
-lean_mark_persistent(l_Lean_Elab_Command_elabSection___closed__1);
 l___regBuiltinCommandElab_Lean_Elab_Command_elabSection___closed__1 = _init_l___regBuiltinCommandElab_Lean_Elab_Command_elabSection___closed__1();
 lean_mark_persistent(l___regBuiltinCommandElab_Lean_Elab_Command_elabSection___closed__1);
 l___regBuiltinCommandElab_Lean_Elab_Command_elabSection___closed__2 = _init_l___regBuiltinCommandElab_Lean_Elab_Command_elabSection___closed__2();
@@ -21686,12 +20789,6 @@ l_Lean_Elab_Command_logUnknownDecl___closed__1 = _init_l_Lean_Elab_Command_logUn
 lean_mark_persistent(l_Lean_Elab_Command_logUnknownDecl___closed__1);
 l_Lean_Elab_Command_logUnknownDecl___closed__2 = _init_l_Lean_Elab_Command_logUnknownDecl___closed__2();
 lean_mark_persistent(l_Lean_Elab_Command_logUnknownDecl___closed__2);
-l_Lean_Elab_Command_resolveNamespace___closed__1 = _init_l_Lean_Elab_Command_resolveNamespace___closed__1();
-lean_mark_persistent(l_Lean_Elab_Command_resolveNamespace___closed__1);
-l_Lean_Elab_Command_resolveNamespace___closed__2 = _init_l_Lean_Elab_Command_resolveNamespace___closed__2();
-lean_mark_persistent(l_Lean_Elab_Command_resolveNamespace___closed__2);
-l_Lean_Elab_Command_resolveNamespace___closed__3 = _init_l_Lean_Elab_Command_resolveNamespace___closed__3();
-lean_mark_persistent(l_Lean_Elab_Command_resolveNamespace___closed__3);
 l_Lean_Elab_Command_elabExport___closed__1 = _init_l_Lean_Elab_Command_elabExport___closed__1();
 lean_mark_persistent(l_Lean_Elab_Command_elabExport___closed__1);
 l_Lean_Elab_Command_elabExport___closed__2 = _init_l_Lean_Elab_Command_elabExport___closed__2();
diff --git a/stage0/stdlib/Init/Lean/Elab/DeclModifiers.c b/stage0/stdlib/Init/Lean/Elab/DeclModifiers.c
index fed9261c57..1674cc6281 100644
--- a/stage0/stdlib/Init/Lean/Elab/DeclModifiers.c
+++ b/stage0/stdlib/Init/Lean/Elab/DeclModifiers.c
@@ -1121,49 +1121,49 @@ return x_2;
 lean_object* l_Lean_Elab_Command_elabAttr(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_unsigned_to_nat(0u);
-x_39 = l_Lean_Syntax_getArg(x_1, x_38);
-x_40 = l_Lean_Syntax_isIdOrAtom_x3f(x_39);
-if (lean_obj_tag(x_40) == 0)
+lean_object* x_4; lean_object* x_5; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_unsigned_to_nat(0u);
+x_41 = l_Lean_Syntax_getArg(x_1, x_40);
+x_42 = l_Lean_Syntax_isIdOrAtom_x3f(x_41);
+if (lean_obj_tag(x_42) == 0)
 {
-lean_object* x_41; lean_object* x_42; uint8_t x_43; 
+lean_object* x_43; lean_object* x_44; uint8_t x_45; 
 lean_dec(x_1);
-x_41 = l_Lean_Elab_Command_elabAttr___closed__6;
-x_42 = l_Lean_Elab_Command_throwError___rarg(x_39, x_41, x_2, x_3);
-x_43 = !lean_is_exclusive(x_42);
-if (x_43 == 0)
+x_43 = l_Lean_Elab_Command_elabAttr___closed__6;
+x_44 = l_Lean_Elab_Command_throwError___rarg(x_41, x_43, x_2, x_3);
+x_45 = !lean_is_exclusive(x_44);
+if (x_45 == 0)
 {
-return x_42;
+return x_44;
 }
 else
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_44 = lean_ctor_get(x_42, 0);
-x_45 = lean_ctor_get(x_42, 1);
-lean_inc(x_45);
-lean_inc(x_44);
-lean_dec(x_42);
-x_46 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_46, 0, x_44);
-lean_ctor_set(x_46, 1, x_45);
-return x_46;
-}
-}
-else
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; 
-lean_dec(x_39);
-x_47 = lean_ctor_get(x_40, 0);
+lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_46 = lean_ctor_get(x_44, 0);
+x_47 = lean_ctor_get(x_44, 1);
 lean_inc(x_47);
-lean_dec(x_40);
-x_48 = lean_box(0);
-x_49 = lean_name_mk_string(x_48, x_47);
-x_4 = x_49;
-x_5 = x_3;
-goto block_37;
+lean_inc(x_46);
+lean_dec(x_44);
+x_48 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_48, 0, x_46);
+lean_ctor_set(x_48, 1, x_47);
+return x_48;
 }
-block_37:
+}
+else
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; 
+lean_dec(x_41);
+x_49 = lean_ctor_get(x_42, 0);
+lean_inc(x_49);
+lean_dec(x_42);
+x_50 = lean_box(0);
+x_51 = lean_name_mk_string(x_50, x_49);
+x_4 = x_51;
+x_5 = x_3;
+goto block_39;
+}
+block_39:
 {
 lean_object* x_6; 
 lean_inc(x_4);
@@ -1256,27 +1256,31 @@ lean_dec(x_4);
 x_30 = !lean_is_exclusive(x_6);
 if (x_30 == 0)
 {
-lean_object* x_31; lean_object* x_32; 
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
 x_31 = lean_ctor_get(x_6, 0);
 x_32 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_2, x_1, x_31);
 lean_dec(x_1);
-lean_ctor_set(x_6, 0, x_32);
+x_33 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_33, 0, x_32);
+lean_ctor_set(x_6, 0, x_33);
 return x_6;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_33 = lean_ctor_get(x_6, 0);
-x_34 = lean_ctor_get(x_6, 1);
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_34 = lean_ctor_get(x_6, 0);
+x_35 = lean_ctor_get(x_6, 1);
+lean_inc(x_35);
 lean_inc(x_34);
-lean_inc(x_33);
 lean_dec(x_6);
-x_35 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_2, x_1, x_33);
+x_36 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_2, x_1, x_34);
 lean_dec(x_1);
-x_36 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_34);
-return x_36;
+x_37 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_37, 0, x_36);
+x_38 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_38, 0, x_37);
+lean_ctor_set(x_38, 1, x_35);
+return x_38;
 }
 }
 }
@@ -2353,85 +2357,93 @@ lean_dec(x_2);
 x_41 = !lean_is_exclusive(x_29);
 if (x_41 == 0)
 {
-lean_object* x_42; lean_object* x_43; 
+lean_object* x_42; lean_object* x_43; lean_object* x_44; 
 x_42 = lean_ctor_get(x_29, 0);
 x_43 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_6, x_1, x_42);
-lean_ctor_set(x_29, 0, x_43);
+x_44 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_44, 0, x_43);
+lean_ctor_set(x_29, 0, x_44);
 return x_29;
 }
 else
 {
-lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
-x_44 = lean_ctor_get(x_29, 0);
-x_45 = lean_ctor_get(x_29, 1);
+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_29, 0);
+x_46 = lean_ctor_get(x_29, 1);
+lean_inc(x_46);
 lean_inc(x_45);
-lean_inc(x_44);
 lean_dec(x_29);
-x_46 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_6, x_1, x_44);
-x_47 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_47, 0, x_46);
-lean_ctor_set(x_47, 1, x_45);
-return x_47;
+x_47 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_6, x_1, x_45);
+x_48 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_48, 0, x_47);
+x_49 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_46);
+return x_49;
 }
 }
 }
 else
 {
-uint8_t x_48; 
+uint8_t x_50; 
 lean_dec(x_15);
 lean_dec(x_12);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_2);
-x_48 = !lean_is_exclusive(x_22);
-if (x_48 == 0)
+x_50 = !lean_is_exclusive(x_22);
+if (x_50 == 0)
 {
 return x_22;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_49 = lean_ctor_get(x_22, 0);
-x_50 = lean_ctor_get(x_22, 1);
-lean_inc(x_50);
-lean_inc(x_49);
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_22, 0);
+x_52 = lean_ctor_get(x_22, 1);
+lean_inc(x_52);
+lean_inc(x_51);
 lean_dec(x_22);
-x_51 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_51, 0, x_49);
-lean_ctor_set(x_51, 1, x_50);
-return x_51;
+x_53 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_53, 0, x_51);
+lean_ctor_set(x_53, 1, x_52);
+return x_53;
 }
 }
 }
 }
 else
 {
-uint8_t x_52; 
+uint8_t x_54; 
 lean_dec(x_12);
 lean_dec(x_5);
 lean_dec(x_2);
-x_52 = !lean_is_exclusive(x_14);
-if (x_52 == 0)
+x_54 = !lean_is_exclusive(x_14);
+if (x_54 == 0)
 {
-lean_object* x_53; lean_object* x_54; 
-x_53 = lean_ctor_get(x_14, 0);
-x_54 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_6, x_1, x_53);
-lean_ctor_set(x_14, 0, x_54);
+lean_object* x_55; lean_object* x_56; lean_object* x_57; 
+x_55 = lean_ctor_get(x_14, 0);
+x_56 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_6, x_1, x_55);
+x_57 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_14, 0, x_57);
 return x_14;
 }
 else
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_55 = lean_ctor_get(x_14, 0);
-x_56 = lean_ctor_get(x_14, 1);
-lean_inc(x_56);
-lean_inc(x_55);
+lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_58 = lean_ctor_get(x_14, 0);
+x_59 = lean_ctor_get(x_14, 1);
+lean_inc(x_59);
+lean_inc(x_58);
 lean_dec(x_14);
-x_57 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_6, x_1, x_55);
-x_58 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_58, 0, x_57);
-lean_ctor_set(x_58, 1, x_56);
-return x_58;
+x_60 = l___private_Init_Lean_Elab_Command_1__ioErrorToMessage(x_6, x_1, x_58);
+x_61 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_61, 0, x_60);
+x_62 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_62, 0, x_61);
+lean_ctor_set(x_62, 1, x_59);
+return x_62;
 }
 }
 }
diff --git a/stage0/stdlib/Init/Lean/Elab/Declaration.c b/stage0/stdlib/Init/Lean/Elab/Declaration.c
index 8cf3d43c6e..ebd1ef6c44 100644
--- a/stage0/stdlib/Init/Lean/Elab/Declaration.c
+++ b/stage0/stdlib/Init/Lean/Elab/Declaration.c
@@ -15,7 +15,6 @@ extern "C" {
 #endif
 lean_object* l_Lean_Elab_Command_elabDeclaration(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabConstant___closed__9;
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___main(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkForall(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_abbrev___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_addDecl(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -35,7 +34,6 @@ lean_object* l_Lean_Elab_Command_elabAbbrev(lean_object*, lean_object*, lean_obj
 extern lean_object* l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
 lean_object* l_Lean_Elab_Command_elabExample___closed__1;
 lean_object* l_Lean_Elab_Command_elabConstant___closed__1;
-extern lean_object* l_Lean_stxInh;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_elabAxiom___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandDeclSig(lean_object*);
@@ -44,11 +42,11 @@ uint8_t lean_name_eq(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_declaration___elambda__1___closed__2;
 lean_object* l_Lean_mkIdentFrom(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_10__getVarDecls(lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_Elab_Term_mkForallUsedOnly(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabDeclaration___closed__2;
 lean_object* lean_string_utf8_byte_size(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_example___elambda__1___closed__2;
 lean_object* l_Lean_Name_getNumParts___main(lean_object*);
 lean_object* l_Lean_Elab_Command_elabInductive___rarg(lean_object*);
@@ -68,9 +66,9 @@ lean_object* l_Lean_Elab_Command_elabInstance___closed__1;
 extern lean_object* l_Lean_Parser_Command_def___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Command_declValSimple___elambda__1___closed__2;
 extern lean_object* l_Lean_Meta_registerInstanceAttr___closed__1;
-lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabConstant(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabAxiom___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_11__getVarDecls(lean_object*);
 lean_object* l_Lean_Elab_Command_expandOptDeclSig(lean_object*);
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabDeclaration___closed__3;
 extern lean_object* l_Lean_Elab_Command_mkDef___lambda__1___closed__1;
@@ -84,6 +82,8 @@ extern lean_object* l___regBuiltinParser_Lean_Parser_Command_antiquot___closed__
 lean_object* l_Lean_Elab_Command_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_List_elem___main___at_Lean_Parser_addLeadingParser___spec__7(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabConstant___closed__7;
+lean_object* l___private_Init_Lean_Elab_Command_9__mkTermContext(lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3;
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabAxiom___spec__3(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_hole___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Command_elabTheorem(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -92,7 +92,6 @@ lean_object* l_Lean_Elab_Command_elabDef(lean_object*, lean_object*, lean_object
 extern lean_object* l_Lean_Elab_Command_withDeclId___closed__3;
 lean_object* l_Lean_Elab_Command_elabAxiom___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_sortDeclLevelParams(lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3;
 lean_object* l_Lean_Elab_Command_elabClassInductive___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkReducibilityAttrs___closed__4;
 lean_object* l_Lean_Elab_Command_elabConstant___closed__10;
@@ -124,6 +123,7 @@ lean_object* l_Lean_Elab_Command_getLevelNames(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabModifiers(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabDefLike(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___main(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandDeclSig___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_elabBinders___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -134,7 +134,6 @@ lean_object* l_Lean_Elab_Command_elabAxiom___lambda__2(lean_object*, lean_object
 lean_object* l_Lean_Elab_Command_elabConstant___closed__5;
 lean_object* l_Lean_Elab_Command_elabInductive(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabDeclaration___closed__1;
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabDeclaration___closed__3;
 lean_object* l_Lean_Elab_Command_elabConstant___closed__3;
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabAxiom___spec__2(lean_object*, lean_object*, lean_object*);
@@ -144,14 +143,13 @@ lean_object* l_Lean_CollectLevelParams_main___main(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabAxiom___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_numeral(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_constant___elambda__1___closed__2;
-lean_object* l___private_Init_Lean_Elab_Command_9__mkTermState(lean_object*);
 lean_object* l_Lean_Elab_Command_elabConstant___closed__8;
 extern lean_object* l_Lean_Parser_Command_theorem___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabClassInductive___rarg(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_3__setState(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_8__mkTermContext(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_declId___elambda__1___closed__2;
+lean_object* l___private_Init_Lean_Elab_Command_10__mkTermState(lean_object*);
 lean_object* l_Lean_Elab_Command_expandOptDeclSig(lean_object* x_1) {
 _start:
 {
@@ -626,7 +624,7 @@ lean_object* x_15; lean_object* x_16; uint8_t x_17;
 lean_dec(x_11);
 lean_dec(x_9);
 lean_dec(x_8);
-x_15 = l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3;
+x_15 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3;
 x_16 = l_Lean_Elab_Command_throwError___rarg(x_2, x_15, x_3, x_4);
 x_17 = !lean_is_exclusive(x_16);
 if (x_17 == 0)
@@ -3000,7 +2998,7 @@ lean_dec(x_9);
 x_12 = 0;
 x_13 = lean_box(0);
 lean_inc(x_7);
-x_14 = l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(x_12, x_13, x_7, x_11);
+x_14 = l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(x_12, x_13, x_7, x_11);
 if (lean_obj_tag(x_14) == 0)
 {
 lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
@@ -3333,7 +3331,7 @@ x_22 = l_Lean_Parser_Command_namespace___elambda__1___closed__1;
 x_23 = 1;
 lean_inc(x_3);
 lean_inc(x_20);
-x_24 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_6, x_22, x_23, x_20, x_3, x_19);
+x_24 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_6, x_22, x_23, x_20, x_3, x_19);
 if (lean_obj_tag(x_24) == 0)
 {
 lean_object* x_25; lean_object* x_26; 
@@ -3402,9 +3400,9 @@ lean_inc(x_121);
 x_122 = lean_ctor_get(x_120, 1);
 lean_inc(x_122);
 lean_dec(x_120);
-x_123 = l___private_Init_Lean_Elab_Command_10__getVarDecls(x_121);
-x_124 = l___private_Init_Lean_Elab_Command_8__mkTermContext(x_3, x_121, x_118);
-x_125 = l___private_Init_Lean_Elab_Command_9__mkTermState(x_121);
+x_123 = l___private_Init_Lean_Elab_Command_11__getVarDecls(x_121);
+x_124 = l___private_Init_Lean_Elab_Command_9__mkTermContext(x_3, x_121, x_118);
+x_125 = l___private_Init_Lean_Elab_Command_10__mkTermState(x_121);
 lean_dec(x_121);
 x_126 = l_Lean_Elab_Term_elabBinders___rarg(x_123, x_119, x_124, x_125);
 lean_dec(x_123);
@@ -4424,384 +4422,378 @@ return x_2;
 lean_object* l_Lean_Elab_Command_elabDeclaration(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
-x_4 = lean_ctor_get(x_1, 1);
-lean_inc(x_4);
-x_5 = l_Lean_stxInh;
-x_6 = lean_unsigned_to_nat(0u);
-x_7 = lean_array_get(x_5, x_4, x_6);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
 lean_inc(x_2);
-x_8 = l_Lean_Elab_Command_elabModifiers(x_7, x_2, x_3);
-lean_dec(x_7);
-if (lean_obj_tag(x_8) == 0)
+x_6 = l_Lean_Elab_Command_elabModifiers(x_5, x_2, x_3);
+lean_dec(x_5);
+if (lean_obj_tag(x_6) == 0)
 {
-uint8_t x_9; 
-x_9 = !lean_is_exclusive(x_8);
-if (x_9 == 0)
+uint8_t x_7; 
+x_7 = !lean_is_exclusive(x_6);
+if (x_7 == 0)
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
-x_10 = lean_ctor_get(x_8, 0);
-x_11 = lean_ctor_get(x_8, 1);
-x_12 = lean_unsigned_to_nat(1u);
-x_13 = lean_array_get(x_5, x_4, x_12);
-lean_dec(x_4);
-lean_inc(x_13);
-x_14 = l_Lean_Syntax_getKind(x_13);
-x_15 = l_Lean_Parser_Command_abbrev___elambda__1___closed__2;
-x_16 = lean_name_eq(x_14, x_15);
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_8 = lean_ctor_get(x_6, 0);
+x_9 = lean_ctor_get(x_6, 1);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = l_Lean_Syntax_getArg(x_1, x_10);
+lean_inc(x_11);
+x_12 = l_Lean_Syntax_getKind(x_11);
+x_13 = l_Lean_Parser_Command_abbrev___elambda__1___closed__2;
+x_14 = lean_name_eq(x_12, x_13);
+if (x_14 == 0)
+{
+lean_object* x_15; uint8_t x_16; 
+x_15 = l_Lean_Parser_Command_def___elambda__1___closed__2;
+x_16 = lean_name_eq(x_12, x_15);
 if (x_16 == 0)
 {
 lean_object* x_17; uint8_t x_18; 
-x_17 = l_Lean_Parser_Command_def___elambda__1___closed__2;
-x_18 = lean_name_eq(x_14, x_17);
+x_17 = l_Lean_Parser_Command_theorem___elambda__1___closed__2;
+x_18 = lean_name_eq(x_12, x_17);
 if (x_18 == 0)
 {
 lean_object* x_19; uint8_t x_20; 
-x_19 = l_Lean_Parser_Command_theorem___elambda__1___closed__2;
-x_20 = lean_name_eq(x_14, x_19);
+x_19 = l_Lean_Parser_Command_constant___elambda__1___closed__2;
+x_20 = lean_name_eq(x_12, x_19);
 if (x_20 == 0)
 {
 lean_object* x_21; uint8_t x_22; 
-x_21 = l_Lean_Parser_Command_constant___elambda__1___closed__2;
-x_22 = lean_name_eq(x_14, x_21);
+x_21 = l_Lean_Elab_Command_elabDeclaration___closed__1;
+x_22 = lean_name_eq(x_12, x_21);
 if (x_22 == 0)
 {
 lean_object* x_23; uint8_t x_24; 
-x_23 = l_Lean_Elab_Command_elabDeclaration___closed__1;
-x_24 = lean_name_eq(x_14, x_23);
+x_23 = l_Lean_Parser_Command_axiom___elambda__1___closed__2;
+x_24 = lean_name_eq(x_12, x_23);
 if (x_24 == 0)
 {
 lean_object* x_25; uint8_t x_26; 
-x_25 = l_Lean_Parser_Command_axiom___elambda__1___closed__2;
-x_26 = lean_name_eq(x_14, x_25);
+x_25 = l_Lean_Parser_Command_example___elambda__1___closed__2;
+x_26 = lean_name_eq(x_12, x_25);
 if (x_26 == 0)
 {
 lean_object* x_27; uint8_t x_28; 
-x_27 = l_Lean_Parser_Command_example___elambda__1___closed__2;
-x_28 = lean_name_eq(x_14, x_27);
+lean_dec(x_11);
+lean_dec(x_8);
+x_27 = l_Lean_Parser_Command_inductive___elambda__1___closed__2;
+x_28 = lean_name_eq(x_12, x_27);
 if (x_28 == 0)
 {
 lean_object* x_29; uint8_t x_30; 
-lean_dec(x_13);
-lean_dec(x_10);
-x_29 = l_Lean_Parser_Command_inductive___elambda__1___closed__2;
-x_30 = lean_name_eq(x_14, x_29);
+x_29 = l_Lean_Parser_Command_classInductive___elambda__1___closed__2;
+x_30 = lean_name_eq(x_12, x_29);
 if (x_30 == 0)
 {
 lean_object* x_31; uint8_t x_32; 
-x_31 = l_Lean_Parser_Command_classInductive___elambda__1___closed__2;
-x_32 = lean_name_eq(x_14, x_31);
+x_31 = l_Lean_Parser_Command_structure___elambda__1___closed__2;
+x_32 = lean_name_eq(x_12, x_31);
+lean_dec(x_12);
 if (x_32 == 0)
 {
-lean_object* x_33; uint8_t x_34; 
-x_33 = l_Lean_Parser_Command_structure___elambda__1___closed__2;
-x_34 = lean_name_eq(x_14, x_33);
-lean_dec(x_14);
-if (x_34 == 0)
+lean_object* x_33; lean_object* x_34; 
+lean_free_object(x_6);
+x_33 = l_Lean_Elab_Command_elabDeclaration___closed__4;
+x_34 = l_Lean_Elab_Command_throwError___rarg(x_1, x_33, x_2, x_9);
+return x_34;
+}
+else
 {
-lean_object* x_35; lean_object* x_36; 
-lean_free_object(x_8);
-x_35 = l_Lean_Elab_Command_elabDeclaration___closed__4;
-x_36 = l_Lean_Elab_Command_throwError___rarg(x_1, x_35, x_2, x_11);
-return x_36;
+lean_object* x_35; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_35 = lean_box(0);
+lean_ctor_set(x_6, 0, x_35);
+return x_6;
+}
+}
+else
+{
+lean_object* x_36; 
+lean_dec(x_12);
+lean_dec(x_2);
+lean_dec(x_1);
+x_36 = lean_box(0);
+lean_ctor_set(x_6, 0, x_36);
+return x_6;
+}
 }
 else
 {
 lean_object* x_37; 
+lean_dec(x_12);
 lean_dec(x_2);
 lean_dec(x_1);
 x_37 = lean_box(0);
-lean_ctor_set(x_8, 0, x_37);
-return x_8;
+lean_ctor_set(x_6, 0, x_37);
+return x_6;
 }
 }
 else
 {
 lean_object* x_38; 
-lean_dec(x_14);
-lean_dec(x_2);
+lean_dec(x_12);
+lean_free_object(x_6);
 lean_dec(x_1);
-x_38 = lean_box(0);
-lean_ctor_set(x_8, 0, x_38);
-return x_8;
+x_38 = l_Lean_Elab_Command_elabExample(x_8, x_11, x_2, x_9);
+return x_38;
 }
 }
 else
 {
 lean_object* x_39; 
-lean_dec(x_14);
-lean_dec(x_2);
+lean_dec(x_12);
+lean_free_object(x_6);
 lean_dec(x_1);
-x_39 = lean_box(0);
-lean_ctor_set(x_8, 0, x_39);
-return x_8;
+x_39 = l_Lean_Elab_Command_elabAxiom(x_8, x_11, x_2, x_9);
+return x_39;
 }
 }
 else
 {
 lean_object* x_40; 
-lean_dec(x_14);
-lean_free_object(x_8);
+lean_dec(x_12);
+lean_free_object(x_6);
 lean_dec(x_1);
-x_40 = l_Lean_Elab_Command_elabExample(x_10, x_13, x_2, x_11);
+x_40 = l_Lean_Elab_Command_elabInstance(x_8, x_11, x_2, x_9);
 return x_40;
 }
 }
 else
 {
 lean_object* x_41; 
-lean_dec(x_14);
-lean_free_object(x_8);
+lean_dec(x_12);
+lean_free_object(x_6);
 lean_dec(x_1);
-x_41 = l_Lean_Elab_Command_elabAxiom(x_10, x_13, x_2, x_11);
+x_41 = l_Lean_Elab_Command_elabConstant(x_8, x_11, x_2, x_9);
 return x_41;
 }
 }
 else
 {
 lean_object* x_42; 
-lean_dec(x_14);
-lean_free_object(x_8);
+lean_dec(x_12);
+lean_free_object(x_6);
 lean_dec(x_1);
-x_42 = l_Lean_Elab_Command_elabInstance(x_10, x_13, x_2, x_11);
+x_42 = l_Lean_Elab_Command_elabTheorem(x_8, x_11, x_2, x_9);
 return x_42;
 }
 }
 else
 {
 lean_object* x_43; 
-lean_dec(x_14);
-lean_free_object(x_8);
+lean_dec(x_12);
+lean_free_object(x_6);
 lean_dec(x_1);
-x_43 = l_Lean_Elab_Command_elabConstant(x_10, x_13, x_2, x_11);
+x_43 = l_Lean_Elab_Command_elabDef(x_8, x_11, x_2, x_9);
 return x_43;
 }
 }
 else
 {
 lean_object* x_44; 
-lean_dec(x_14);
-lean_free_object(x_8);
+lean_dec(x_12);
+lean_free_object(x_6);
 lean_dec(x_1);
-x_44 = l_Lean_Elab_Command_elabTheorem(x_10, x_13, x_2, x_11);
+x_44 = l_Lean_Elab_Command_elabAbbrev(x_8, x_11, x_2, x_9);
 return x_44;
 }
 }
 else
 {
-lean_object* x_45; 
-lean_dec(x_14);
-lean_free_object(x_8);
-lean_dec(x_1);
-x_45 = l_Lean_Elab_Command_elabDef(x_10, x_13, x_2, x_11);
-return x_45;
-}
-}
-else
-{
-lean_object* x_46; 
-lean_dec(x_14);
-lean_free_object(x_8);
-lean_dec(x_1);
-x_46 = l_Lean_Elab_Command_elabAbbrev(x_10, x_13, x_2, x_11);
-return x_46;
-}
-}
-else
-{
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; uint8_t x_53; 
-x_47 = lean_ctor_get(x_8, 0);
-x_48 = lean_ctor_get(x_8, 1);
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
+x_45 = lean_ctor_get(x_6, 0);
+x_46 = lean_ctor_get(x_6, 1);
+lean_inc(x_46);
+lean_inc(x_45);
+lean_dec(x_6);
+x_47 = lean_unsigned_to_nat(1u);
+x_48 = l_Lean_Syntax_getArg(x_1, x_47);
 lean_inc(x_48);
-lean_inc(x_47);
-lean_dec(x_8);
-x_49 = lean_unsigned_to_nat(1u);
-x_50 = lean_array_get(x_5, x_4, x_49);
-lean_dec(x_4);
-lean_inc(x_50);
-x_51 = l_Lean_Syntax_getKind(x_50);
-x_52 = l_Lean_Parser_Command_abbrev___elambda__1___closed__2;
-x_53 = lean_name_eq(x_51, x_52);
+x_49 = l_Lean_Syntax_getKind(x_48);
+x_50 = l_Lean_Parser_Command_abbrev___elambda__1___closed__2;
+x_51 = lean_name_eq(x_49, x_50);
+if (x_51 == 0)
+{
+lean_object* x_52; uint8_t x_53; 
+x_52 = l_Lean_Parser_Command_def___elambda__1___closed__2;
+x_53 = lean_name_eq(x_49, x_52);
 if (x_53 == 0)
 {
 lean_object* x_54; uint8_t x_55; 
-x_54 = l_Lean_Parser_Command_def___elambda__1___closed__2;
-x_55 = lean_name_eq(x_51, x_54);
+x_54 = l_Lean_Parser_Command_theorem___elambda__1___closed__2;
+x_55 = lean_name_eq(x_49, x_54);
 if (x_55 == 0)
 {
 lean_object* x_56; uint8_t x_57; 
-x_56 = l_Lean_Parser_Command_theorem___elambda__1___closed__2;
-x_57 = lean_name_eq(x_51, x_56);
+x_56 = l_Lean_Parser_Command_constant___elambda__1___closed__2;
+x_57 = lean_name_eq(x_49, x_56);
 if (x_57 == 0)
 {
 lean_object* x_58; uint8_t x_59; 
-x_58 = l_Lean_Parser_Command_constant___elambda__1___closed__2;
-x_59 = lean_name_eq(x_51, x_58);
+x_58 = l_Lean_Elab_Command_elabDeclaration___closed__1;
+x_59 = lean_name_eq(x_49, x_58);
 if (x_59 == 0)
 {
 lean_object* x_60; uint8_t x_61; 
-x_60 = l_Lean_Elab_Command_elabDeclaration___closed__1;
-x_61 = lean_name_eq(x_51, x_60);
+x_60 = l_Lean_Parser_Command_axiom___elambda__1___closed__2;
+x_61 = lean_name_eq(x_49, x_60);
 if (x_61 == 0)
 {
 lean_object* x_62; uint8_t x_63; 
-x_62 = l_Lean_Parser_Command_axiom___elambda__1___closed__2;
-x_63 = lean_name_eq(x_51, x_62);
+x_62 = l_Lean_Parser_Command_example___elambda__1___closed__2;
+x_63 = lean_name_eq(x_49, x_62);
 if (x_63 == 0)
 {
 lean_object* x_64; uint8_t x_65; 
-x_64 = l_Lean_Parser_Command_example___elambda__1___closed__2;
-x_65 = lean_name_eq(x_51, x_64);
+lean_dec(x_48);
+lean_dec(x_45);
+x_64 = l_Lean_Parser_Command_inductive___elambda__1___closed__2;
+x_65 = lean_name_eq(x_49, x_64);
 if (x_65 == 0)
 {
 lean_object* x_66; uint8_t x_67; 
-lean_dec(x_50);
-lean_dec(x_47);
-x_66 = l_Lean_Parser_Command_inductive___elambda__1___closed__2;
-x_67 = lean_name_eq(x_51, x_66);
+x_66 = l_Lean_Parser_Command_classInductive___elambda__1___closed__2;
+x_67 = lean_name_eq(x_49, x_66);
 if (x_67 == 0)
 {
 lean_object* x_68; uint8_t x_69; 
-x_68 = l_Lean_Parser_Command_classInductive___elambda__1___closed__2;
-x_69 = lean_name_eq(x_51, x_68);
+x_68 = l_Lean_Parser_Command_structure___elambda__1___closed__2;
+x_69 = lean_name_eq(x_49, x_68);
+lean_dec(x_49);
 if (x_69 == 0)
 {
-lean_object* x_70; uint8_t x_71; 
-x_70 = l_Lean_Parser_Command_structure___elambda__1___closed__2;
-x_71 = lean_name_eq(x_51, x_70);
-lean_dec(x_51);
-if (x_71 == 0)
+lean_object* x_70; lean_object* x_71; 
+x_70 = l_Lean_Elab_Command_elabDeclaration___closed__4;
+x_71 = l_Lean_Elab_Command_throwError___rarg(x_1, x_70, x_2, x_46);
+return x_71;
+}
+else
 {
 lean_object* x_72; lean_object* x_73; 
-x_72 = l_Lean_Elab_Command_elabDeclaration___closed__4;
-x_73 = l_Lean_Elab_Command_throwError___rarg(x_1, x_72, x_2, x_48);
+lean_dec(x_2);
+lean_dec(x_1);
+x_72 = lean_box(0);
+x_73 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_73, 0, x_72);
+lean_ctor_set(x_73, 1, x_46);
 return x_73;
 }
+}
 else
 {
 lean_object* x_74; lean_object* x_75; 
+lean_dec(x_49);
 lean_dec(x_2);
 lean_dec(x_1);
 x_74 = lean_box(0);
 x_75 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_75, 0, x_74);
-lean_ctor_set(x_75, 1, x_48);
+lean_ctor_set(x_75, 1, x_46);
 return x_75;
 }
 }
 else
 {
 lean_object* x_76; lean_object* x_77; 
-lean_dec(x_51);
+lean_dec(x_49);
 lean_dec(x_2);
 lean_dec(x_1);
 x_76 = lean_box(0);
 x_77 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_77, 0, x_76);
-lean_ctor_set(x_77, 1, x_48);
+lean_ctor_set(x_77, 1, x_46);
 return x_77;
 }
 }
 else
 {
-lean_object* x_78; lean_object* x_79; 
-lean_dec(x_51);
-lean_dec(x_2);
+lean_object* x_78; 
+lean_dec(x_49);
 lean_dec(x_1);
-x_78 = lean_box(0);
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_78);
-lean_ctor_set(x_79, 1, x_48);
+x_78 = l_Lean_Elab_Command_elabExample(x_45, x_48, x_2, x_46);
+return x_78;
+}
+}
+else
+{
+lean_object* x_79; 
+lean_dec(x_49);
+lean_dec(x_1);
+x_79 = l_Lean_Elab_Command_elabAxiom(x_45, x_48, x_2, x_46);
 return x_79;
 }
 }
 else
 {
 lean_object* x_80; 
-lean_dec(x_51);
+lean_dec(x_49);
 lean_dec(x_1);
-x_80 = l_Lean_Elab_Command_elabExample(x_47, x_50, x_2, x_48);
+x_80 = l_Lean_Elab_Command_elabInstance(x_45, x_48, x_2, x_46);
 return x_80;
 }
 }
 else
 {
 lean_object* x_81; 
-lean_dec(x_51);
+lean_dec(x_49);
 lean_dec(x_1);
-x_81 = l_Lean_Elab_Command_elabAxiom(x_47, x_50, x_2, x_48);
+x_81 = l_Lean_Elab_Command_elabConstant(x_45, x_48, x_2, x_46);
 return x_81;
 }
 }
 else
 {
 lean_object* x_82; 
-lean_dec(x_51);
+lean_dec(x_49);
 lean_dec(x_1);
-x_82 = l_Lean_Elab_Command_elabInstance(x_47, x_50, x_2, x_48);
+x_82 = l_Lean_Elab_Command_elabTheorem(x_45, x_48, x_2, x_46);
 return x_82;
 }
 }
 else
 {
 lean_object* x_83; 
-lean_dec(x_51);
+lean_dec(x_49);
 lean_dec(x_1);
-x_83 = l_Lean_Elab_Command_elabConstant(x_47, x_50, x_2, x_48);
+x_83 = l_Lean_Elab_Command_elabDef(x_45, x_48, x_2, x_46);
 return x_83;
 }
 }
 else
 {
 lean_object* x_84; 
-lean_dec(x_51);
+lean_dec(x_49);
 lean_dec(x_1);
-x_84 = l_Lean_Elab_Command_elabTheorem(x_47, x_50, x_2, x_48);
+x_84 = l_Lean_Elab_Command_elabAbbrev(x_45, x_48, x_2, x_46);
 return x_84;
 }
 }
-else
-{
-lean_object* x_85; 
-lean_dec(x_51);
-lean_dec(x_1);
-x_85 = l_Lean_Elab_Command_elabDef(x_47, x_50, x_2, x_48);
-return x_85;
-}
 }
 else
 {
-lean_object* x_86; 
-lean_dec(x_51);
-lean_dec(x_1);
-x_86 = l_Lean_Elab_Command_elabAbbrev(x_47, x_50, x_2, x_48);
-return x_86;
-}
-}
-}
-else
-{
-uint8_t x_87; 
-lean_dec(x_4);
+uint8_t x_85; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_87 = !lean_is_exclusive(x_8);
-if (x_87 == 0)
+x_85 = !lean_is_exclusive(x_6);
+if (x_85 == 0)
 {
-return x_8;
+return x_6;
 }
 else
 {
-lean_object* x_88; lean_object* x_89; lean_object* x_90; 
-x_88 = lean_ctor_get(x_8, 0);
-x_89 = lean_ctor_get(x_8, 1);
-lean_inc(x_89);
-lean_inc(x_88);
-lean_dec(x_8);
-x_90 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_90, 0, x_88);
-lean_ctor_set(x_90, 1, x_89);
-return x_90;
+lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+x_86 = lean_ctor_get(x_6, 0);
+x_87 = lean_ctor_get(x_6, 1);
+lean_inc(x_87);
+lean_inc(x_86);
+lean_dec(x_6);
+x_88 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_88, 0, x_86);
+lean_ctor_set(x_88, 1, x_87);
+return x_88;
 }
 }
 }
diff --git a/stage0/stdlib/Init/Lean/Elab/Definition.c b/stage0/stdlib/Init/Lean/Elab/Definition.c
index 41d4c16378..c6b90d0665 100644
--- a/stage0/stdlib/Init/Lean/Elab/Definition.c
+++ b/stage0/stdlib/Init/Lean/Elab/Definition.c
@@ -13,7 +13,6 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-lean_object* l___private_Init_Lean_Elab_Command_13__addScopes___main(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkForall(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_addDecl(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -35,13 +34,11 @@ lean_object* l_Lean_Elab_Command_compileDecl(lean_object*, lean_object*, lean_ob
 lean_object* l_Array_reverseAux___main___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkLambda(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_10__getVarDecls(lean_object*);
 lean_object* lean_array_get_size(lean_object*);
-extern lean_object* l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
 extern lean_object* l_Lean_Parser_Command_declValEqns___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabDefVal___closed__1;
-lean_object* l_Lean_Elab_Command_elabDefVal___closed__4;
 lean_object* l_Lean_Elab_Command_elabDefVal(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_collectUsedFVarsAtFVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_Command_DefKind_isExample(uint8_t);
 lean_object* l_Lean_Name_getNumParts___main(lean_object*);
@@ -57,14 +54,15 @@ uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_collectUsedFVarsAtFVars___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_levelMVarToParam(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_withUsedWhen_x27___rarg(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Command_elabDefLike___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(lean_object*);
 lean_object* l_Lean_Elab_Command_DefKind_isTheorem___boxed(lean_object*);
+extern lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabTerm(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_declValSimple___elambda__1___closed__2;
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
-lean_object* l_Lean_Elab_Command_elabDefVal___closed__5;
+lean_object* l___private_Init_Lean_Elab_Command_11__getVarDecls(lean_object*);
 lean_object* l_Lean_Elab_Command_mkDef___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_mkDef___lambda__1___closed__1;
 lean_object* l_Lean_Syntax_getId(lean_object*);
@@ -82,6 +80,7 @@ uint8_t l_List_elem___main___at_Lean_Parser_addLeadingParser___spec__7(lean_obje
 lean_object* l_Lean_LocalInstances_erase(lean_object*, lean_object*);
 lean_object* l_Lean_CollectFVars_main___main(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_withUsedWhen_x27(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_9__mkTermContext(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_DefKind_isDefOrOpaque___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_getLocalInsts(lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Command_modifyScope___closed__1;
@@ -108,23 +107,22 @@ lean_object* l_Lean_Elab_Command_getLevelNames(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_removeUnused(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabDefLike(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_14__addScopes___main(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBinders___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_removeUnused___closed__1;
 uint8_t l_Lean_NameSet_contains(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 extern lean_object* l_HashMap_Inhabited___closed__1;
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_Command_DefKind_isDefOrOpaque(uint8_t);
 lean_object* lean_task_pure(lean_object*);
 lean_object* l_Lean_CollectLevelParams_main___main(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_DefKind_isExample___boxed(lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_9__mkTermState(lean_object*);
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_elabDefLike___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkDef___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Command_3__setState(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Command_8__mkTermContext(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Command_10__mkTermState(lean_object*);
 uint8_t l_Lean_Elab_Command_DefKind_isTheorem(uint8_t x_1) {
 _start:
 {
@@ -1468,7 +1466,7 @@ lean_free_object(x_34);
 lean_dec(x_36);
 lean_dec(x_32);
 lean_dec(x_8);
-x_55 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_55 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_56 = l_unreachable_x21___rarg(x_55);
 x_57 = lean_apply_2(x_56, x_11, x_37);
 return x_57;
@@ -1567,7 +1565,7 @@ lean_dec(x_70);
 lean_dec(x_64);
 lean_dec(x_32);
 lean_dec(x_8);
-x_85 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_85 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_86 = l_unreachable_x21___rarg(x_85);
 x_87 = lean_apply_2(x_86, x_11, x_65);
 return x_87;
@@ -1721,7 +1719,7 @@ lean_inc(x_10);
 x_11 = 0;
 x_12 = lean_box(0);
 lean_inc(x_8);
-x_13 = l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(x_11, x_12, x_8, x_9);
+x_13 = l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(x_11, x_12, x_8, x_9);
 if (lean_obj_tag(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; 
@@ -1985,7 +1983,7 @@ lean_object* _init_l_Lean_Elab_Command_elabDefVal___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("definition body");
+x_1 = lean_mk_string("equations have not been implemented yet");
 return x_1;
 }
 }
@@ -1994,7 +1992,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Elab_Command_elabDefVal___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
+x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
@@ -2002,26 +2000,8 @@ return x_2;
 lean_object* _init_l_Lean_Elab_Command_elabDefVal___closed__3() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("equations have not been implemented yet");
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Command_elabDefVal___closed__4() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Command_elabDefVal___closed__3;
-x_2 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Command_elabDefVal___closed__5() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Command_elabDefVal___closed__4;
+x_1 = l_Lean_Elab_Command_elabDefVal___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -2044,31 +2024,32 @@ x_9 = lean_name_eq(x_5, x_8);
 lean_dec(x_5);
 if (x_9 == 0)
 {
-lean_object* x_10; lean_object* x_11; 
-x_10 = l_Lean_Elab_Command_elabDefVal___closed__2;
-x_11 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_10, x_3, x_4);
-return x_11;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Command_elabDefVal___closed__5;
-x_13 = l_Lean_Elab_Term_throwError___rarg(x_1, x_12, x_3, x_4);
-return x_13;
-}
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; lean_object* x_18; 
-lean_dec(x_5);
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = l_Lean_Syntax_getArg(x_1, x_14);
+lean_object* x_10; 
+lean_dec(x_3);
 lean_dec(x_1);
-x_16 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_16, 0, x_2);
-x_17 = 1;
-x_18 = l_Lean_Elab_Term_elabTerm(x_15, x_16, x_17, x_17, x_3, x_4);
-return x_18;
+x_10 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_4);
+return x_10;
+}
+else
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = l_Lean_Elab_Command_elabDefVal___closed__3;
+x_12 = l_Lean_Elab_Term_throwError___rarg(x_1, x_11, x_3, x_4);
+return x_12;
+}
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; lean_object* x_17; 
+lean_dec(x_5);
+x_13 = lean_unsigned_to_nat(1u);
+x_14 = l_Lean_Syntax_getArg(x_1, x_13);
+lean_dec(x_1);
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_2);
+x_16 = 1;
+x_17 = l_Lean_Elab_Term_elabTerm(x_14, x_15, x_16, x_16, x_3, x_4);
+return x_17;
 }
 }
 }
@@ -4436,7 +4417,7 @@ lean_dec(x_26);
 x_29 = 0;
 x_30 = lean_box(0);
 lean_inc(x_8);
-x_31 = l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(x_29, x_30, x_8, x_28);
+x_31 = l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(x_29, x_30, x_8, x_28);
 if (lean_obj_tag(x_31) == 0)
 {
 lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; uint8_t x_37; lean_object* x_38; lean_object* x_39; 
@@ -4648,7 +4629,7 @@ x_17 = l_Lean_Parser_Command_namespace___elambda__1___closed__1;
 x_18 = 1;
 lean_inc(x_2);
 lean_inc(x_15);
-x_19 = l___private_Init_Lean_Elab_Command_13__addScopes___main(x_5, x_17, x_18, x_15, x_2, x_14);
+x_19 = l___private_Init_Lean_Elab_Command_14__addScopes___main(x_5, x_17, x_18, x_15, x_2, x_14);
 if (lean_obj_tag(x_19) == 0)
 {
 lean_object* x_20; lean_object* x_21; 
@@ -4720,9 +4701,9 @@ lean_inc(x_126);
 x_127 = lean_ctor_get(x_125, 1);
 lean_inc(x_127);
 lean_dec(x_125);
-x_128 = l___private_Init_Lean_Elab_Command_10__getVarDecls(x_126);
-x_129 = l___private_Init_Lean_Elab_Command_8__mkTermContext(x_2, x_126, x_123);
-x_130 = l___private_Init_Lean_Elab_Command_9__mkTermState(x_126);
+x_128 = l___private_Init_Lean_Elab_Command_11__getVarDecls(x_126);
+x_129 = l___private_Init_Lean_Elab_Command_9__mkTermContext(x_2, x_126, x_123);
+x_130 = l___private_Init_Lean_Elab_Command_10__mkTermState(x_126);
 lean_dec(x_126);
 x_131 = l_Lean_Elab_Term_elabBinders___rarg(x_128, x_124, x_129, x_130);
 lean_dec(x_128);
@@ -5675,10 +5656,6 @@ l_Lean_Elab_Command_elabDefVal___closed__2 = _init_l_Lean_Elab_Command_elabDefVa
 lean_mark_persistent(l_Lean_Elab_Command_elabDefVal___closed__2);
 l_Lean_Elab_Command_elabDefVal___closed__3 = _init_l_Lean_Elab_Command_elabDefVal___closed__3();
 lean_mark_persistent(l_Lean_Elab_Command_elabDefVal___closed__3);
-l_Lean_Elab_Command_elabDefVal___closed__4 = _init_l_Lean_Elab_Command_elabDefVal___closed__4();
-lean_mark_persistent(l_Lean_Elab_Command_elabDefVal___closed__4);
-l_Lean_Elab_Command_elabDefVal___closed__5 = _init_l_Lean_Elab_Command_elabDefVal___closed__5();
-lean_mark_persistent(l_Lean_Elab_Command_elabDefVal___closed__5);
 return lean_mk_io_result(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Init/Lean/Elab/Exception.c b/stage0/stdlib/Init/Lean/Elab/Exception.c
index 6f8f756882..c3b3aa1203 100644
--- a/stage0/stdlib/Init/Lean/Elab/Exception.c
+++ b/stage0/stdlib/Init/Lean/Elab/Exception.c
@@ -14,11 +14,63 @@
 extern "C" {
 #endif
 extern lean_object* l_String_splitAux___main___closed__1;
+lean_object* l_Lean_Elab_Exception_inhabited___closed__1;
 lean_object* l_Lean_Elab_mkMessageCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkMessageCore(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
+lean_object* l_Lean_Elab_Exception_hasToString___closed__1;
 lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Exception_inhabited;
 lean_object* l_Lean_Elab_mkExceptionCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Exception_hasToString(lean_object*);
+extern lean_object* l_Lean_Message_Inhabited___closed__2;
 lean_object* l_Lean_Elab_mkExceptionCore(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Message_toString(lean_object*);
+lean_object* _init_l_Lean_Elab_Exception_inhabited___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Message_Inhabited___closed__2;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Elab_Exception_inhabited() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_Elab_Exception_inhabited___closed__1;
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Elab_Exception_hasToString___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("unsupported syntax");
+return x_1;
+}
+}
+lean_object* l_Lean_Elab_Exception_hasToString(lean_object* x_1) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = lean_ctor_get(x_1, 0);
+lean_inc(x_2);
+lean_dec(x_1);
+x_3 = l_Lean_Message_toString(x_2);
+return x_3;
+}
+else
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Exception_hasToString___closed__1;
+return x_4;
+}
+}
+}
 lean_object* l_Lean_Elab_mkMessageCore(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5) {
 _start:
 {
@@ -51,7 +103,7 @@ return x_7;
 lean_object* l_Lean_Elab_mkExceptionCore(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; uint8_t x_7; lean_object* x_8; lean_object* x_9; 
+lean_object* x_5; lean_object* x_6; uint8_t x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
 x_5 = l_Lean_FileMap_toPosition(x_2, x_4);
 x_6 = lean_box(0);
 x_7 = 2;
@@ -63,7 +115,9 @@ lean_ctor_set(x_9, 2, x_6);
 lean_ctor_set(x_9, 3, x_8);
 lean_ctor_set(x_9, 4, x_3);
 lean_ctor_set_uint8(x_9, sizeof(void*)*5, x_7);
-return x_9;
+x_10 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_10, 0, x_9);
+return x_10;
 }
 }
 lean_object* l_Lean_Elab_mkExceptionCore___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
@@ -85,6 +139,12 @@ _G_initialized = true;
 res = initialize_Init_Lean_Meta(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l_Lean_Elab_Exception_inhabited___closed__1 = _init_l_Lean_Elab_Exception_inhabited___closed__1();
+lean_mark_persistent(l_Lean_Elab_Exception_inhabited___closed__1);
+l_Lean_Elab_Exception_inhabited = _init_l_Lean_Elab_Exception_inhabited();
+lean_mark_persistent(l_Lean_Elab_Exception_inhabited);
+l_Lean_Elab_Exception_hasToString___closed__1 = _init_l_Lean_Elab_Exception_hasToString___closed__1();
+lean_mark_persistent(l_Lean_Elab_Exception_hasToString___closed__1);
 return lean_mk_io_result(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Init/Lean/Elab/Frontend.c b/stage0/stdlib/Init/Lean/Elab/Frontend.c
index 38c42d91bc..9b523c24a2 100644
--- a/stage0/stdlib/Init/Lean/Elab/Frontend.c
+++ b/stage0/stdlib/Init/Lean/Elab/Frontend.c
@@ -23,6 +23,7 @@ lean_object* l_Lean_Elab_IO_processCommands(lean_object*, lean_object*, lean_obj
 lean_object* l_Lean_Elab_runFrontend(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_processCommandsAux___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_liftIOCore_x21(lean_object*);
+extern lean_object* l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
 lean_object* lean_io_mk_ref(lean_object*, lean_object*);
 lean_object* lean_io_ref_get(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Frontend_runCommandElabM___closed__1;
@@ -398,441 +399,573 @@ return x_19;
 }
 else
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+lean_object* x_20; 
 x_20 = lean_ctor_get(x_15, 0);
 lean_inc(x_20);
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; 
 x_21 = lean_ctor_get(x_15, 1);
 lean_inc(x_21);
 lean_dec(x_15);
+x_22 = lean_ctor_get(x_20, 0);
+lean_inc(x_22);
+lean_dec(x_20);
 lean_inc(x_14);
-x_22 = l___private_Init_Lean_Elab_Command_2__getState(x_14, x_21);
-if (lean_obj_tag(x_22) == 0)
+x_23 = l___private_Init_Lean_Elab_Command_2__getState(x_14, x_21);
+if (lean_obj_tag(x_23) == 0)
 {
-lean_object* x_23; lean_object* x_24; uint8_t x_25; 
-x_23 = lean_ctor_get(x_22, 0);
-lean_inc(x_23);
-x_24 = lean_ctor_get(x_22, 1);
+lean_object* x_24; lean_object* x_25; uint8_t x_26; 
+x_24 = lean_ctor_get(x_23, 0);
 lean_inc(x_24);
-lean_dec(x_22);
-x_25 = !lean_is_exclusive(x_23);
-if (x_25 == 0)
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
+lean_dec(x_23);
+x_26 = !lean_is_exclusive(x_24);
+if (x_26 == 0)
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_26 = lean_ctor_get(x_23, 1);
-x_27 = l_PersistentArray_push___rarg(x_26, x_20);
-lean_ctor_set(x_23, 1, x_27);
-x_28 = l___private_Init_Lean_Elab_Command_3__setState(x_23, x_14, x_24);
-if (lean_obj_tag(x_28) == 0)
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_24, 1);
+x_28 = l_PersistentArray_push___rarg(x_27, x_22);
+lean_ctor_set(x_24, 1, x_28);
+x_29 = l___private_Init_Lean_Elab_Command_3__setState(x_24, x_14, x_25);
+if (lean_obj_tag(x_29) == 0)
 {
-uint8_t x_29; 
-x_29 = !lean_is_exclusive(x_28);
-if (x_29 == 0)
+uint8_t x_30; 
+x_30 = !lean_is_exclusive(x_29);
+if (x_30 == 0)
 {
-lean_object* x_30; lean_object* x_31; 
-x_30 = lean_ctor_get(x_28, 0);
-lean_dec(x_30);
-x_31 = lean_box(0);
-lean_ctor_set(x_28, 0, x_31);
-return x_28;
+lean_object* x_31; lean_object* x_32; 
+x_31 = lean_ctor_get(x_29, 0);
+lean_dec(x_31);
+x_32 = lean_box(0);
+lean_ctor_set(x_29, 0, x_32);
+return x_29;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_28, 1);
-lean_inc(x_32);
-lean_dec(x_28);
-x_33 = lean_box(0);
-x_34 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_34, 0, x_33);
-lean_ctor_set(x_34, 1, x_32);
-return x_34;
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_29, 1);
+lean_inc(x_33);
+lean_dec(x_29);
+x_34 = lean_box(0);
+x_35 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_35, 0, x_34);
+lean_ctor_set(x_35, 1, x_33);
+return x_35;
 }
 }
 else
 {
-uint8_t x_35; 
-x_35 = !lean_is_exclusive(x_28);
-if (x_35 == 0)
+uint8_t x_36; 
+x_36 = !lean_is_exclusive(x_29);
+if (x_36 == 0)
 {
-lean_object* x_36; lean_object* x_37; 
-x_36 = lean_ctor_get(x_28, 0);
-lean_dec(x_36);
-x_37 = lean_box(0);
-lean_ctor_set_tag(x_28, 0);
-lean_ctor_set(x_28, 0, x_37);
-return x_28;
+lean_object* x_37; lean_object* x_38; 
+x_37 = lean_ctor_get(x_29, 0);
+lean_dec(x_37);
+x_38 = lean_box(0);
+lean_ctor_set_tag(x_29, 0);
+lean_ctor_set(x_29, 0, x_38);
+return x_29;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_28, 1);
-lean_inc(x_38);
-lean_dec(x_28);
-x_39 = lean_box(0);
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_38);
-return x_40;
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_29, 1);
+lean_inc(x_39);
+lean_dec(x_29);
+x_40 = lean_box(0);
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_41, 1, x_39);
+return x_41;
 }
 }
 }
 else
 {
-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; 
-x_41 = lean_ctor_get(x_23, 0);
-x_42 = lean_ctor_get(x_23, 1);
-x_43 = lean_ctor_get(x_23, 2);
-x_44 = lean_ctor_get(x_23, 3);
+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; 
+x_42 = lean_ctor_get(x_24, 0);
+x_43 = lean_ctor_get(x_24, 1);
+x_44 = lean_ctor_get(x_24, 2);
+x_45 = lean_ctor_get(x_24, 3);
+lean_inc(x_45);
 lean_inc(x_44);
 lean_inc(x_43);
 lean_inc(x_42);
-lean_inc(x_41);
-lean_dec(x_23);
-x_45 = l_PersistentArray_push___rarg(x_42, x_20);
-x_46 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_46, 0, x_41);
-lean_ctor_set(x_46, 1, x_45);
-lean_ctor_set(x_46, 2, x_43);
-lean_ctor_set(x_46, 3, x_44);
-x_47 = l___private_Init_Lean_Elab_Command_3__setState(x_46, x_14, x_24);
-if (lean_obj_tag(x_47) == 0)
+lean_dec(x_24);
+x_46 = l_PersistentArray_push___rarg(x_43, x_22);
+x_47 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_47, 0, x_42);
+lean_ctor_set(x_47, 1, x_46);
+lean_ctor_set(x_47, 2, x_44);
+lean_ctor_set(x_47, 3, x_45);
+x_48 = l___private_Init_Lean_Elab_Command_3__setState(x_47, x_14, x_25);
+if (lean_obj_tag(x_48) == 0)
 {
-lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-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_49 = x_47;
+lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+x_49 = lean_ctor_get(x_48, 1);
+lean_inc(x_49);
+if (lean_is_exclusive(x_48)) {
+ lean_ctor_release(x_48, 0);
+ lean_ctor_release(x_48, 1);
+ x_50 = x_48;
 } else {
- lean_dec_ref(x_47);
- x_49 = lean_box(0);
+ lean_dec_ref(x_48);
+ x_50 = lean_box(0);
 }
-x_50 = lean_box(0);
-if (lean_is_scalar(x_49)) {
- x_51 = lean_alloc_ctor(0, 2, 0);
+x_51 = lean_box(0);
+if (lean_is_scalar(x_50)) {
+ x_52 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_51 = x_49;
+ x_52 = x_50;
 }
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_48);
-return x_51;
+lean_ctor_set(x_52, 0, x_51);
+lean_ctor_set(x_52, 1, x_49);
+return x_52;
 }
 else
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_52 = lean_ctor_get(x_47, 1);
-lean_inc(x_52);
-if (lean_is_exclusive(x_47)) {
- lean_ctor_release(x_47, 0);
- lean_ctor_release(x_47, 1);
- x_53 = x_47;
+lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_53 = lean_ctor_get(x_48, 1);
+lean_inc(x_53);
+if (lean_is_exclusive(x_48)) {
+ lean_ctor_release(x_48, 0);
+ lean_ctor_release(x_48, 1);
+ x_54 = x_48;
 } else {
- lean_dec_ref(x_47);
- x_53 = lean_box(0);
+ lean_dec_ref(x_48);
+ x_54 = lean_box(0);
 }
-x_54 = lean_box(0);
-if (lean_is_scalar(x_53)) {
- x_55 = lean_alloc_ctor(0, 2, 0);
+x_55 = lean_box(0);
+if (lean_is_scalar(x_54)) {
+ x_56 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_55 = x_53;
- lean_ctor_set_tag(x_55, 0);
+ x_56 = x_54;
+ lean_ctor_set_tag(x_56, 0);
 }
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_55, 1, x_52);
-return x_55;
+lean_ctor_set(x_56, 0, x_55);
+lean_ctor_set(x_56, 1, x_53);
+return x_56;
 }
 }
 }
 else
 {
-uint8_t x_56; 
-lean_dec(x_20);
-lean_dec(x_14);
-x_56 = !lean_is_exclusive(x_22);
-if (x_56 == 0)
-{
-lean_object* x_57; lean_object* x_58; 
-x_57 = lean_ctor_get(x_22, 0);
-lean_dec(x_57);
-x_58 = lean_box(0);
-lean_ctor_set_tag(x_22, 0);
-lean_ctor_set(x_22, 0, x_58);
-return x_22;
-}
-else
-{
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-x_59 = lean_ctor_get(x_22, 1);
-lean_inc(x_59);
+uint8_t x_57; 
 lean_dec(x_22);
-x_60 = lean_box(0);
-x_61 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_61, 0, x_60);
-lean_ctor_set(x_61, 1, x_59);
-return x_61;
+lean_dec(x_14);
+x_57 = !lean_is_exclusive(x_23);
+if (x_57 == 0)
+{
+lean_object* x_58; lean_object* x_59; 
+x_58 = lean_ctor_get(x_23, 0);
+lean_dec(x_58);
+x_59 = lean_box(0);
+lean_ctor_set_tag(x_23, 0);
+lean_ctor_set(x_23, 0, x_59);
+return x_23;
 }
+else
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; 
+x_60 = lean_ctor_get(x_23, 1);
+lean_inc(x_60);
+lean_dec(x_23);
+x_61 = lean_box(0);
+x_62 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_62, 0, x_61);
+lean_ctor_set(x_62, 1, x_60);
+return x_62;
 }
 }
 }
 else
 {
-lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_62 = lean_ctor_get(x_5, 1);
-lean_inc(x_62);
-lean_dec(x_5);
-x_63 = l_Lean_Elab_Frontend_runCommandElabM___closed__1;
-x_64 = l_unreachable_x21___rarg(x_63);
-x_65 = lean_apply_1(x_64, x_62);
-if (lean_obj_tag(x_65) == 0)
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; 
+x_63 = lean_ctor_get(x_15, 1);
+lean_inc(x_63);
+lean_dec(x_15);
+x_64 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
+x_65 = l_unreachable_x21___rarg(x_64);
+x_66 = lean_apply_2(x_65, x_14, x_63);
+if (lean_obj_tag(x_66) == 0)
 {
-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_66 = lean_ctor_get(x_65, 0);
-lean_inc(x_66);
-x_67 = lean_ctor_get(x_65, 1);
-lean_inc(x_67);
-lean_dec(x_65);
-x_68 = lean_ctor_get(x_2, 3);
-x_69 = lean_ctor_get(x_68, 1);
-x_70 = lean_ctor_get(x_68, 2);
-x_71 = lean_ctor_get(x_2, 0);
-x_72 = lean_box(0);
-x_73 = lean_unsigned_to_nat(0u);
-lean_inc(x_71);
-lean_inc(x_70);
+uint8_t x_67; 
+x_67 = !lean_is_exclusive(x_66);
+if (x_67 == 0)
+{
+return x_66;
+}
+else
+{
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_68 = lean_ctor_get(x_66, 0);
+x_69 = lean_ctor_get(x_66, 1);
 lean_inc(x_69);
-x_74 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_74, 0, x_69);
-lean_ctor_set(x_74, 1, x_70);
-lean_ctor_set(x_74, 2, x_71);
-lean_ctor_set(x_74, 3, x_66);
-lean_ctor_set(x_74, 4, x_72);
-lean_ctor_set(x_74, 5, x_73);
-lean_inc(x_74);
-x_75 = l_Lean_Elab_Command_elabCommand(x_1, x_74, x_67);
-if (lean_obj_tag(x_75) == 0)
-{
-uint8_t x_76; 
-lean_dec(x_74);
-x_76 = !lean_is_exclusive(x_75);
-if (x_76 == 0)
-{
-return x_75;
+lean_inc(x_68);
+lean_dec(x_66);
+x_70 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_70, 0, x_68);
+lean_ctor_set(x_70, 1, x_69);
+return x_70;
+}
 }
 else
 {
-lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_77 = lean_ctor_get(x_75, 0);
-x_78 = lean_ctor_get(x_75, 1);
-lean_inc(x_78);
+uint8_t x_71; 
+x_71 = !lean_is_exclusive(x_66);
+if (x_71 == 0)
+{
+lean_object* x_72; lean_object* x_73; 
+x_72 = lean_ctor_get(x_66, 0);
+lean_dec(x_72);
+x_73 = lean_box(0);
+lean_ctor_set_tag(x_66, 0);
+lean_ctor_set(x_66, 0, x_73);
+return x_66;
+}
+else
+{
+lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+x_74 = lean_ctor_get(x_66, 1);
+lean_inc(x_74);
+lean_dec(x_66);
+x_75 = lean_box(0);
+x_76 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_76, 0, x_75);
+lean_ctor_set(x_76, 1, x_74);
+return x_76;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+x_77 = lean_ctor_get(x_5, 1);
 lean_inc(x_77);
-lean_dec(x_75);
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_77);
-lean_ctor_set(x_79, 1, x_78);
-return x_79;
-}
-}
-else
+lean_dec(x_5);
+x_78 = l_Lean_Elab_Frontend_runCommandElabM___closed__1;
+x_79 = l_unreachable_x21___rarg(x_78);
+x_80 = lean_apply_1(x_79, x_77);
+if (lean_obj_tag(x_80) == 0)
 {
-lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_80 = lean_ctor_get(x_75, 0);
-lean_inc(x_80);
-x_81 = lean_ctor_get(x_75, 1);
+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_81 = lean_ctor_get(x_80, 0);
 lean_inc(x_81);
-lean_dec(x_75);
-lean_inc(x_74);
-x_82 = l___private_Init_Lean_Elab_Command_2__getState(x_74, x_81);
-if (lean_obj_tag(x_82) == 0)
-{
-lean_object* x_83; lean_object* x_84; uint8_t x_85; 
-x_83 = lean_ctor_get(x_82, 0);
-lean_inc(x_83);
-x_84 = lean_ctor_get(x_82, 1);
+x_82 = lean_ctor_get(x_80, 1);
+lean_inc(x_82);
+lean_dec(x_80);
+x_83 = lean_ctor_get(x_2, 3);
+x_84 = lean_ctor_get(x_83, 1);
+x_85 = lean_ctor_get(x_83, 2);
+x_86 = lean_ctor_get(x_2, 0);
+x_87 = lean_box(0);
+x_88 = lean_unsigned_to_nat(0u);
+lean_inc(x_86);
+lean_inc(x_85);
 lean_inc(x_84);
-lean_dec(x_82);
-x_85 = !lean_is_exclusive(x_83);
-if (x_85 == 0)
+x_89 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_89, 0, x_84);
+lean_ctor_set(x_89, 1, x_85);
+lean_ctor_set(x_89, 2, x_86);
+lean_ctor_set(x_89, 3, x_81);
+lean_ctor_set(x_89, 4, x_87);
+lean_ctor_set(x_89, 5, x_88);
+lean_inc(x_89);
+x_90 = l_Lean_Elab_Command_elabCommand(x_1, x_89, x_82);
+if (lean_obj_tag(x_90) == 0)
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_86 = lean_ctor_get(x_83, 1);
-x_87 = l_PersistentArray_push___rarg(x_86, x_80);
-lean_ctor_set(x_83, 1, x_87);
-x_88 = l___private_Init_Lean_Elab_Command_3__setState(x_83, x_74, x_84);
-if (lean_obj_tag(x_88) == 0)
+uint8_t x_91; 
+lean_dec(x_89);
+x_91 = !lean_is_exclusive(x_90);
+if (x_91 == 0)
 {
-uint8_t x_89; 
-x_89 = !lean_is_exclusive(x_88);
-if (x_89 == 0)
-{
-lean_object* x_90; lean_object* x_91; 
-x_90 = lean_ctor_get(x_88, 0);
-lean_dec(x_90);
-x_91 = lean_box(0);
-lean_ctor_set(x_88, 0, x_91);
-return x_88;
+return x_90;
 }
 else
 {
 lean_object* x_92; lean_object* x_93; lean_object* x_94; 
-x_92 = lean_ctor_get(x_88, 1);
+x_92 = lean_ctor_get(x_90, 0);
+x_93 = lean_ctor_get(x_90, 1);
+lean_inc(x_93);
 lean_inc(x_92);
-lean_dec(x_88);
-x_93 = lean_box(0);
+lean_dec(x_90);
 x_94 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_94, 0, x_93);
-lean_ctor_set(x_94, 1, x_92);
+lean_ctor_set(x_94, 0, x_92);
+lean_ctor_set(x_94, 1, x_93);
 return x_94;
 }
 }
 else
 {
-uint8_t x_95; 
-x_95 = !lean_is_exclusive(x_88);
-if (x_95 == 0)
+lean_object* x_95; 
+x_95 = lean_ctor_get(x_90, 0);
+lean_inc(x_95);
+if (lean_obj_tag(x_95) == 0)
 {
-lean_object* x_96; lean_object* x_97; 
-x_96 = lean_ctor_get(x_88, 0);
-lean_dec(x_96);
-x_97 = lean_box(0);
-lean_ctor_set_tag(x_88, 0);
-lean_ctor_set(x_88, 0, x_97);
-return x_88;
+lean_object* x_96; lean_object* x_97; lean_object* x_98; 
+x_96 = lean_ctor_get(x_90, 1);
+lean_inc(x_96);
+lean_dec(x_90);
+x_97 = lean_ctor_get(x_95, 0);
+lean_inc(x_97);
+lean_dec(x_95);
+lean_inc(x_89);
+x_98 = l___private_Init_Lean_Elab_Command_2__getState(x_89, x_96);
+if (lean_obj_tag(x_98) == 0)
+{
+lean_object* x_99; lean_object* x_100; uint8_t x_101; 
+x_99 = lean_ctor_get(x_98, 0);
+lean_inc(x_99);
+x_100 = lean_ctor_get(x_98, 1);
+lean_inc(x_100);
+lean_dec(x_98);
+x_101 = !lean_is_exclusive(x_99);
+if (x_101 == 0)
+{
+lean_object* x_102; lean_object* x_103; lean_object* x_104; 
+x_102 = lean_ctor_get(x_99, 1);
+x_103 = l_PersistentArray_push___rarg(x_102, x_97);
+lean_ctor_set(x_99, 1, x_103);
+x_104 = l___private_Init_Lean_Elab_Command_3__setState(x_99, x_89, x_100);
+if (lean_obj_tag(x_104) == 0)
+{
+uint8_t x_105; 
+x_105 = !lean_is_exclusive(x_104);
+if (x_105 == 0)
+{
+lean_object* x_106; lean_object* x_107; 
+x_106 = lean_ctor_get(x_104, 0);
+lean_dec(x_106);
+x_107 = lean_box(0);
+lean_ctor_set(x_104, 0, x_107);
+return x_104;
 }
 else
 {
-lean_object* x_98; lean_object* x_99; lean_object* x_100; 
-x_98 = lean_ctor_get(x_88, 1);
-lean_inc(x_98);
-lean_dec(x_88);
-x_99 = lean_box(0);
-x_100 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_100, 0, x_99);
-lean_ctor_set(x_100, 1, x_98);
-return x_100;
-}
-}
-}
-else
-{
-lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
-x_101 = lean_ctor_get(x_83, 0);
-x_102 = lean_ctor_get(x_83, 1);
-x_103 = lean_ctor_get(x_83, 2);
-x_104 = lean_ctor_get(x_83, 3);
-lean_inc(x_104);
-lean_inc(x_103);
-lean_inc(x_102);
-lean_inc(x_101);
-lean_dec(x_83);
-x_105 = l_PersistentArray_push___rarg(x_102, x_80);
-x_106 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_106, 0, x_101);
-lean_ctor_set(x_106, 1, x_105);
-lean_ctor_set(x_106, 2, x_103);
-lean_ctor_set(x_106, 3, x_104);
-x_107 = l___private_Init_Lean_Elab_Command_3__setState(x_106, x_74, x_84);
-if (lean_obj_tag(x_107) == 0)
-{
-lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-x_108 = lean_ctor_get(x_107, 1);
+lean_object* x_108; lean_object* x_109; lean_object* x_110; 
+x_108 = lean_ctor_get(x_104, 1);
 lean_inc(x_108);
-if (lean_is_exclusive(x_107)) {
- lean_ctor_release(x_107, 0);
- lean_ctor_release(x_107, 1);
- x_109 = x_107;
-} else {
- lean_dec_ref(x_107);
- x_109 = lean_box(0);
+lean_dec(x_104);
+x_109 = lean_box(0);
+x_110 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_110, 0, x_109);
+lean_ctor_set(x_110, 1, x_108);
+return x_110;
 }
-x_110 = lean_box(0);
-if (lean_is_scalar(x_109)) {
- x_111 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_111 = x_109;
-}
-lean_ctor_set(x_111, 0, x_110);
-lean_ctor_set(x_111, 1, x_108);
-return x_111;
 }
 else
 {
-lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; 
-x_112 = lean_ctor_get(x_107, 1);
-lean_inc(x_112);
-if (lean_is_exclusive(x_107)) {
- lean_ctor_release(x_107, 0);
- lean_ctor_release(x_107, 1);
- x_113 = x_107;
-} else {
- lean_dec_ref(x_107);
- x_113 = lean_box(0);
+uint8_t x_111; 
+x_111 = !lean_is_exclusive(x_104);
+if (x_111 == 0)
+{
+lean_object* x_112; lean_object* x_113; 
+x_112 = lean_ctor_get(x_104, 0);
+lean_dec(x_112);
+x_113 = lean_box(0);
+lean_ctor_set_tag(x_104, 0);
+lean_ctor_set(x_104, 0, x_113);
+return x_104;
 }
-x_114 = lean_box(0);
-if (lean_is_scalar(x_113)) {
- x_115 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_115 = x_113;
- lean_ctor_set_tag(x_115, 0);
-}
-lean_ctor_set(x_115, 0, x_114);
-lean_ctor_set(x_115, 1, x_112);
-return x_115;
+else
+{
+lean_object* x_114; lean_object* x_115; lean_object* x_116; 
+x_114 = lean_ctor_get(x_104, 1);
+lean_inc(x_114);
+lean_dec(x_104);
+x_115 = lean_box(0);
+x_116 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_116, 0, x_115);
+lean_ctor_set(x_116, 1, x_114);
+return x_116;
 }
 }
 }
 else
 {
-uint8_t x_116; 
-lean_dec(x_80);
-lean_dec(x_74);
-x_116 = !lean_is_exclusive(x_82);
-if (x_116 == 0)
-{
-lean_object* x_117; lean_object* x_118; 
-x_117 = lean_ctor_get(x_82, 0);
-lean_dec(x_117);
-x_118 = lean_box(0);
-lean_ctor_set_tag(x_82, 0);
-lean_ctor_set(x_82, 0, x_118);
-return x_82;
-}
-else
-{
-lean_object* x_119; lean_object* x_120; lean_object* x_121; 
-x_119 = lean_ctor_get(x_82, 1);
+lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; 
+x_117 = lean_ctor_get(x_99, 0);
+x_118 = lean_ctor_get(x_99, 1);
+x_119 = lean_ctor_get(x_99, 2);
+x_120 = lean_ctor_get(x_99, 3);
+lean_inc(x_120);
 lean_inc(x_119);
-lean_dec(x_82);
-x_120 = lean_box(0);
-x_121 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_121, 0, x_120);
-lean_ctor_set(x_121, 1, x_119);
-return x_121;
-}
-}
-}
-}
-else
+lean_inc(x_118);
+lean_inc(x_117);
+lean_dec(x_99);
+x_121 = l_PersistentArray_push___rarg(x_118, x_97);
+x_122 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_122, 0, x_117);
+lean_ctor_set(x_122, 1, x_121);
+lean_ctor_set(x_122, 2, x_119);
+lean_ctor_set(x_122, 3, x_120);
+x_123 = l___private_Init_Lean_Elab_Command_3__setState(x_122, x_89, x_100);
+if (lean_obj_tag(x_123) == 0)
 {
-uint8_t x_122; 
-lean_dec(x_1);
-x_122 = !lean_is_exclusive(x_65);
-if (x_122 == 0)
-{
-return x_65;
-}
-else
-{
-lean_object* x_123; lean_object* x_124; lean_object* x_125; 
-x_123 = lean_ctor_get(x_65, 0);
-x_124 = lean_ctor_get(x_65, 1);
+lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
+x_124 = lean_ctor_get(x_123, 1);
 lean_inc(x_124);
-lean_inc(x_123);
-lean_dec(x_65);
-x_125 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_125, 0, x_123);
-lean_ctor_set(x_125, 1, x_124);
-return x_125;
+if (lean_is_exclusive(x_123)) {
+ lean_ctor_release(x_123, 0);
+ lean_ctor_release(x_123, 1);
+ x_125 = x_123;
+} else {
+ lean_dec_ref(x_123);
+ x_125 = lean_box(0);
+}
+x_126 = lean_box(0);
+if (lean_is_scalar(x_125)) {
+ x_127 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_127 = x_125;
+}
+lean_ctor_set(x_127, 0, x_126);
+lean_ctor_set(x_127, 1, x_124);
+return x_127;
+}
+else
+{
+lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; 
+x_128 = lean_ctor_get(x_123, 1);
+lean_inc(x_128);
+if (lean_is_exclusive(x_123)) {
+ lean_ctor_release(x_123, 0);
+ lean_ctor_release(x_123, 1);
+ x_129 = x_123;
+} else {
+ lean_dec_ref(x_123);
+ x_129 = lean_box(0);
+}
+x_130 = lean_box(0);
+if (lean_is_scalar(x_129)) {
+ x_131 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_131 = x_129;
+ lean_ctor_set_tag(x_131, 0);
+}
+lean_ctor_set(x_131, 0, x_130);
+lean_ctor_set(x_131, 1, x_128);
+return x_131;
+}
+}
+}
+else
+{
+uint8_t x_132; 
+lean_dec(x_97);
+lean_dec(x_89);
+x_132 = !lean_is_exclusive(x_98);
+if (x_132 == 0)
+{
+lean_object* x_133; lean_object* x_134; 
+x_133 = lean_ctor_get(x_98, 0);
+lean_dec(x_133);
+x_134 = lean_box(0);
+lean_ctor_set_tag(x_98, 0);
+lean_ctor_set(x_98, 0, x_134);
+return x_98;
+}
+else
+{
+lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+x_135 = lean_ctor_get(x_98, 1);
+lean_inc(x_135);
+lean_dec(x_98);
+x_136 = lean_box(0);
+x_137 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_137, 0, x_136);
+lean_ctor_set(x_137, 1, x_135);
+return x_137;
+}
+}
+}
+else
+{
+lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; 
+x_138 = lean_ctor_get(x_90, 1);
+lean_inc(x_138);
+lean_dec(x_90);
+x_139 = l_Lean_Elab_Command_runTermElabM___rarg___closed__1;
+x_140 = l_unreachable_x21___rarg(x_139);
+x_141 = lean_apply_2(x_140, x_89, x_138);
+if (lean_obj_tag(x_141) == 0)
+{
+uint8_t x_142; 
+x_142 = !lean_is_exclusive(x_141);
+if (x_142 == 0)
+{
+return x_141;
+}
+else
+{
+lean_object* x_143; lean_object* x_144; lean_object* x_145; 
+x_143 = lean_ctor_get(x_141, 0);
+x_144 = lean_ctor_get(x_141, 1);
+lean_inc(x_144);
+lean_inc(x_143);
+lean_dec(x_141);
+x_145 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_145, 0, x_143);
+lean_ctor_set(x_145, 1, x_144);
+return x_145;
+}
+}
+else
+{
+uint8_t x_146; 
+x_146 = !lean_is_exclusive(x_141);
+if (x_146 == 0)
+{
+lean_object* x_147; lean_object* x_148; 
+x_147 = lean_ctor_get(x_141, 0);
+lean_dec(x_147);
+x_148 = lean_box(0);
+lean_ctor_set_tag(x_141, 0);
+lean_ctor_set(x_141, 0, x_148);
+return x_141;
+}
+else
+{
+lean_object* x_149; lean_object* x_150; lean_object* x_151; 
+x_149 = lean_ctor_get(x_141, 1);
+lean_inc(x_149);
+lean_dec(x_141);
+x_150 = lean_box(0);
+x_151 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_151, 0, x_150);
+lean_ctor_set(x_151, 1, x_149);
+return x_151;
+}
+}
+}
+}
+}
+else
+{
+uint8_t x_152; 
+lean_dec(x_1);
+x_152 = !lean_is_exclusive(x_80);
+if (x_152 == 0)
+{
+return x_80;
+}
+else
+{
+lean_object* x_153; lean_object* x_154; lean_object* x_155; 
+x_153 = lean_ctor_get(x_80, 0);
+x_154 = lean_ctor_get(x_80, 1);
+lean_inc(x_154);
+lean_inc(x_153);
+lean_dec(x_80);
+x_155 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_155, 0, x_153);
+lean_ctor_set(x_155, 1, x_154);
+return x_155;
 }
 }
 }
diff --git a/stage0/stdlib/Init/Lean/Elab/Level.c b/stage0/stdlib/Init/Lean/Elab/Level.c
index a51bf9ba93..f82cf9f23e 100644
--- a/stage0/stdlib/Init/Lean/Elab/Level.c
+++ b/stage0/stdlib/Init/Lean/Elab/Level.c
@@ -657,21 +657,28 @@ x_6 = l_Lean_Elab_mkMessage___at_Lean_Elab_Level_elabLevel___main___spec__2(x_2,
 x_7 = !lean_is_exclusive(x_6);
 if (x_7 == 0)
 {
+lean_object* x_8; lean_object* x_9; 
+x_8 = lean_ctor_get(x_6, 0);
+x_9 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_9, 0, x_8);
 lean_ctor_set_tag(x_6, 1);
+lean_ctor_set(x_6, 0, x_9);
 return x_6;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_8 = lean_ctor_get(x_6, 0);
-x_9 = lean_ctor_get(x_6, 1);
-lean_inc(x_9);
-lean_inc(x_8);
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_10 = lean_ctor_get(x_6, 0);
+x_11 = lean_ctor_get(x_6, 1);
+lean_inc(x_11);
+lean_inc(x_10);
 lean_dec(x_6);
-x_10 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_10, 0, x_8);
-lean_ctor_set(x_10, 1, x_9);
-return x_10;
+x_12 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_12, 0, x_10);
+x_13 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_11);
+return x_13;
 }
 }
 }
@@ -684,21 +691,28 @@ x_6 = l_Lean_Elab_mkMessage___at_Lean_Elab_Level_elabLevel___main___spec__2(x_2,
 x_7 = !lean_is_exclusive(x_6);
 if (x_7 == 0)
 {
+lean_object* x_8; lean_object* x_9; 
+x_8 = lean_ctor_get(x_6, 0);
+x_9 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_9, 0, x_8);
 lean_ctor_set_tag(x_6, 1);
+lean_ctor_set(x_6, 0, x_9);
 return x_6;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_8 = lean_ctor_get(x_6, 0);
-x_9 = lean_ctor_get(x_6, 1);
-lean_inc(x_9);
-lean_inc(x_8);
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_10 = lean_ctor_get(x_6, 0);
+x_11 = lean_ctor_get(x_6, 1);
+lean_inc(x_11);
+lean_inc(x_10);
 lean_dec(x_6);
-x_10 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_10, 0, x_8);
-lean_ctor_set(x_10, 1, x_9);
-return x_10;
+x_12 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_12, 0, x_10);
+x_13 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_11);
+return x_13;
 }
 }
 }
diff --git a/stage0/stdlib/Init/Lean/Elab/Log.c b/stage0/stdlib/Init/Lean/Elab/Log.c
index b1f204888d..68685ef1ec 100644
--- a/stage0/stdlib/Init/Lean/Elab/Log.c
+++ b/stage0/stdlib/Init/Lean/Elab/Log.c
@@ -743,12 +743,14 @@ return x_2;
 lean_object* l_Lean_Elab_throwError___rarg___lambda__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_3; lean_object* x_4; 
+lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_3 = lean_ctor_get(x_1, 0);
 lean_inc(x_3);
 lean_dec(x_1);
-x_4 = lean_apply_2(x_3, lean_box(0), x_2);
-return x_4;
+x_4 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_4, 0, x_2);
+x_5 = lean_apply_2(x_3, lean_box(0), x_4);
+return x_5;
 }
 }
 lean_object* l_Lean_Elab_throwError___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
diff --git a/stage0/stdlib/Init/Lean/Elab/Quotation.c b/stage0/stdlib/Init/Lean/Elab/Quotation.c
index aa24f04ad5..08754fb816 100644
--- a/stage0/stdlib/Init/Lean/Elab/Quotation.c
+++ b/stage0/stdlib/Init/Lean/Elab/Quotation.c
@@ -46,7 +46,6 @@ extern lean_object* l_Lean_Parser_declareBuiltinParser___closed__8;
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_14__toPreterm(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_10__getAntiquotVarsAux___main(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__9;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabMatchSyntax___closed__1;
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__62;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabStxQuot___closed__2;
@@ -109,6 +108,7 @@ lean_object* l___private_Init_Lean_Elab_Quotation_12__letBindRhss___main___close
 lean_object* l___private_Init_Lean_Elab_Quotation_8__explodeHeadPat___lambda__1___closed__1;
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__49;
 lean_object* l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___closed__7;
+extern lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__4;
 lean_object* l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main___closed__11;
 lean_object* l_Lean_Elab_Term_stxQuot_expand___closed__12;
 lean_object* l_Lean_Parser_mkParserState(lean_object*);
@@ -141,7 +141,7 @@ lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__1;
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_8__explodeHeadPat___lambda__1___closed__3;
-extern lean_object* l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+extern lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__6;
 lean_object* l___private_Init_Lean_Elab_Quotation_13__exprPlaceholder;
 extern lean_object* l_Lean_Parser_Term_num___elambda__1___closed__1;
 lean_object* l_List_range(lean_object*);
@@ -150,7 +150,6 @@ lean_object* l_ReaderT_bind___at___private_Init_Lean_Elab_Quotation_1__quoteName
 lean_object* l___private_Init_Lean_Elab_Quotation_8__explodeHeadPat___lambda__1___closed__2;
 lean_object* lean_string_utf8_extract(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Name_inhabited;
-extern lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__4;
 lean_object* l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main___closed__12;
 lean_object* l___private_Init_Lean_Elab_Quotation_14__toPreterm___main(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_String_splitAux___main___closed__1;
@@ -163,6 +162,7 @@ lean_object* l___private_Init_Lean_Elab_Quotation_12__letBindRhss___main___close
 lean_object* l_List_foldl___main___at___private_Init_Lean_Elab_Quotation_14__toPreterm___main___spec__8(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_stxQuot_expand___closed__24;
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__48;
+extern lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__9;
 lean_object* lean_string_utf8_byte_size(lean_object*);
 lean_object* l_Lean_mkAtom(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__2;
@@ -270,6 +270,7 @@ lean_object* l___private_Init_Lean_Elab_Quotation_1__quoteName___main___lambda__
 lean_object* l_Array_umapMAux___main___at_Lean_Elab_Term_match__syntax_expand___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_letPatDecl___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_stxQuot_expand___closed__27;
+extern lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 lean_object* l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___closed__6;
 lean_object* l_Lean_Elab_Term_elabTerm(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -290,6 +291,7 @@ lean_object* l_Lean_Elab_Term_stxQuot_expand___closed__8;
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__29;
 lean_object* l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__2___closed__2;
 lean_object* l___private_Init_Lean_Elab_Quotation_3__quoteList___main___rarg___lambda__1___closed__5;
+extern lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__7;
 lean_object* l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__2___closed__1;
 lean_object* l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main___closed__20;
 lean_object* lean_mk_empty_local_ctx(lean_object*);
@@ -318,6 +320,7 @@ lean_object* l_Lean_Elab_Term_throwError___rarg(lean_object*, lean_object*, lean
 lean_object* l_Lean_Array_HasQuote___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__5;
 extern lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__2;
+extern lean_object* l_Lean_Elab_Exception_hasToString___closed__1;
 extern lean_object* l_Lean_Parser_Term_explicitUniv___elambda__1___closed__2;
 extern lean_object* l_PersistentArray_empty___closed__3;
 lean_object* l_Lean_Elab_Term_resolveName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -462,7 +465,6 @@ lean_object* l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main___cl
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__32;
 lean_object* l_Lean_List_HasQuote___rarg(lean_object*);
 lean_object* l_Lean_Prod_HasQuote___rarg___lambda__1___closed__4;
-extern lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__7;
 lean_object* l_Lean_LocalContext_mkLambda(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main___closed__25;
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__40;
@@ -524,6 +526,7 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabStxQuot___closed__3;
 lean_object* l___private_Init_Lean_Elab_Quotation_3__quoteList___main___rarg___lambda__2___closed__2;
 lean_object* l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__3;
 lean_object* l___private_Init_Lean_Elab_Quotation_8__explodeHeadPat___lambda__1(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__5;
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__7;
 lean_object* l___private_Init_Lean_Elab_Quotation_12__letBindRhss___main___closed__4;
 lean_object* l_Lean_Elab_Term_stxQuot_expand___closed__11;
@@ -612,7 +615,6 @@ lean_object* l___private_Init_Lean_Elab_Quotation_7__getHeadInfo___lambda__3___b
 extern lean_object* l_Lean_Elab_Term_elabArrayLit___closed__7;
 lean_object* l___private_Init_Lean_Elab_Quotation_7__getHeadInfo___elambda__2___closed__3;
 lean_object* l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main___closed__2;
-extern lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__6;
 lean_object* l_List_mapM___main___at___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main___spec__8___closed__3;
 lean_object* l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__1;
 extern lean_object* l_Lean_NameGenerator_Inhabited___closed__3;
@@ -1247,7 +1249,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_rootNamespace___closed__2;
-x_2 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__4;
+x_2 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -1257,7 +1259,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Prod_HasQuote___rarg___lambda__1___closed__4;
-x_2 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__6;
+x_2 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__6;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -1270,7 +1272,7 @@ x_8 = lean_box(0);
 x_9 = l_Lean_Prod_HasQuote___rarg___lambda__1___closed__5;
 x_10 = lean_name_mk_numeral(x_9, x_5);
 x_11 = l_Lean_Prod_HasQuote___rarg___lambda__1___closed__3;
-x_12 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__9;
+x_12 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__9;
 x_13 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_13, 0, x_8);
 lean_ctor_set(x_13, 1, x_11);
@@ -2561,12 +2563,12 @@ lean_object* l___private_Init_Lean_Elab_Quotation_3__quoteList___main___at___pri
 _start:
 {
 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_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; 
-x_13 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__4;
+x_13 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__4;
 x_14 = lean_name_mk_string(x_1, x_13);
-x_15 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__6;
+x_15 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__6;
 x_16 = lean_name_mk_string(x_14, x_15);
 x_17 = lean_name_mk_numeral(x_16, x_10);
-x_18 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__7;
+x_18 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__7;
 lean_inc(x_2);
 x_19 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_19, 0, x_18);
@@ -3416,7 +3418,7 @@ switch (lean_obj_tag(x_1)) {
 case 0:
 {
 lean_object* x_4; lean_object* x_5; lean_object* x_6; 
-x_4 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_4 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_5 = l_unreachable_x21___rarg(x_4);
 x_6 = lean_apply_2(x_5, x_2, x_3);
 return x_6;
@@ -5264,48 +5266,46 @@ return x_4;
 lean_object* l_Lean_Elab_Term_elabStxQuot(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_5 = lean_ctor_get(x_1, 1);
-x_6 = l_Lean_stxInh;
-x_7 = lean_unsigned_to_nat(1u);
-x_8 = lean_array_get(x_6, x_5, x_7);
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_unsigned_to_nat(1u);
+x_6 = l_Lean_Syntax_getArg(x_1, x_5);
 lean_inc(x_3);
-x_9 = l_Lean_Elab_Term_stxQuot_expand(x_8, x_3, x_4);
-lean_dec(x_8);
-if (lean_obj_tag(x_9) == 0)
+x_7 = l_Lean_Elab_Term_stxQuot_expand(x_6, x_3, x_4);
+lean_dec(x_6);
+if (lean_obj_tag(x_7) == 0)
 {
-lean_object* x_10; lean_object* x_11; uint8_t x_12; lean_object* x_13; 
-x_10 = lean_ctor_get(x_9, 0);
-lean_inc(x_10);
-x_11 = lean_ctor_get(x_9, 1);
-lean_inc(x_11);
-lean_dec(x_9);
-x_12 = 1;
-x_13 = l_Lean_Elab_Term_elabTerm(x_10, x_2, x_12, x_12, x_3, x_11);
-return x_13;
+lean_object* x_8; lean_object* x_9; uint8_t x_10; lean_object* x_11; 
+x_8 = lean_ctor_get(x_7, 0);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_7, 1);
+lean_inc(x_9);
+lean_dec(x_7);
+x_10 = 1;
+x_11 = l_Lean_Elab_Term_elabTerm(x_8, x_2, x_10, x_10, x_3, x_9);
+return x_11;
 }
 else
 {
-uint8_t x_14; 
+uint8_t x_12; 
 lean_dec(x_3);
 lean_dec(x_2);
-x_14 = !lean_is_exclusive(x_9);
-if (x_14 == 0)
+x_12 = !lean_is_exclusive(x_7);
+if (x_12 == 0)
 {
-return x_9;
+return x_7;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_15 = lean_ctor_get(x_9, 0);
-x_16 = lean_ctor_get(x_9, 1);
-lean_inc(x_16);
-lean_inc(x_15);
-lean_dec(x_9);
-x_17 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_17, 0, x_15);
-lean_ctor_set(x_17, 1, x_16);
-return x_17;
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_13 = lean_ctor_get(x_7, 0);
+x_14 = lean_ctor_get(x_7, 1);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_dec(x_7);
+x_15 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_15, 0, x_13);
+lean_ctor_set(x_15, 1, x_14);
+return x_15;
 }
 }
 }
@@ -6733,7 +6733,7 @@ lean_object* x_7; lean_object* x_8; lean_object* x_9;
 lean_dec(x_5);
 lean_dec(x_2);
 lean_dec(x_1);
-x_7 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_7 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_8 = l_unreachable_x21___rarg(x_7);
 x_9 = lean_apply_2(x_8, x_3, x_4);
 return x_9;
@@ -8652,7 +8652,7 @@ else
 lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_9);
 lean_dec(x_8);
-x_12 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_12 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_13 = l_unreachable_x21___rarg(x_12);
 x_14 = lean_apply_2(x_13, x_4, x_5);
 return x_14;
@@ -14241,61 +14241,57 @@ goto _start;
 lean_object* l_Lean_Elab_Term_match__syntax_expand(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_4 = lean_ctor_get(x_1, 1);
-lean_inc(x_4);
-x_5 = l_Lean_stxInh;
-x_6 = lean_unsigned_to_nat(1u);
-x_7 = lean_array_get(x_5, x_4, x_6);
-x_8 = lean_unsigned_to_nat(3u);
-x_9 = lean_array_get(x_5, x_4, x_8);
-lean_dec(x_4);
-x_10 = l_Lean_Syntax_getArgs(x_9);
-lean_dec(x_9);
-x_11 = lean_unsigned_to_nat(0u);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = l_Lean_Syntax_getArg(x_1, x_4);
+x_6 = lean_unsigned_to_nat(3u);
+x_7 = l_Lean_Syntax_getArg(x_1, x_6);
+x_8 = l_Lean_Syntax_getArgs(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(0u);
 lean_inc(x_2);
 lean_inc(x_1);
-x_12 = l_Array_umapMAux___main___at_Lean_Elab_Term_match__syntax_expand___spec__1(x_1, x_11, x_10, x_2, x_3);
-if (lean_obj_tag(x_12) == 0)
+x_10 = l_Array_umapMAux___main___at_Lean_Elab_Term_match__syntax_expand___spec__1(x_1, x_9, x_8, x_2, x_3);
+if (lean_obj_tag(x_10) == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-x_14 = lean_ctor_get(x_12, 1);
-lean_inc(x_14);
-lean_dec(x_12);
-x_15 = lean_box(0);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_7);
-lean_ctor_set(x_16, 1, x_15);
-x_17 = l_Array_toList___rarg(x_13);
-lean_dec(x_13);
-x_18 = l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main(x_1, x_16, x_17, x_2, x_14);
-return x_18;
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+lean_dec(x_10);
+x_13 = lean_box(0);
+x_14 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_14, 0, x_5);
+lean_ctor_set(x_14, 1, x_13);
+x_15 = l_Array_toList___rarg(x_11);
+lean_dec(x_11);
+x_16 = l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main(x_1, x_14, x_15, x_2, x_12);
+return x_16;
 }
 else
 {
-uint8_t x_19; 
-lean_dec(x_7);
+uint8_t x_17; 
+lean_dec(x_5);
 lean_dec(x_2);
 lean_dec(x_1);
-x_19 = !lean_is_exclusive(x_12);
-if (x_19 == 0)
+x_17 = !lean_is_exclusive(x_10);
+if (x_17 == 0)
 {
-return x_12;
+return x_10;
 }
 else
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; 
-x_20 = lean_ctor_get(x_12, 0);
-x_21 = lean_ctor_get(x_12, 1);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_dec(x_12);
-x_22 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_22, 0, x_20);
-lean_ctor_set(x_22, 1, x_21);
-return x_22;
+lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_18 = lean_ctor_get(x_10, 0);
+x_19 = lean_ctor_get(x_10, 1);
+lean_inc(x_19);
+lean_inc(x_18);
+lean_dec(x_10);
+x_20 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_20, 0, x_18);
+lean_ctor_set(x_20, 1, x_19);
+return x_20;
 }
 }
 }
@@ -16945,7 +16941,7 @@ lean_object* x_610; lean_object* x_611; lean_object* x_612; lean_object* x_613;
 x_610 = lean_ctor_get(x_608, 1);
 lean_inc(x_610);
 lean_dec(x_608);
-x_611 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_611 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_612 = l_unreachable_x21___rarg(x_611);
 x_613 = lean_apply_2(x_612, x_2, x_610);
 return x_613;
@@ -17416,7 +17412,7 @@ else
 lean_object* x_728; lean_object* x_729; lean_object* x_730; 
 lean_dec(x_604);
 lean_dec(x_1);
-x_728 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_728 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_729 = l_unreachable_x21___rarg(x_728);
 x_730 = lean_apply_2(x_729, x_2, x_3);
 return x_730;
@@ -18708,7 +18704,7 @@ lean_object* x_1100; lean_object* x_1101; lean_object* x_1102; lean_object* x_11
 x_1100 = lean_ctor_get(x_1098, 1);
 lean_inc(x_1100);
 lean_dec(x_1098);
-x_1101 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_1101 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_1102 = l_unreachable_x21___rarg(x_1101);
 x_1103 = lean_apply_2(x_1102, x_2, x_1100);
 return x_1103;
@@ -19099,7 +19095,7 @@ else
 lean_object* x_1177; lean_object* x_1178; lean_object* x_1179; 
 lean_dec(x_1094);
 lean_dec(x_1);
-x_1177 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_1177 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_1178 = l_unreachable_x21___rarg(x_1177);
 x_1179 = lean_apply_2(x_1178, x_2, x_3);
 return x_1179;
@@ -20447,7 +20443,7 @@ lean_object* x_1558; lean_object* x_1559; lean_object* x_1560; lean_object* x_15
 x_1558 = lean_ctor_get(x_1556, 1);
 lean_inc(x_1558);
 lean_dec(x_1556);
-x_1559 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_1559 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_1560 = l_unreachable_x21___rarg(x_1559);
 x_1561 = lean_apply_2(x_1560, x_2, x_1558);
 return x_1561;
@@ -20838,7 +20834,7 @@ else
 lean_object* x_1635; lean_object* x_1636; lean_object* x_1637; 
 lean_dec(x_1552);
 lean_dec(x_1);
-x_1635 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_1635 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_1636 = l_unreachable_x21___rarg(x_1635);
 x_1637 = lean_apply_2(x_1636, x_2, x_3);
 return x_1637;
@@ -22219,7 +22215,7 @@ lean_object* x_2022; lean_object* x_2023; lean_object* x_2024; lean_object* x_20
 x_2022 = lean_ctor_get(x_2020, 1);
 lean_inc(x_2022);
 lean_dec(x_2020);
-x_2023 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_2023 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_2024 = l_unreachable_x21___rarg(x_2023);
 x_2025 = lean_apply_2(x_2024, x_2, x_2022);
 return x_2025;
@@ -22610,7 +22606,7 @@ else
 lean_object* x_2099; lean_object* x_2100; lean_object* x_2101; 
 lean_dec(x_2016);
 lean_dec(x_1);
-x_2099 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_2099 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_2100 = l_unreachable_x21___rarg(x_2099);
 x_2101 = lean_apply_2(x_2100, x_2, x_3);
 return x_2101;
@@ -24023,7 +24019,7 @@ lean_object* x_2493; lean_object* x_2494; lean_object* x_2495; lean_object* x_24
 x_2493 = lean_ctor_get(x_2491, 1);
 lean_inc(x_2493);
 lean_dec(x_2491);
-x_2494 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_2494 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_2495 = l_unreachable_x21___rarg(x_2494);
 x_2496 = lean_apply_2(x_2495, x_2, x_2493);
 return x_2496;
@@ -24414,7 +24410,7 @@ else
 lean_object* x_2570; lean_object* x_2571; lean_object* x_2572; 
 lean_dec(x_2487);
 lean_dec(x_1);
-x_2570 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_2570 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_2571 = l_unreachable_x21___rarg(x_2570);
 x_2572 = lean_apply_2(x_2571, x_2, x_3);
 return x_2572;
@@ -25017,6 +25013,16 @@ lean_object* _init_l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___ra
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Exception_hasToString___closed__1;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
 x_1 = l___private_Init_Lean_Meta_LevelDefEq_10__processPostponedStep___closed__1;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
@@ -25102,20 +25108,33 @@ lean_inc(x_31);
 lean_dec(x_28);
 if (lean_obj_tag(x_31) == 0)
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+lean_object* x_32; 
 x_32 = lean_ctor_get(x_31, 0);
 lean_inc(x_32);
 lean_dec(x_31);
-x_33 = l_Lean_Message_toString(x_32);
-x_34 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_34, 0, x_33);
-return x_34;
+if (lean_obj_tag(x_32) == 0)
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_32, 0);
+lean_inc(x_33);
+lean_dec(x_32);
+x_34 = l_Lean_Message_toString(x_33);
+x_35 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_35, 0, x_34);
+return x_35;
 }
 else
 {
-lean_object* x_35; 
-x_35 = l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__4;
-return x_35;
+lean_object* x_36; 
+x_36 = l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__4;
+return x_36;
+}
+}
+else
+{
+lean_object* x_37; 
+x_37 = l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__5;
+return x_37;
 }
 }
 }
@@ -26012,6 +26031,8 @@ l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__3 = _i
 lean_mark_persistent(l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__3);
 l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__4 = _init_l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__4();
 lean_mark_persistent(l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__4);
+l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__5 = _init_l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__5();
+lean_mark_persistent(l___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___rarg___closed__5);
 l_Lean_Elab_Term_oldExpandStxQuot___closed__1 = _init_l_Lean_Elab_Term_oldExpandStxQuot___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_oldExpandStxQuot___closed__1);
 l_Lean_Elab_Term_oldGetAntiquotVars___closed__1 = _init_l_Lean_Elab_Term_oldGetAntiquotVars___closed__1();
diff --git a/stage0/stdlib/Init/Lean/Elab/Term.c b/stage0/stdlib/Init/Lean/Elab/Term.c
index 63af186939..0945d10c96 100644
--- a/stage0/stdlib/Init/Lean/Elab/Term.c
+++ b/stage0/stdlib/Init/Lean/Elab/Term.c
@@ -14,38 +14,32 @@
 extern "C" {
 #endif
 lean_object* l_Lean_Elab_mkMessage___at_Lean_Elab_Term_throwError___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__11(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_reverse___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__4;
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabChar(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkAppM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabNum___closed__1;
 lean_object* l_Lean_Elab_Term_getEnv___rarg(lean_object*);
 extern lean_object* l_Lean_Name_toString___closed__1;
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__9;
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__9;
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__2;
 lean_object* l_Lean_Elab_Term_mkForall(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__1;
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_14__resumePostponed___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___closed__6;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__8;
-lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabNum(lean_object*);
 uint8_t l_Lean_MessageData_hasSyntheticSorry___main(lean_object*);
-size_t l_USize_add(size_t, size_t);
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__1;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__4;
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_Term_mkBuiltinTermElabTable___spec__1___closed__2;
 lean_object* l_Lean_Expr_mvarId_x21(lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__8;
 lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec__1___closed__2;
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__2;
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
-lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3;
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isNatLitAux(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_23__resolveLocalName___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__8;
 lean_object* l___private_Init_Lean_Elab_Term_1__getBetterRef(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_declareBuiltinParser___closed__8;
 lean_object* l_Lean_Elab_Term_State_inhabited;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabChar(lean_object*);
@@ -53,7 +47,7 @@ lean_object* l___private_Init_Lean_Elab_Term_2__prettyPrint___boxed(lean_object*
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Lean_mkSort(lean_object*);
 lean_object* l_Lean_Elab_Term_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__9;
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_9__expandCDotInApp(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__9;
 lean_object* l_Lean_Elab_Term_mkFreshExprMVar(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
@@ -62,22 +56,22 @@ lean_object* l_Lean_Elab_Term_elabArrayLit___closed__13;
 lean_object* l_unreachable_x21___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__1;
 extern lean_object* l_Lean_nullKind;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
 lean_object* l_Lean_Meta_whnfForall(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__8;
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__1;
 extern lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__2;
 lean_object* l_Lean_Elab_Term_TermElabM_MonadQuotation;
 extern lean_object* l_Lean_MessageData_ofList___closed__3;
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___main(lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__2;
 lean_object* lean_array_uget(lean_object*, size_t);
 lean_object* l_Lean_Elab_Term_tryPostpone___boxed(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_10__exceptionToSorry(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_inferType(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__1;
 lean_object* l_Lean_Elab_Term_assignExprMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Expr_hasSorry___main___closed__1;
+lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__2;
 lean_object* l_Lean_Elab_Term_mkTermElabAttribute___closed__3;
 lean_object* l_Lean_Elab_Term_ensureHasType___closed__2;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__2;
@@ -90,28 +84,27 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabChar___closed__2;
 lean_object* l_Lean_Elab_Term_TermElabM_MonadQuotation___closed__3;
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr___closed__3;
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_Term_mkBuiltinTermElabTable___spec__1___closed__1;
-lean_object* l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForall(lean_object*, lean_object*, lean_object*, lean_object*);
 extern size_t l_PersistentHashMap_insertAux___main___rarg___closed__2;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Option_get_x21___rarg___closed__3;
 lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec__1___closed__1;
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___closed__1;
 lean_object* l_Lean_Meta_mkAppM(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_levelMVarToParam___closed__1;
 lean_object* l_Lean_Elab_Term_elabParen(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabNum___closed__2;
-lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 extern lean_object* l_Lean_nameToExprAux___main___closed__4;
 lean_object* l_Lean_Elab_Term_getLocalInsts___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resettingSynthInstanceCacheWhen___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_getPos___at_Lean_Elab_Term_throwError___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_mkHashMap___at_Lean_Elab_Term_mkBuiltinTermElabTable___spec__2(lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__2;
-lean_object* l___private_Init_Lean_Elab_Term_22__resolveLocalNameAux___main(lean_object*, lean_object*, lean_object*);
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__7;
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__2;
 extern lean_object* l_Lean_Parser_Term_type___elambda__1___closed__2;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__2;
+lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__1;
 uint8_t l_List_elem___main___at_Lean_addAliasEntry___spec__18(lean_object*, lean_object*);
 extern lean_object* l_Prod_HasRepr___rarg___closed__1;
+lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Term_6__fromMetaState___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_stxInh;
 lean_object* l_Lean_Meta_Exception_toMessageData(lean_object*);
@@ -119,24 +112,27 @@ extern lean_object* l_PersistentHashMap_mkCollisionNode___rarg___closed__1;
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog;
 lean_object* l_Lean_mkMVar(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_11__postponeElabTerm(lean_object*, lean_object*, lean_object*, lean_object*);
-size_t l_USize_sub(size_t, size_t);
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l___private_Init_Lean_Elab_Term_11__postponeElabTerm___closed__2;
 lean_object* lean_environment_find(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep(uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabSort___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_resolveName___closed__3;
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep(uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_logAt___at_Lean_Elab_Term_logTrace___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__2;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__1;
 lean_object* l_Lean_Elab_Term_elabTypeStx___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr___closed__5;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax(lean_object*);
 lean_object* lean_dbg_trace(lean_object*, lean_object*);
 lean_object* lean_io_mk_ref(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__4;
+lean_object* l___private_Init_Lean_Elab_Term_16__checkWithDefault___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getEnv___boxed(lean_object*);
+lean_object* l_Lean_Elab_ElabFnTable_insert___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__3;
 lean_object* l_List_append___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBadCDot(lean_object*);
 lean_object* l_Lean_Elab_Term_unfoldDefinition_x3f(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
@@ -147,6 +143,7 @@ extern lean_object* l_Lean_Parser_declareBuiltinParser___closed__5;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__6;
 lean_object* l_Lean_mkIdentFrom(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabHole(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__1;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Term_6__fromMetaState___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withoutPostponing(lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__13;
@@ -161,6 +158,7 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabListLit___closed__1;
 lean_object* l_Lean_Elab_Term_mkLambda(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_8__expandCDot___closed__1;
 lean_object* l_Lean_Elab_Term_TermElabM_MonadQuotation___closed__1;
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__2;
 extern lean_object* l_Lean_Literal_type___closed__3;
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
@@ -170,21 +168,19 @@ lean_object* l_Lean_Elab_Term_resetSynthInstanceCache(lean_object*);
 lean_object* l_Lean_Elab_Term_mkForallUsedOnly(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_inferType___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerAttribute(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabListLit___closed__2;
 lean_object* lean_string_append(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__6;
 extern lean_object* l_Lean_Meta_Exception_toStr___closed__1;
 extern lean_object* l_Lean_Parser_Term_num___elambda__1___closed__1;
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_Elab_Term_elabListLit___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_ensureType(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBadCDot___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_Term_25__mkConsts___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_13__resumePostponed___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_13__resumePostponed___closed__1;
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__1;
 lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___closed__3;
 lean_object* l_PersistentArray_push___rarg(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__4;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabTypeStx___closed__2;
 extern lean_object* l_String_splitAux___main___closed__1;
 lean_object* l_Lean_Elab_Term_logTrace___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -195,22 +191,26 @@ lean_object* l_Lean_WHNF_unfoldDefinitionAux___at_Lean_Meta_unfoldDefinition_x3f
 extern lean_object* l_List_repr___rarg___closed__3;
 extern lean_object* l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_throwError(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabSort___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getMCtx(lean_object*);
 size_t l_USize_shiftRight(size_t, size_t);
 lean_object* l_Lean_Elab_Term_withLCtx___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__10(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTerm___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_Term_elabTerm___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__6;
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__9;
 lean_object* l_Lean_Elab_Term_resolveName___closed__6;
 lean_object* l_Lean_Elab_Term_synthesizeSyntheticMVars(uint8_t, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_Term_elabTerm___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTypeStx___rarg(lean_object*);
 lean_object* lean_string_utf8_byte_size(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__8;
 lean_object* l_Lean_mkAtom(lean_object*);
 lean_object* l_Lean_Elab_Term_elabParen___closed__6;
 extern lean_object* l_Lean_Parser_Term_tupleTail___elambda__1___closed__2;
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabTypeStx___closed__1;
 extern lean_object* l_Lean_Parser_Term_cons___elambda__1___closed__1;
 lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -220,11 +220,11 @@ extern lean_object* l_Lean_Parser_Term_sort___elambda__1___closed__2;
 extern lean_object* l_Lean_Meta_MetaHasEval___rarg___closed__4;
 lean_object* l_Lean_Elab_Term_assignExprMVar(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Elab_Term_elabTerm___spec__6(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_13__resumePostponed(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Elab_Term_TermElabM_MonadLog___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_Exception_hasToString(lean_object*);
 extern lean_object* l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabParen___closed__5;
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 extern lean_object* l_Lean_LocalContext_Inhabited___closed__1;
 lean_object* l_Lean_Elab_Term_resolveName___closed__5;
 lean_object* l_Lean_Elab_Term_mkFreshExprMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -240,22 +240,21 @@ lean_object* l___private_Init_Lean_Elab_Term_10__exceptionToSorry___closed__3;
 lean_object* l_Lean_Elab_Term_TermElabResult_inhabited___closed__1;
 extern lean_object* l_Lean_AttributeImpl_inhabited___closed__2;
 lean_object* lean_nat_add(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_22__resolveLocalNameAux(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshInstanceName___rarg___closed__1;
 lean_object* l_Lean_Elab_Term_termElabAttribute___closed__2;
+lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__3(uint8_t);
 lean_object* l_Lean_Elab_Term_ensureHasType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getTraceState(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__2;
 lean_object* l_Lean_Elab_Term_mkFreshTypeMVar(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___closed__7;
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousIdent(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabParen___closed__2;
 lean_object* l_Lean_Elab_Term_mkLet(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_whnf(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__3;
 lean_object* l_Lean_Elab_Term_elabArrayLit(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getOptions(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabParen___closed__1;
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__10;
 lean_object* l_Lean_Elab_Term_elabListLit___closed__1;
 lean_object* l_Lean_Elab_Term_liftMetaM(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_5__fromMetaException(lean_object*, lean_object*, lean_object*);
@@ -263,7 +262,6 @@ extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__1;
 lean_object* l_Lean_Elab_Term_elabNum___closed__5;
 extern lean_object* l_Lean_Format_repr___main___closed__13;
 lean_object* l_Lean_Elab_Term_elabListLit___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__3;
 uint8_t lean_metavar_ctx_is_expr_assigned(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isClass(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_contains___at_Lean_Elab_Term_addBuiltinTermElab___spec__1___boxed(lean_object*, lean_object*);
@@ -274,10 +272,13 @@ lean_object* l_Lean_Elab_Term_elabListLit___closed__2;
 extern lean_object* l_Lean_Parser_Term_typeAscription___elambda__1___closed__5;
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousName___boxed(lean_object*);
 extern lean_object* l_Lean_Meta_dbgTrace___rarg___closed__1;
+lean_object* l_Lean_Elab_Term_mkConst___closed__6;
+lean_object* l___private_Init_Lean_Elab_Term_23__resolveLocalNameAux(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_tryPostponeIfNoneOrMVar(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabParen___closed__4;
 lean_object* l___private_Init_Lean_Elab_Term_8__expandCDot(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabLevel(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__3;
 lean_object* l_Lean_Syntax_isCharLit_x3f(lean_object*);
 lean_object* l_Array_isEqvAux___main___at_Lean_Elab_Term_withMVarContext___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
@@ -288,7 +289,6 @@ lean_object* l_Lean_Elab_Term_elabChar___closed__1;
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousName___rarg(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProp___closed__3;
 extern lean_object* l_Lean_Expr_Inhabited___closed__1;
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__5;
 lean_object* l_PersistentArray_foldlMAux___main___at___private_Init_Lean_Elab_Term_6__fromMetaState___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withMVarContext(lean_object*);
@@ -303,25 +303,30 @@ lean_object* l_ReaderT_bind___at_Lean_Elab_Term_TermElabM_MonadLog___spec__2(lea
 lean_object* l_Lean_Elab_Term_declareBuiltinTermElab(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withMacroExpansion(lean_object*);
 lean_object* l_Lean_Elab_Term_getTraceState___rarg(lean_object*);
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_23__resolveLocalName(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_State_inhabited___closed__1;
 extern lean_object* l_Lean_EnvExtension_Inhabited___rarg___closed__1;
 lean_object* l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_26__mkConsts(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_dbgTrace(lean_object*);
 extern lean_object* l_Lean_Parser_Term_id___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__11;
 lean_object* l_Lean_Elab_Term_decLevel_x3f(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_numLitKind;
 lean_object* l_Lean_Elab_Term_elabTerm___closed__6;
-lean_object* l___private_Init_Lean_Elab_Term_25__mkConsts(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_24__resolveLocalName(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_levelMVarToParam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabChar___closed__2;
 lean_object* l_Lean_Elab_Term_mkLambda___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getLevel(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__5;
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__6;
 lean_object* l_Lean_Elab_Term_getCurrNamespace(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__10;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSort___closed__3;
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__3;
 extern lean_object* l_Lean_Expr_isSyntheticSorry___closed__1;
 extern lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__4;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Term_6__fromMetaState___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -330,31 +335,30 @@ lean_object* l_Lean_Elab_Term_elabProp___rarg(lean_object*);
 lean_object* l_PersistentHashMap_empty___at_Lean_Elab_Term_mkBuiltinTermElabTable___spec__3;
 uint8_t l___private_Init_Lean_Elab_Term_7__hasCDot___main(lean_object*);
 lean_object* l_Lean_Syntax_isStrLit_x3f(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing(lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabNum___closed__3;
 lean_object* l_Lean_Elab_Term_termElabAttribute___closed__1;
 lean_object* l_Lean_Elab_Term_mkFreshInstanceName(lean_object*);
 lean_object* l_Lean_Elab_Term_elabChar___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_append___main(lean_object*, lean_object*);
-lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__3;
 lean_object* l_Lean_Elab_mkMessageCore(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
 lean_object* l_Lean_Elab_Term_mkHole___boxed(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withMacroExpansion___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__3;
 lean_object* l_Lean_Elab_Term_levelMVarToParam___closed__2;
 lean_object* l_Lean_Elab_Term_elabStr___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabParen(lean_object*);
 lean_object* l_Lean_Elab_Term_mkConst___closed__2;
-lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1;
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabTerm(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabStr___closed__1;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__5;
 lean_object* l___private_Init_Lean_Elab_Term_4__mkMessageAux(lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___closed__10;
 lean_object* l_Lean_Elab_Term_TermElabM_inhabited(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___lambda__3___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkInstMVar(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__6;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_levelMVarToParam___lambda__1___boxed(lean_object*, lean_object*);
@@ -363,57 +367,54 @@ lean_object* l_Lean_Elab_Term_setTraceState___boxed(lean_object*, lean_object*,
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__7;
 lean_object* l_Lean_Elab_Term_mkTermId___boxed(lean_object*, lean_object*);
+lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkConst___closed__4;
-lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2;
 lean_object* l_List_lengthAux___main___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForallUsedOnly(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_appendIndexAfter(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Term_6__fromMetaState___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__7;
 lean_object* l_Lean_Elab_Term_withNode___rarg___closed__1;
 lean_object* l_Lean_Elab_Term_elabTypeStx(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withFreshMacroScope(lean_object*);
 uint8_t l___private_Init_Lean_Elab_Term_1__getBetterRef___lambda__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveName___closed__7;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__3;
 size_t l_Lean_Name_hash(lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Term_6__fromMetaState___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_termElabAttribute___closed__3;
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__7;
 lean_object* l_Nat_repr(lean_object*);
 lean_object* l_Lean_Elab_Term_State_inhabited___closed__2;
 extern lean_object* l_Char_HasRepr___closed__1;
 lean_object* l_Lean_Elab_Term_elabNum___closed__2;
-lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Term_withNode___rarg___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabListLit___closed__3;
 lean_object* l_Lean_Elab_Term_expandCDot_x3f___closed__3;
 lean_object* l_Lean_Elab_Term_logTrace(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_AssocList_foldlM___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__14(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_trySynthInstance(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_liftLevelM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabStr___closed__2;
 lean_object* l_Lean_Elab_Term_elabListLit___closed__4;
 extern lean_object* l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
-extern lean_object* l_PersistentHashMap_insertAux___main___rarg___closed__3;
+lean_object* l___private_Init_Lean_Elab_Term_13__resumeElabTerm(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_IO_ofExcept___at_Lean_Parser_declareBuiltinParser___spec__1(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_12__resumeElabTerm(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_whnfForall___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getLevel___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_List_repr___rarg___closed__2;
 lean_object* l_Lean_Elab_Term_trySynthInstance___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__5;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabTypeStx(lean_object*);
 lean_object* l_Lean_Elab_Term_isClass___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabParen___closed__3;
 lean_object* l_Lean_Elab_Term_elabNum___closed__1;
 lean_object* l_Lean_Elab_Term_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Term_logTrace___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__5;
 extern lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabTypeStx___rarg___closed__1;
+extern lean_object* l_Lean_Elab_Exception_hasToString___closed__1;
 extern lean_object* l_Lean_Parser_Term_explicitUniv___elambda__1___closed__2;
 extern lean_object* l_PersistentArray_empty___closed__3;
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_Term_elabTerm___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -429,7 +430,7 @@ lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_assignExpr(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_Term_elabTerm___spec__3(lean_object*, size_t, lean_object*);
 lean_object* l_Lean_Elab_Term_applyResult___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__7;
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkTermElabAttribute(lean_object*);
 lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec__1___closed__3;
 uint8_t l_PersistentHashMap_contains___at_Lean_Elab_Term_addBuiltinTermElab___spec__4(lean_object*, lean_object*);
@@ -438,36 +439,36 @@ extern lean_object* l_Lean_Parser_declareBuiltinParser___closed__7;
 lean_object* l_Lean_Elab_Term_mkAppM___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getCurrMacroScope___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_explicitUniv___elambda__1___closed__1;
+lean_object* l___private_Init_Lean_Elab_Term_13__resumeElabTerm___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Options_empty;
+lean_object* l_Lean_Elab_Term_mkConst___closed__7;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabTypeStx___closed__3;
 lean_object* l_Lean_Elab_Term_elabLevel___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSort(lean_object*);
 uint8_t l_PersistentHashMap_containsAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__5(lean_object*, size_t, lean_object*);
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__4;
 size_t lean_usize_modn(size_t, lean_object*);
 lean_object* l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3;
+lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1;
 lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_liftLevelM(lean_object*);
 lean_object* l_Lean_Elab_Term_elabProp(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveName___closed__8;
 lean_object* l_Lean_LocalDecl_toExpr(lean_object*);
 lean_object* l_Lean_Elab_Term_termElabAttribute___closed__5;
-lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_13__resumePostponed___spec__1(lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrayLit___closed__3;
-size_t l_USize_mul(size_t, size_t);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrayLit(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSort___closed__1;
 lean_object* l_Lean_Elab_mkMessageAt___at_Lean_Elab_Term_throwError___spec__3(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Lean_Parser_Parser_8__addParserCategory___closed__2;
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__9(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_expand___at_Lean_Elab_Term_addBuiltinTermElab___spec__12(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_hole___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_addBuiltinTermElab___closed__1;
 lean_object* l_mkHashMapImp___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_whnfCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getCurrNamespace___boxed(lean_object*, lean_object*);
 lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_Term_elabTerm___spec__5(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabParen___closed__1;
 lean_object* l_Lean_Elab_Level_elabLevel___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_ensureHasType___closed__1;
@@ -478,18 +479,17 @@ lean_object* l_Lean_Elab_Term_mkFreshInstanceName___rarg(lean_object*);
 lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
 lean_object* l_Lean_Meta_whnf(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSort___closed__2;
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__1;
 lean_object* l_Lean_Elab_Term_isClass(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_26__regTraceClasses(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabResult_inhabited;
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withMVarContext___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__4;
-lean_object* l___private_Init_Lean_Elab_Term_12__resumeElabTerm___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_inhabited___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___lambda__4___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousIdent___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__3;
 lean_object* l___private_Init_Lean_Elab_Term_9__expandCDotInApp___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
@@ -498,38 +498,39 @@ extern lean_object* l_Lean_Parser_Term_cdot___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__9;
 lean_object* l_Lean_Elab_Term_resolveName___closed__9;
 lean_object* l_PersistentArray_foldlM___at___private_Init_Lean_Elab_Term_6__fromMetaState___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_14__resumePostponed___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlM___at___private_Init_Lean_Elab_Term_6__fromMetaState___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3;
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabListLit___closed__5;
 size_t l_USize_land(size_t, size_t);
 lean_object* l_Lean_Elab_Term_mkConst(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_HashMapImp_contains___at_Lean_Elab_Term_addBuiltinTermElab___spec__2___boxed(lean_object*, lean_object*);
-lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars(lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Elab_Term_elabTerm___spec__6___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkConst___closed__3;
 lean_object* l_Lean_Elab_Term_resolveName___closed__4;
 lean_object* l_Lean_Elab_Term_withNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__5;
-lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__13(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___lambda__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ParametricAttribute_setParam___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars(lean_object*, lean_object*);
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__8;
 lean_object* l___private_Init_Lean_Elab_Term_7__hasCDot___main___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_termElabAttribute;
+lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__3___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_expandCDot_x3f___closed__1;
 lean_object* l_fix1___rarg___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__10;
 lean_object* l_Lean_Elab_Term_mkTermIdFromIdent(lean_object*);
 extern lean_object* l_Lean_Meta_Exception_toStr___closed__7;
-lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__3___boxed(lean_object*);
 lean_object* l_Lean_mkAtomFrom(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getDeclName_x3f___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_isDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__10;
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___lambda__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ConstantInfo_lparams(lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__5;
+lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousName(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_11__postponeElabTerm___closed__3;
 lean_object* l_Lean_Elab_Term_withLCtx(lean_object*);
@@ -537,7 +538,9 @@ uint8_t l___private_Init_Lean_Elab_Term_7__hasCDot(lean_object*);
 lean_object* l_Lean_Elab_Term_withNode(lean_object*);
 extern lean_object* l_Option_HasRepr___rarg___closed__3;
 lean_object* l_Lean_Elab_Term_traceAtCmdPos___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__9;
 lean_object* l_Lean_Elab_Term_elabTerm___closed__4;
+lean_object* l___private_Init_Lean_Elab_Term_16__checkWithDefault(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withoutPostponing___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_prop___elambda__1___closed__2;
 lean_object* l___private_Init_Lean_Elab_Term_8__expandCDot___closed__3;
@@ -550,51 +553,46 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProp___closed__2;
 lean_object* l_Lean_Elab_Term_elabBadCDot___closed__2;
 lean_object* l_Lean_Elab_Term_liftMetaM___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr___lambda__1___closed__4;
-lean_object* l_Lean_Meta_trySynthInstance(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_trySynthInstance(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__7;
-lean_object* l___private_Init_Lean_Elab_Term_15__checkWithDefault(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_23__resolveLocalNameAux___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_WHNF_whnfCore___main___at_Lean_Meta_whnfCore___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabStr(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__5;
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__4;
 lean_object* l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_getLCtx(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_traceAtCmdPos(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_HashMapImp_contains___at_Lean_Elab_Term_addBuiltinTermElab___spec__2(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_ensureHasType___closed__3;
+lean_object* l___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_decLevel___closed__5;
 lean_object* l_PersistentHashMap_contains___at_Lean_Elab_Term_addBuiltinTermElab___spec__4___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_inhabited___rarg(lean_object*);
 uint8_t l_Lean_Expr_isMVar(lean_object*);
 lean_object* l_Lean_Elab_Term_mkHole(lean_object*);
 extern lean_object* l_Lean_mkInitAttr___lambda__1___closed__1;
-uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_termElabAttribute___closed__6;
-uint8_t l_USize_decLe(size_t, size_t);
 lean_object* l_Lean_Meta_mkFreshExprMVar(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkConst___closed__5;
 lean_object* l_Lean_mkApp(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__12;
 extern lean_object* l_Lean_Syntax_asNode___closed__1;
 lean_object* l_Lean_nameToExprAux___main(lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__5;
-lean_object* l_Lean_SMap_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__6(lean_object*, lean_object*, lean_object*);
 uint8_t l_AssocList_contains___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__3(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_1__getBetterRef___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_4__mkMessageAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__6;
+lean_object* l___private_Init_Lean_Elab_Term_15__synthesizePendingInstMVar___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrayLit___closed__2;
-lean_object* l___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Bool_HasRepr___closed__2;
 lean_object* l_Lean_Elab_Term_ensureType___closed__2;
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___closed__1;
 lean_object* l_Lean_Environment_addAndCompile(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_registerSyntheticMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Syntax_getKind(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_6__fromMetaState___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr(lean_object*);
@@ -603,50 +601,48 @@ lean_object* l_Lean_Elab_Term_decLevel___closed__3;
 lean_object* l_Lean_Elab_Term_elabTerm___closed__1;
 extern lean_object* l_Lean_Parser_Term_paren___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr___lambda__1___closed__1;
-lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_13__resumePostponed___spec__1___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__9;
+lean_object* lean_panic_fn(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_decLevel_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_13__resumePostponed___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__6;
 lean_object* l_Lean_Elab_Term_ensureType___closed__1;
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Term_logTrace___spec__1(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_getPos___at_Lean_Elab_Term_throwError___spec__2(lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentHashMap_containsAtAux___main___at_Lean_Parser_isValidSyntaxNodeKind___spec__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Lean_Elab_Term_expandCDot_x3f___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTerm___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_app___elambda__1___closed__2;
 extern lean_object* l_Lean_EnvExtension_setState___closed__1;
 lean_object* l_Lean_Elab_Term_liftLevelM___rarg___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__2;
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___closed__9;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__6;
 lean_object* l_Lean_Elab_Term_tryPostponeIfMVar___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_whnfCore(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Util_1__mkPanicMessage___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabParen___closed__2;
 lean_object* l_Lean_Elab_Term_resettingSynthInstanceCacheWhen___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_logAt___at_Lean_Elab_Term_logTrace___spec__2(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__7;
 lean_object* l_Lean_Elab_Term_mkConst___closed__1;
 lean_object* l_Lean_Elab_Term_isExprMVarAssigned(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTerm___closed__2;
 lean_object* l_Lean_Elab_Term_whnf___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabHole___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__4;
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__7;
 lean_object* lean_io_ref_reset(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_unfoldDefinition_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkExplicitBinder(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabSort(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_Term_levelMVarToParam___lambda__1(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__7;
-lean_object* l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_adaptExpander(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_15__synthesizePendingInstMVar(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withMVarContext___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getLevel(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_tryPostponeIfMVar(lean_object*, lean_object*, lean_object*);
-lean_object* lean_nat_mul(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__8;
 lean_object* l_Lean_Syntax_getPos(lean_object*);
 lean_object* l_Lean_Elab_Term_elabListLit(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__2;
 lean_object* l_Lean_Elab_Term_elabType(lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Lean_Elab_Term_expandCDot_x3f___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Lean_Meta_LevelDefEq_10__processPostponedStep___closed__1;
@@ -661,7 +657,6 @@ lean_object* l_Lean_Elab_Term_withFreshMacroScope___rarg(lean_object*, lean_obje
 extern lean_object* l_Lean_TraceState_Inhabited___closed__1;
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resetSynthInstanceCache___rarg(lean_object*);
-lean_object* l_PersistentHashMap_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__7(lean_object*, lean_object*, lean_object*);
 lean_object* lean_io_ref_set(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabStr___closed__3;
 lean_object* l_Lean_Elab_resolveGlobalName(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -672,36 +667,33 @@ lean_object* l_Lean_Meta_isExprDefEq(lean_object*, lean_object*, lean_object*, l
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabListLit(lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__3;
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
-lean_object* l_PersistentHashMap_getCollisionNodeSize___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___closed__5;
+lean_object* l_Lean_Elab_Term_tryEnsureHasType_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_22__elabCDot(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_decLevel___closed__4;
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabChar___closed__3;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__12;
 lean_object* l_Lean_Meta_mkLambda(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_KernelException_toMessageData___closed__12;
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTerm___closed__3;
+extern lean_object* l_Lean_Expr_Inhabited;
 lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_addBuiltinTermElab(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_21__elabCDot(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* lean_mk_array(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabStr(lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___closed__2;
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_Term_26__mkConsts___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_getState___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__3(uint8_t);
+lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabHole___closed__3;
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__1;
 lean_object* l_Lean_Elab_mkMessage___at_Lean_Elab_Term_throwError___spec__1(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__1;
 lean_object* l_Lean_Elab_Term_getOpenDecls___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getTraceState___boxed(lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__3;
 lean_object* l_Lean_Elab_Term_mkFreshLevelMVar(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__4;
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__1;
 lean_object* l_Lean_Elab_Term_resettingSynthInstanceCache___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_6__fromMetaState(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveName___closed__2;
@@ -709,27 +701,25 @@ lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lea
 lean_object* l_Lean_Elab_Term_mkPairs___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabStr___closed__1;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__11;
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_isDefEq___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getLCtx___boxed(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshLevelMVar___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-lean_object* l___private_Init_Lean_Elab_Term_15__checkWithDefault___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_setTraceState(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_tryPostpone(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkPairs(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_foldlMAux___main___at___private_Init_Lean_Elab_Term_6__fromMetaState___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__8;
+lean_object* l_Lean_Elab_Term_tryEnsureHasType_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkFreshLevelMVar___rarg(lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_MetavarContext_Inhabited___closed__1;
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__2;
 uint8_t l_Lean_SMap_contains___at_Lean_Elab_Term_addBuiltinTermElab___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabNum(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__8;
 lean_object* l_Lean_Elab_Term_elabListLit___closed__3;
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_14__resumePostponed___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkNatLit(lean_object*);
 lean_object* l_Lean_mkStrLit(lean_object*);
 lean_object* l_Lean_Elab_Term_addContext(lean_object*, lean_object*, lean_object*);
@@ -740,6 +730,7 @@ lean_object* l_Lean_Elab_Term_withNode___rarg___closed__3;
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr___closed__4;
 extern lean_object* l_Lean_Meta_resettingSynthInstanceCache___rarg___closed__1;
 lean_object* l___private_Init_Lean_Elab_Term_5__fromMetaException___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_27__regTraceClasses(lean_object*);
 lean_object* l_Lean_MetavarContext_getDecl(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_formatStxAux___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resetSynthInstanceCache___boxed(lean_object*);
@@ -747,7 +738,6 @@ lean_object* l_Lean_Elab_Term_decLevel___closed__2;
 lean_object* l_Lean_Elab_Term_decLevel___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBadCDot___closed__1;
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr___lambda__1(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
-lean_object* l_AssocList_replace___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__15(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_10__exceptionToSorry___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_builtinTermElabTable;
@@ -761,11 +751,10 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabHole___closed__1;
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_Term_mkBuiltinTermElabTable___spec__1;
 lean_object* lean_usize_to_nat(size_t);
 uint8_t l_Array_isEqvAux___main___at_Lean_Elab_Term_withMVarContext___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__3;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabBadCDot___closed__2;
 lean_object* l___private_Init_Lean_Elab_Term_10__exceptionToSorry___closed__1;
 extern lean_object* l_Lean_levelOne;
-lean_object* l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Message_toString(lean_object*);
 lean_object* l_Lean_mkAppB(lean_object*, lean_object*, lean_object*);
 lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_Term_elabTerm___spec__5___boxed(lean_object*, lean_object*);
@@ -779,7 +768,6 @@ lean_object* l_AssocList_contains___main___at_Lean_Elab_Term_addBuiltinTermElab_
 lean_object* l_Lean_Elab_Term_mkFreshInstanceName___boxed(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabChar___closed__1;
 lean_object* l_Lean_Elab_Term_registerBuiltinTermElabAttr___closed__1;
-lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8(lean_object*, size_t, size_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__6;
 extern lean_object* l_Lean_Format_repr___main___closed__16;
 lean_object* l_Lean_Elab_Term_resolveName___closed__1;
@@ -790,6 +778,7 @@ lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_registerSyntheticMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_3__addMacroStack(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__2;
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__6;
 lean_object* l_Lean_Elab_Term_tryPostponeIfNoneOrMVar___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_uint32_to_nat(uint32_t);
 extern lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__10;
@@ -809,10 +798,10 @@ lean_object* lean_name_mk_numeral(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkForall___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getMCtx___rarg(lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__1;
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__4;
-lean_object* l_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__4;
+lean_object* l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_TermElabM_MonadLog___lambda__2___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_liftMetaM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__7;
 lean_object* l_Lean_Elab_Term_mkTermElabAttribute___closed__1;
@@ -820,17 +809,15 @@ lean_object* l_Lean_Elab_Term_mkFreshInstanceName___rarg___closed__2;
 lean_object* l_Lean_mkApp3(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isSort(lean_object*);
 lean_object* l_Lean_Meta_decLevel_x3f(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__6;
-lean_object* l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar(lean_object*, uint8_t, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_24__resolveLocalName___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_expandCDot_x3f(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_NameGenerator_Inhabited___closed__3;
-lean_object* l___private_Init_Lean_Elab_Term_13__resumePostponed___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshTypeMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBadCDot(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabNum___closed__4;
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_Term_13__resumePostponed___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_decLevel___closed__6;
 lean_object* _init_l_Lean_Elab_Term_State_inhabited___closed__1() {
 _start:
@@ -891,18 +878,31 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_2; lean_object* x_3; 
+lean_object* x_2; 
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
 lean_dec(x_1);
-x_3 = l_Lean_Message_toString(x_2);
-return x_3;
+if (lean_obj_tag(x_2) == 0)
+{
+lean_object* x_3; lean_object* x_4; 
+x_3 = lean_ctor_get(x_2, 0);
+lean_inc(x_3);
+lean_dec(x_2);
+x_4 = l_Lean_Message_toString(x_3);
+return x_4;
 }
 else
 {
-lean_object* x_4; 
-x_4 = l___private_Init_Lean_Meta_LevelDefEq_10__processPostponedStep___closed__1;
-return x_4;
+lean_object* x_5; 
+x_5 = l_Lean_Elab_Exception_hasToString___closed__1;
+return x_5;
+}
+}
+else
+{
+lean_object* x_6; 
+x_6 = l___private_Init_Lean_Meta_LevelDefEq_10__processPostponedStep___closed__1;
+return x_6;
 }
 }
 }
@@ -996,62 +996,93 @@ x_11 = lean_ctor_get(x_4, 0);
 lean_inc(x_11);
 if (lean_obj_tag(x_11) == 0)
 {
-uint8_t x_12; 
-x_12 = !lean_is_exclusive(x_4);
-if (x_12 == 0)
+lean_object* x_12; 
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+if (lean_obj_tag(x_12) == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_13 = lean_ctor_get(x_4, 0);
-lean_dec(x_13);
-x_14 = lean_ctor_get(x_11, 0);
-lean_inc(x_14);
+uint8_t x_13; 
 lean_dec(x_11);
-lean_ctor_set(x_4, 0, x_14);
-x_15 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_15, 0, x_4);
-lean_ctor_set(x_15, 1, x_3);
-return x_15;
+x_13 = !lean_is_exclusive(x_4);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_14 = lean_ctor_get(x_4, 0);
+lean_dec(x_14);
+x_15 = lean_ctor_get(x_12, 0);
+lean_inc(x_15);
+lean_dec(x_12);
+lean_ctor_set(x_4, 0, x_15);
+x_16 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_16, 0, x_4);
+lean_ctor_set(x_16, 1, x_3);
+return x_16;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_16 = lean_ctor_get(x_4, 1);
-lean_inc(x_16);
-lean_dec(x_4);
-x_17 = lean_ctor_get(x_11, 0);
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_17 = lean_ctor_get(x_4, 1);
 lean_inc(x_17);
-lean_dec(x_11);
-x_18 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_16);
-x_19 = lean_alloc_ctor(0, 2, 0);
+lean_dec(x_4);
+x_18 = lean_ctor_get(x_12, 0);
+lean_inc(x_18);
+lean_dec(x_12);
+x_19 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_3);
-return x_19;
+lean_ctor_set(x_19, 1, x_17);
+x_20 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_20, 0, x_19);
+lean_ctor_set(x_20, 1, x_3);
+return x_20;
 }
 }
 else
 {
-uint8_t x_20; 
+uint8_t x_21; 
 lean_dec(x_3);
-x_20 = !lean_is_exclusive(x_4);
-if (x_20 == 0)
+x_21 = !lean_is_exclusive(x_4);
+if (x_21 == 0)
 {
-lean_object* x_21; 
-x_21 = lean_ctor_get(x_4, 0);
-lean_dec(x_21);
+lean_object* x_22; 
+x_22 = lean_ctor_get(x_4, 0);
+lean_dec(x_22);
 return x_4;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; 
-x_22 = lean_ctor_get(x_4, 1);
-lean_inc(x_22);
+lean_object* x_23; lean_object* x_24; 
+x_23 = lean_ctor_get(x_4, 1);
+lean_inc(x_23);
 lean_dec(x_4);
-x_23 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_23, 0, x_11);
-lean_ctor_set(x_23, 1, x_22);
-return x_23;
+x_24 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_24, 0, x_11);
+lean_ctor_set(x_24, 1, x_23);
+return x_24;
+}
+}
+}
+else
+{
+uint8_t x_25; 
+lean_dec(x_3);
+x_25 = !lean_is_exclusive(x_4);
+if (x_25 == 0)
+{
+lean_object* x_26; 
+x_26 = lean_ctor_get(x_4, 0);
+lean_dec(x_26);
+return x_4;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; 
+x_27 = lean_ctor_get(x_4, 1);
+lean_inc(x_27);
+lean_dec(x_4);
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_11);
+lean_ctor_set(x_28, 1, x_27);
+return x_28;
 }
 }
 }
@@ -1088,27 +1119,31 @@ uint8_t x_8;
 x_8 = !lean_is_exclusive(x_1);
 if (x_8 == 0)
 {
-lean_object* x_9; lean_object* x_10; 
+lean_object* x_9; lean_object* x_10; lean_object* x_11; 
 x_9 = lean_ctor_get(x_1, 0);
 x_10 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_10, 0, x_9);
-lean_ctor_set(x_1, 0, x_10);
+x_11 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_1, 0, x_11);
 return x_1;
 }
 else
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_11 = lean_ctor_get(x_1, 0);
-x_12 = lean_ctor_get(x_1, 1);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_12 = lean_ctor_get(x_1, 0);
+x_13 = lean_ctor_get(x_1, 1);
+lean_inc(x_13);
 lean_inc(x_12);
-lean_inc(x_11);
 lean_dec(x_1);
-x_13 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_13, 0, x_11);
-x_14 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_14, 0, x_13);
-lean_ctor_set(x_14, 1, x_12);
-return x_14;
+x_14 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_14, 0, x_12);
+x_15 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+x_16 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_13);
+return x_16;
 }
 }
 }
@@ -2073,28 +2108,32 @@ lean_dec(x_6);
 x_13 = !lean_is_exclusive(x_12);
 if (x_13 == 0)
 {
-lean_object* x_14; lean_object* x_15; 
+lean_object* x_14; lean_object* x_15; lean_object* x_16; 
 x_14 = lean_ctor_get(x_12, 0);
 x_15 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_15, 0, x_14);
+x_16 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_16, 0, x_15);
 lean_ctor_set_tag(x_12, 1);
-lean_ctor_set(x_12, 0, x_15);
+lean_ctor_set(x_12, 0, x_16);
 return x_12;
 }
 else
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_16 = lean_ctor_get(x_12, 0);
-x_17 = lean_ctor_get(x_12, 1);
+lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_17 = lean_ctor_get(x_12, 0);
+x_18 = lean_ctor_get(x_12, 1);
+lean_inc(x_18);
 lean_inc(x_17);
-lean_inc(x_16);
 lean_dec(x_12);
-x_18 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_18, 0, x_16);
-x_19 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_19, 0, x_18);
-lean_ctor_set(x_19, 1, x_17);
-return x_19;
+x_19 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_19, 0, x_17);
+x_20 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_20, 0, x_19);
+x_21 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_18);
+return x_21;
 }
 }
 }
@@ -2140,168 +2179,42 @@ lean_dec(x_3);
 return x_7;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_mk_string("unexpected syntax");
-return x_1;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__2() {
+lean_object* _init_l_Lean_Elab_Term_throwUnsupportedSyntax___rarg___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__1;
-x_2 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__3() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__2;
+x_1 = lean_box(1);
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__4() {
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(lean_object* x_1) {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("unexpected syntax, expected '");
-return x_1;
+lean_object* x_2; lean_object* x_3; 
+x_2 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg___closed__1;
+x_3 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__5() {
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__4;
-x_2 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
+lean_object* x_3; 
+x_3 = lean_alloc_closure((void*)(l_Lean_Elab_Term_throwUnsupportedSyntax___rarg), 1, 0);
+return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__6() {
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__5;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__7() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Char_HasRepr___closed__1;
-x_2 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__7;
-x_2 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-lean_inc(x_1);
-x_5 = l___private_Init_Lean_Elab_Term_2__prettyPrint(x_1, x_3, x_4);
-if (lean_obj_tag(x_2) == 0)
-{
-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; 
-x_6 = lean_ctor_get(x_5, 0);
-lean_inc(x_6);
-x_7 = lean_ctor_get(x_5, 1);
-lean_inc(x_7);
-lean_dec(x_5);
-x_8 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_8, 0, x_6);
-x_9 = l_Lean_MessageData_ofList___closed__3;
-x_10 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_10, 0, x_9);
-lean_ctor_set(x_10, 1, x_8);
-x_11 = lean_unsigned_to_nat(2u);
-x_12 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_12, 0, x_11);
-lean_ctor_set(x_12, 1, x_10);
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__3;
-x_14 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_14, 0, x_13);
-lean_ctor_set(x_14, 1, x_12);
-x_15 = l_Lean_Elab_Term_throwError___rarg(x_1, x_14, x_3, x_7);
-return x_15;
-}
-else
-{
-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; 
-x_16 = lean_ctor_get(x_5, 0);
-lean_inc(x_16);
-x_17 = lean_ctor_get(x_5, 1);
-lean_inc(x_17);
-lean_dec(x_5);
-x_18 = lean_ctor_get(x_2, 0);
-lean_inc(x_18);
-x_19 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_19, 0, x_18);
-x_20 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_20, 0, x_19);
-x_21 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__6;
-x_22 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_22, 0, x_21);
-lean_ctor_set(x_22, 1, x_20);
-x_23 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
-x_24 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
-x_25 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_25, 0, x_16);
-x_26 = l_Lean_MessageData_ofList___closed__3;
-x_27 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_27, 0, x_26);
-lean_ctor_set(x_27, 1, x_25);
-x_28 = lean_unsigned_to_nat(2u);
-x_29 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_27);
-x_30 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_30, 0, x_24);
-lean_ctor_set(x_30, 1, x_29);
-x_31 = l_Lean_Elab_Term_throwError___rarg(x_1, x_30, x_3, x_17);
-return x_31;
-}
-}
-}
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___boxed), 4, 0);
-return x_2;
-}
-}
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_2, x_3, x_4);
+lean_object* x_3; 
+x_3 = l_Lean_Elab_Term_throwUnsupportedSyntax(x_1, x_2);
 lean_dec(x_2);
-return x_5;
+return x_3;
 }
 }
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object* x_1, lean_object* x_2) {
@@ -2724,829 +2637,6 @@ return x_10;
 }
 }
 }
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__9(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_5 = lean_ctor_get(x_1, 0);
-lean_inc(x_5);
-x_6 = lean_ctor_get(x_1, 1);
-lean_inc(x_6);
-x_7 = lean_array_get_size(x_5);
-x_8 = lean_nat_dec_lt(x_2, x_7);
-lean_dec(x_7);
-if (x_8 == 0)
-{
-uint8_t x_9; 
-lean_dec(x_2);
-x_9 = !lean_is_exclusive(x_1);
-if (x_9 == 0)
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_10 = lean_ctor_get(x_1, 1);
-lean_dec(x_10);
-x_11 = lean_ctor_get(x_1, 0);
-lean_dec(x_11);
-x_12 = lean_array_push(x_5, x_3);
-x_13 = lean_array_push(x_6, x_4);
-lean_ctor_set(x_1, 1, x_13);
-lean_ctor_set(x_1, 0, x_12);
-return x_1;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-lean_dec(x_1);
-x_14 = lean_array_push(x_5, x_3);
-x_15 = lean_array_push(x_6, x_4);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_14);
-lean_ctor_set(x_16, 1, x_15);
-return x_16;
-}
-}
-else
-{
-lean_object* x_17; uint8_t x_18; 
-x_17 = lean_array_fget(x_5, x_2);
-x_18 = lean_name_eq(x_3, x_17);
-lean_dec(x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; 
-lean_dec(x_6);
-lean_dec(x_5);
-x_19 = lean_unsigned_to_nat(1u);
-x_20 = lean_nat_add(x_2, x_19);
-lean_dec(x_2);
-x_2 = x_20;
-goto _start;
-}
-else
-{
-uint8_t x_22; 
-x_22 = !lean_is_exclusive(x_1);
-if (x_22 == 0)
-{
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_23 = lean_ctor_get(x_1, 1);
-lean_dec(x_23);
-x_24 = lean_ctor_get(x_1, 0);
-lean_dec(x_24);
-x_25 = lean_array_fset(x_5, x_2, x_3);
-x_26 = lean_array_fset(x_6, x_2, x_4);
-lean_dec(x_2);
-lean_ctor_set(x_1, 1, x_26);
-lean_ctor_set(x_1, 0, x_25);
-return x_1;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-lean_dec(x_1);
-x_27 = lean_array_fset(x_5, x_2, x_3);
-x_28 = lean_array_fset(x_6, x_2, x_4);
-lean_dec(x_2);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
-}
-}
-}
-}
-}
-lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__10(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; uint8_t x_8; 
-x_7 = lean_array_get_size(x_4);
-x_8 = lean_nat_dec_lt(x_5, x_7);
-lean_dec(x_7);
-if (x_8 == 0)
-{
-lean_dec(x_5);
-return x_6;
-}
-else
-{
-lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; size_t x_13; size_t x_14; size_t x_15; size_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_9 = lean_array_fget(x_4, x_5);
-x_10 = lean_array_fget(x_3, x_5);
-x_11 = l_Lean_Name_hash(x_9);
-x_12 = 1;
-x_13 = x_1 - x_12;
-x_14 = 5;
-x_15 = x_14 * x_13;
-x_16 = x_11 >> x_15;
-x_17 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8(x_6, x_16, x_1, x_9, x_10);
-x_18 = lean_unsigned_to_nat(1u);
-x_19 = lean_nat_add(x_5, x_18);
-lean_dec(x_5);
-x_5 = x_19;
-x_6 = x_17;
-goto _start;
-}
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-if (lean_obj_tag(x_1) == 0)
-{
-uint8_t x_6; 
-x_6 = !lean_is_exclusive(x_1);
-if (x_6 == 0)
-{
-lean_object* x_7; size_t x_8; size_t x_9; size_t x_10; size_t x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
-x_7 = lean_ctor_get(x_1, 0);
-x_8 = 1;
-x_9 = 5;
-x_10 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
-x_11 = x_2 & x_10;
-x_12 = lean_usize_to_nat(x_11);
-x_13 = lean_array_get_size(x_7);
-x_14 = lean_nat_dec_lt(x_12, x_13);
-lean_dec(x_13);
-if (x_14 == 0)
-{
-lean_dec(x_12);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_1;
-}
-else
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_15 = lean_array_fget(x_7, x_12);
-x_16 = lean_box(2);
-x_17 = lean_array_fset(x_7, x_12, x_16);
-switch (lean_obj_tag(x_15)) {
-case 0:
-{
-uint8_t x_18; 
-x_18 = !lean_is_exclusive(x_15);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; uint8_t x_21; 
-x_19 = lean_ctor_get(x_15, 0);
-x_20 = lean_ctor_get(x_15, 1);
-x_21 = lean_name_eq(x_4, x_19);
-if (x_21 == 0)
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-lean_free_object(x_15);
-x_22 = l_PersistentHashMap_mkCollisionNode___rarg(x_19, x_20, x_4, x_5);
-x_23 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_23, 0, x_22);
-x_24 = lean_array_fset(x_17, x_12, x_23);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_24);
-return x_1;
-}
-else
-{
-lean_object* x_25; 
-lean_dec(x_20);
-lean_dec(x_19);
-lean_ctor_set(x_15, 1, x_5);
-lean_ctor_set(x_15, 0, x_4);
-x_25 = lean_array_fset(x_17, x_12, x_15);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_25);
-return x_1;
-}
-}
-else
-{
-lean_object* x_26; lean_object* x_27; uint8_t x_28; 
-x_26 = lean_ctor_get(x_15, 0);
-x_27 = lean_ctor_get(x_15, 1);
-lean_inc(x_27);
-lean_inc(x_26);
-lean_dec(x_15);
-x_28 = lean_name_eq(x_4, x_26);
-if (x_28 == 0)
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = l_PersistentHashMap_mkCollisionNode___rarg(x_26, x_27, x_4, x_5);
-x_30 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_30, 0, x_29);
-x_31 = lean_array_fset(x_17, x_12, x_30);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_31);
-return x_1;
-}
-else
-{
-lean_object* x_32; lean_object* x_33; 
-lean_dec(x_27);
-lean_dec(x_26);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_4);
-lean_ctor_set(x_32, 1, x_5);
-x_33 = lean_array_fset(x_17, x_12, x_32);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_33);
-return x_1;
-}
-}
-}
-case 1:
-{
-uint8_t x_34; 
-x_34 = !lean_is_exclusive(x_15);
-if (x_34 == 0)
-{
-lean_object* x_35; size_t x_36; size_t x_37; lean_object* x_38; lean_object* x_39; 
-x_35 = lean_ctor_get(x_15, 0);
-x_36 = x_2 >> x_9;
-x_37 = x_3 + x_8;
-x_38 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8(x_35, x_36, x_37, x_4, x_5);
-lean_ctor_set(x_15, 0, x_38);
-x_39 = lean_array_fset(x_17, x_12, x_15);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_39);
-return x_1;
-}
-else
-{
-lean_object* x_40; size_t x_41; size_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_40 = lean_ctor_get(x_15, 0);
-lean_inc(x_40);
-lean_dec(x_15);
-x_41 = x_2 >> x_9;
-x_42 = x_3 + x_8;
-x_43 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8(x_40, x_41, x_42, x_4, x_5);
-x_44 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_44, 0, x_43);
-x_45 = lean_array_fset(x_17, x_12, x_44);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_45);
-return x_1;
-}
-}
-default: 
-{
-lean_object* x_46; lean_object* x_47; 
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_4);
-lean_ctor_set(x_46, 1, x_5);
-x_47 = lean_array_fset(x_17, x_12, x_46);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_47);
-return x_1;
-}
-}
-}
-}
-else
-{
-lean_object* x_48; size_t x_49; size_t x_50; size_t x_51; size_t x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
-x_48 = lean_ctor_get(x_1, 0);
-lean_inc(x_48);
-lean_dec(x_1);
-x_49 = 1;
-x_50 = 5;
-x_51 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
-x_52 = x_2 & x_51;
-x_53 = lean_usize_to_nat(x_52);
-x_54 = lean_array_get_size(x_48);
-x_55 = lean_nat_dec_lt(x_53, x_54);
-lean_dec(x_54);
-if (x_55 == 0)
-{
-lean_object* x_56; 
-lean_dec(x_53);
-lean_dec(x_5);
-lean_dec(x_4);
-x_56 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_56, 0, x_48);
-return x_56;
-}
-else
-{
-lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_57 = lean_array_fget(x_48, x_53);
-x_58 = lean_box(2);
-x_59 = lean_array_fset(x_48, x_53, x_58);
-switch (lean_obj_tag(x_57)) {
-case 0:
-{
-lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
-x_60 = lean_ctor_get(x_57, 0);
-lean_inc(x_60);
-x_61 = lean_ctor_get(x_57, 1);
-lean_inc(x_61);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- lean_ctor_release(x_57, 1);
- x_62 = x_57;
-} else {
- lean_dec_ref(x_57);
- x_62 = lean_box(0);
-}
-x_63 = lean_name_eq(x_4, x_60);
-if (x_63 == 0)
-{
-lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-lean_dec(x_62);
-x_64 = l_PersistentHashMap_mkCollisionNode___rarg(x_60, x_61, x_4, x_5);
-x_65 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_65, 0, x_64);
-x_66 = lean_array_fset(x_59, x_53, x_65);
-lean_dec(x_53);
-x_67 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_67, 0, x_66);
-return x_67;
-}
-else
-{
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-lean_dec(x_61);
-lean_dec(x_60);
-if (lean_is_scalar(x_62)) {
- x_68 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_68 = x_62;
-}
-lean_ctor_set(x_68, 0, x_4);
-lean_ctor_set(x_68, 1, x_5);
-x_69 = lean_array_fset(x_59, x_53, x_68);
-lean_dec(x_53);
-x_70 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_70, 0, x_69);
-return x_70;
-}
-}
-case 1:
-{
-lean_object* x_71; lean_object* x_72; size_t x_73; size_t x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_71 = lean_ctor_get(x_57, 0);
-lean_inc(x_71);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- x_72 = x_57;
-} else {
- lean_dec_ref(x_57);
- x_72 = lean_box(0);
-}
-x_73 = x_2 >> x_50;
-x_74 = x_3 + x_49;
-x_75 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8(x_71, x_73, x_74, x_4, x_5);
-if (lean_is_scalar(x_72)) {
- x_76 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_76 = x_72;
-}
-lean_ctor_set(x_76, 0, x_75);
-x_77 = lean_array_fset(x_59, x_53, x_76);
-lean_dec(x_53);
-x_78 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_78, 0, x_77);
-return x_78;
-}
-default: 
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_4);
-lean_ctor_set(x_79, 1, x_5);
-x_80 = lean_array_fset(x_59, x_53, x_79);
-lean_dec(x_53);
-x_81 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_81, 0, x_80);
-return x_81;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_82; lean_object* x_83; size_t x_84; uint8_t x_85; 
-x_82 = lean_unsigned_to_nat(0u);
-x_83 = l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__9(x_1, x_82, x_4, x_5);
-x_84 = 7;
-x_85 = x_84 <= x_3;
-if (x_85 == 0)
-{
-lean_object* x_86; lean_object* x_87; uint8_t x_88; 
-x_86 = l_PersistentHashMap_getCollisionNodeSize___rarg(x_83);
-x_87 = lean_unsigned_to_nat(4u);
-x_88 = lean_nat_dec_lt(x_86, x_87);
-lean_dec(x_86);
-if (x_88 == 0)
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_89 = lean_ctor_get(x_83, 0);
-lean_inc(x_89);
-x_90 = lean_ctor_get(x_83, 1);
-lean_inc(x_90);
-lean_dec(x_83);
-x_91 = l_PersistentHashMap_insertAux___main___rarg___closed__3;
-x_92 = l_Array_iterateMAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__10(x_3, x_89, x_90, x_89, x_82, x_91);
-lean_dec(x_90);
-lean_dec(x_89);
-return x_92;
-}
-else
-{
-return x_83;
-}
-}
-else
-{
-return x_83;
-}
-}
-}
-}
-lean_object* l_PersistentHashMap_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__7(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_1);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = l_Lean_Name_hash(x_2);
-x_8 = 1;
-x_9 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8(x_5, x_7, x_8, x_2, x_3);
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_nat_add(x_6, x_10);
-lean_dec(x_6);
-lean_ctor_set(x_1, 1, x_11);
-lean_ctor_set(x_1, 0, x_9);
-return x_1;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_12 = lean_ctor_get(x_1, 0);
-x_13 = lean_ctor_get(x_1, 1);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_dec(x_1);
-x_14 = l_Lean_Name_hash(x_2);
-x_15 = 1;
-x_16 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8(x_12, x_14, x_15, x_2, x_3);
-x_17 = lean_unsigned_to_nat(1u);
-x_18 = lean_nat_add(x_13, x_17);
-lean_dec(x_13);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_16);
-lean_ctor_set(x_19, 1, x_18);
-return x_19;
-}
-}
-}
-lean_object* l_AssocList_foldlM___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__14(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-return x_1;
-}
-else
-{
-uint8_t x_3; 
-x_3 = !lean_is_exclusive(x_2);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
-x_4 = lean_ctor_get(x_2, 0);
-x_5 = lean_ctor_get(x_2, 2);
-x_6 = lean_array_get_size(x_1);
-x_7 = l_Lean_Name_hash(x_4);
-x_8 = lean_usize_modn(x_7, x_6);
-lean_dec(x_6);
-x_9 = lean_array_uget(x_1, x_8);
-lean_ctor_set(x_2, 2, x_9);
-x_10 = lean_array_uset(x_1, x_8, x_2);
-x_1 = x_10;
-x_2 = x_5;
-goto _start;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_12 = lean_ctor_get(x_2, 0);
-x_13 = lean_ctor_get(x_2, 1);
-x_14 = lean_ctor_get(x_2, 2);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_dec(x_2);
-x_15 = lean_array_get_size(x_1);
-x_16 = l_Lean_Name_hash(x_12);
-x_17 = lean_usize_modn(x_16, x_15);
-lean_dec(x_15);
-x_18 = lean_array_uget(x_1, x_17);
-x_19 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_19, 0, x_12);
-lean_ctor_set(x_19, 1, x_13);
-lean_ctor_set(x_19, 2, x_18);
-x_20 = lean_array_uset(x_1, x_17, x_19);
-x_1 = x_20;
-x_2 = x_14;
-goto _start;
-}
-}
-}
-}
-lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__13(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; uint8_t x_5; 
-x_4 = lean_array_get_size(x_2);
-x_5 = lean_nat_dec_lt(x_1, x_4);
-lean_dec(x_4);
-if (x_5 == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_3;
-}
-else
-{
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_6 = lean_array_fget(x_2, x_1);
-x_7 = lean_box(0);
-x_8 = lean_array_fset(x_2, x_1, x_7);
-x_9 = l_AssocList_foldlM___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__14(x_3, x_6);
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_nat_add(x_1, x_10);
-lean_dec(x_1);
-x_1 = x_11;
-x_2 = x_8;
-x_3 = x_9;
-goto _start;
-}
-}
-}
-lean_object* l_HashMapImp_expand___at_Lean_Elab_Term_addBuiltinTermElab___spec__12(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_3 = lean_array_get_size(x_2);
-x_4 = lean_unsigned_to_nat(2u);
-x_5 = lean_nat_mul(x_3, x_4);
-lean_dec(x_3);
-x_6 = lean_box(0);
-x_7 = lean_mk_array(x_5, x_6);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l_HashMapImp_moveEntries___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__13(x_8, x_2, x_7);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_1);
-lean_ctor_set(x_10, 1, x_9);
-return x_10;
-}
-}
-lean_object* l_AssocList_replace___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__15(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-if (lean_obj_tag(x_3) == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_3;
-}
-else
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_3);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_5 = lean_ctor_get(x_3, 0);
-x_6 = lean_ctor_get(x_3, 1);
-x_7 = lean_ctor_get(x_3, 2);
-x_8 = lean_name_eq(x_5, x_1);
-if (x_8 == 0)
-{
-lean_object* x_9; 
-x_9 = l_AssocList_replace___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__15(x_1, x_2, x_7);
-lean_ctor_set(x_3, 2, x_9);
-return x_3;
-}
-else
-{
-lean_dec(x_6);
-lean_dec(x_5);
-lean_ctor_set(x_3, 1, x_2);
-lean_ctor_set(x_3, 0, x_1);
-return x_3;
-}
-}
-else
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
-x_10 = lean_ctor_get(x_3, 0);
-x_11 = lean_ctor_get(x_3, 1);
-x_12 = lean_ctor_get(x_3, 2);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_dec(x_3);
-x_13 = lean_name_eq(x_10, x_1);
-if (x_13 == 0)
-{
-lean_object* x_14; lean_object* x_15; 
-x_14 = l_AssocList_replace___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__15(x_1, x_2, x_12);
-x_15 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_15, 0, x_10);
-lean_ctor_set(x_15, 1, x_11);
-lean_ctor_set(x_15, 2, x_14);
-return x_15;
-}
-else
-{
-lean_object* x_16; 
-lean_dec(x_11);
-lean_dec(x_10);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_1);
-lean_ctor_set(x_16, 1, x_2);
-lean_ctor_set(x_16, 2, x_12);
-return x_16;
-}
-}
-}
-}
-}
-lean_object* l_HashMapImp_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__11(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_1);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = lean_array_get_size(x_6);
-x_8 = l_Lean_Name_hash(x_2);
-x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_array_uget(x_6, x_9);
-x_11 = l_AssocList_contains___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__3(x_2, x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
-x_12 = lean_unsigned_to_nat(1u);
-x_13 = lean_nat_add(x_5, x_12);
-lean_dec(x_5);
-x_14 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_14, 0, x_2);
-lean_ctor_set(x_14, 1, x_3);
-lean_ctor_set(x_14, 2, x_10);
-x_15 = lean_array_uset(x_6, x_9, x_14);
-x_16 = lean_nat_dec_le(x_13, x_7);
-lean_dec(x_7);
-if (x_16 == 0)
-{
-lean_object* x_17; 
-lean_free_object(x_1);
-x_17 = l_HashMapImp_expand___at_Lean_Elab_Term_addBuiltinTermElab___spec__12(x_13, x_15);
-return x_17;
-}
-else
-{
-lean_ctor_set(x_1, 1, x_15);
-lean_ctor_set(x_1, 0, x_13);
-return x_1;
-}
-}
-else
-{
-lean_object* x_18; lean_object* x_19; 
-lean_dec(x_7);
-x_18 = l_AssocList_replace___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__15(x_2, x_3, x_10);
-x_19 = lean_array_uset(x_6, x_9, x_18);
-lean_ctor_set(x_1, 1, x_19);
-return x_1;
-}
-}
-else
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
-x_20 = lean_ctor_get(x_1, 0);
-x_21 = lean_ctor_get(x_1, 1);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_dec(x_1);
-x_22 = lean_array_get_size(x_21);
-x_23 = l_Lean_Name_hash(x_2);
-x_24 = lean_usize_modn(x_23, x_22);
-x_25 = lean_array_uget(x_21, x_24);
-x_26 = l_AssocList_contains___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__3(x_2, x_25);
-if (x_26 == 0)
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_27 = lean_unsigned_to_nat(1u);
-x_28 = lean_nat_add(x_20, x_27);
-lean_dec(x_20);
-x_29 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_29, 0, x_2);
-lean_ctor_set(x_29, 1, x_3);
-lean_ctor_set(x_29, 2, x_25);
-x_30 = lean_array_uset(x_21, x_24, x_29);
-x_31 = lean_nat_dec_le(x_28, x_22);
-lean_dec(x_22);
-if (x_31 == 0)
-{
-lean_object* x_32; 
-x_32 = l_HashMapImp_expand___at_Lean_Elab_Term_addBuiltinTermElab___spec__12(x_28, x_30);
-return x_32;
-}
-else
-{
-lean_object* x_33; 
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_28);
-lean_ctor_set(x_33, 1, x_30);
-return x_33;
-}
-}
-else
-{
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-lean_dec(x_22);
-x_34 = l_AssocList_replace___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__15(x_2, x_3, x_25);
-x_35 = lean_array_uset(x_21, x_24, x_34);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_20);
-lean_ctor_set(x_36, 1, x_35);
-return x_36;
-}
-}
-}
-}
-lean_object* l_Lean_SMap_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__6(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
-if (x_4 == 0)
-{
-uint8_t x_5; 
-x_5 = !lean_is_exclusive(x_1);
-if (x_5 == 0)
-{
-lean_object* x_6; lean_object* x_7; 
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = l_PersistentHashMap_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__7(x_6, x_2, x_3);
-lean_ctor_set(x_1, 1, x_7);
-return x_1;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_8 = lean_ctor_get(x_1, 0);
-x_9 = lean_ctor_get(x_1, 1);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_dec(x_1);
-x_10 = l_PersistentHashMap_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__7(x_9, x_2, x_3);
-x_11 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_11, 0, x_8);
-lean_ctor_set(x_11, 1, x_10);
-lean_ctor_set_uint8(x_11, sizeof(void*)*2, x_4);
-return x_11;
-}
-}
-else
-{
-uint8_t x_12; 
-x_12 = !lean_is_exclusive(x_1);
-if (x_12 == 0)
-{
-lean_object* x_13; lean_object* x_14; 
-x_13 = lean_ctor_get(x_1, 0);
-x_14 = l_HashMapImp_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__11(x_13, x_2, x_3);
-lean_ctor_set(x_1, 0, x_14);
-return x_1;
-}
-else
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_15 = lean_ctor_get(x_1, 0);
-x_16 = lean_ctor_get(x_1, 1);
-lean_inc(x_16);
-lean_inc(x_15);
-lean_dec(x_1);
-x_17 = l_HashMapImp_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__11(x_15, x_2, x_3);
-x_18 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_16);
-lean_ctor_set_uint8(x_18, sizeof(void*)*2, x_4);
-return x_18;
-}
-}
-}
-}
 lean_object* _init_l_Lean_Elab_Term_addBuiltinTermElab___closed__1() {
 _start:
 {
@@ -3591,7 +2681,7 @@ lean_object* x_15; lean_object* x_16; lean_object* x_17;
 x_15 = lean_ctor_get(x_14, 1);
 lean_inc(x_15);
 lean_dec(x_14);
-x_16 = l_Lean_SMap_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__6(x_12, x_1, x_3);
+x_16 = l_Lean_Elab_ElabFnTable_insert___rarg(x_12, x_1, x_3);
 x_17 = lean_io_ref_set(x_5, x_16, x_15);
 return x_17;
 }
@@ -3690,7 +2780,7 @@ lean_object* x_39; lean_object* x_40; lean_object* x_41;
 x_39 = lean_ctor_get(x_38, 1);
 lean_inc(x_39);
 lean_dec(x_38);
-x_40 = l_Lean_SMap_insert___at_Lean_Elab_Term_addBuiltinTermElab___spec__6(x_36, x_1, x_3);
+x_40 = l_Lean_Elab_ElabFnTable_insert___rarg(x_36, x_1, x_3);
 x_41 = lean_io_ref_set(x_5, x_40, x_39);
 return x_41;
 }
@@ -3847,31 +2937,6 @@ x_4 = lean_box(x_3);
 return x_4;
 }
 }
-lean_object* l_Array_iterateMAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__10___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-size_t x_7; lean_object* x_8; 
-x_7 = lean_unbox_usize(x_1);
-lean_dec(x_1);
-x_8 = l_Array_iterateMAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__10(x_7, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-return x_8;
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-size_t x_6; size_t x_7; lean_object* x_8; 
-x_6 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_7 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_8 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_Term_addBuiltinTermElab___spec__8(x_1, x_6, x_7, x_4, x_5);
-return x_8;
-}
-}
 lean_object* l_Lean_Elab_Term_addBuiltinTermElab___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -5431,13 +4496,15 @@ return x_6;
 lean_object* l___private_Init_Lean_Elab_Term_5__fromMetaException(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-lean_object* x_4; uint8_t x_5; lean_object* x_6; lean_object* x_7; 
+lean_object* x_4; uint8_t x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_4 = l_Lean_Meta_Exception_toMessageData(x_3);
 x_5 = 2;
 x_6 = l___private_Init_Lean_Elab_Term_4__mkMessageAux(x_1, x_2, x_4, x_5);
 x_7 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_7, 0, x_6);
-return x_7;
+x_8 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_8, 0, x_7);
+return x_8;
 }
 }
 lean_object* l___private_Init_Lean_Elab_Term_5__fromMetaException___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
@@ -8580,154 +7647,152 @@ lean_inc(x_5);
 x_6 = !lean_is_exclusive(x_5);
 if (x_6 == 0)
 {
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
 x_7 = lean_ctor_get(x_5, 4);
 x_8 = lean_ctor_get(x_3, 0);
 lean_inc(x_8);
 x_9 = l_Lean_TraceState_Inhabited___closed__1;
 lean_ctor_set(x_5, 4, x_9);
-x_10 = lean_unsigned_to_nat(10000u);
-x_11 = l_Lean_Meta_trySynthInstance(x_2, x_10, x_8, x_5);
-if (lean_obj_tag(x_11) == 0)
+x_10 = l_Lean_Meta_trySynthInstance(x_2, x_8, x_5);
+if (lean_obj_tag(x_10) == 0)
 {
-uint8_t x_12; 
-x_12 = !lean_is_exclusive(x_11);
-if (x_12 == 0)
+uint8_t x_11; 
+x_11 = !lean_is_exclusive(x_10);
+if (x_11 == 0)
 {
-lean_object* x_13; lean_object* x_14; 
-x_13 = lean_ctor_get(x_11, 1);
-x_14 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_13, x_7);
-lean_ctor_set(x_11, 1, x_14);
-return x_11;
+lean_object* x_12; lean_object* x_13; 
+x_12 = lean_ctor_get(x_10, 1);
+x_13 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_12, x_7);
+lean_ctor_set(x_10, 1, x_13);
+return x_10;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_15 = lean_ctor_get(x_11, 0);
-x_16 = lean_ctor_get(x_11, 1);
-lean_inc(x_16);
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_14 = lean_ctor_get(x_10, 0);
+x_15 = lean_ctor_get(x_10, 1);
 lean_inc(x_15);
-lean_dec(x_11);
-x_17 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_16, x_7);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_15);
-lean_ctor_set(x_18, 1, x_17);
-return x_18;
+lean_inc(x_14);
+lean_dec(x_10);
+x_16 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_15, x_7);
+x_17 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_17, 0, x_14);
+lean_ctor_set(x_17, 1, x_16);
+return x_17;
 }
 }
 else
 {
-uint8_t x_19; 
-x_19 = !lean_is_exclusive(x_11);
-if (x_19 == 0)
+uint8_t x_18; 
+x_18 = !lean_is_exclusive(x_10);
+if (x_18 == 0)
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_20 = lean_ctor_get(x_11, 0);
-x_21 = lean_ctor_get(x_11, 1);
+lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_19 = lean_ctor_get(x_10, 0);
+x_20 = lean_ctor_get(x_10, 1);
 lean_inc(x_3);
-x_22 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_3, x_1, x_20);
-x_23 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_21, x_7);
-lean_ctor_set(x_11, 1, x_23);
-lean_ctor_set(x_11, 0, x_22);
-return x_11;
+x_21 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_3, x_1, x_19);
+x_22 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_20, x_7);
+lean_ctor_set(x_10, 1, x_22);
+lean_ctor_set(x_10, 0, x_21);
+return x_10;
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
-x_24 = lean_ctor_get(x_11, 0);
-x_25 = lean_ctor_get(x_11, 1);
-lean_inc(x_25);
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_23 = lean_ctor_get(x_10, 0);
+x_24 = lean_ctor_get(x_10, 1);
 lean_inc(x_24);
-lean_dec(x_11);
+lean_inc(x_23);
+lean_dec(x_10);
 lean_inc(x_3);
-x_26 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_3, x_1, x_24);
-x_27 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_25, x_7);
-x_28 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_28, 0, x_26);
-lean_ctor_set(x_28, 1, x_27);
-return x_28;
+x_25 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_3, x_1, x_23);
+x_26 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_24, x_7);
+x_27 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_27, 0, x_25);
+lean_ctor_set(x_27, 1, x_26);
+return x_27;
 }
 }
 }
 else
 {
-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; lean_object* x_39; 
-x_29 = lean_ctor_get(x_5, 0);
-x_30 = lean_ctor_get(x_5, 1);
-x_31 = lean_ctor_get(x_5, 2);
-x_32 = lean_ctor_get(x_5, 3);
-x_33 = lean_ctor_get(x_5, 4);
-x_34 = lean_ctor_get(x_5, 5);
-lean_inc(x_34);
+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; 
+x_28 = lean_ctor_get(x_5, 0);
+x_29 = lean_ctor_get(x_5, 1);
+x_30 = lean_ctor_get(x_5, 2);
+x_31 = lean_ctor_get(x_5, 3);
+x_32 = lean_ctor_get(x_5, 4);
+x_33 = lean_ctor_get(x_5, 5);
 lean_inc(x_33);
 lean_inc(x_32);
 lean_inc(x_31);
 lean_inc(x_30);
 lean_inc(x_29);
+lean_inc(x_28);
 lean_dec(x_5);
-x_35 = lean_ctor_get(x_3, 0);
-lean_inc(x_35);
-x_36 = l_Lean_TraceState_Inhabited___closed__1;
-x_37 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_37, 0, x_29);
-lean_ctor_set(x_37, 1, x_30);
-lean_ctor_set(x_37, 2, x_31);
-lean_ctor_set(x_37, 3, x_32);
-lean_ctor_set(x_37, 4, x_36);
-lean_ctor_set(x_37, 5, x_34);
-x_38 = lean_unsigned_to_nat(10000u);
-x_39 = l_Lean_Meta_trySynthInstance(x_2, x_38, x_35, x_37);
-if (lean_obj_tag(x_39) == 0)
+x_34 = lean_ctor_get(x_3, 0);
+lean_inc(x_34);
+x_35 = l_Lean_TraceState_Inhabited___closed__1;
+x_36 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_36, 0, x_28);
+lean_ctor_set(x_36, 1, x_29);
+lean_ctor_set(x_36, 2, x_30);
+lean_ctor_set(x_36, 3, x_31);
+lean_ctor_set(x_36, 4, x_35);
+lean_ctor_set(x_36, 5, x_33);
+x_37 = l_Lean_Meta_trySynthInstance(x_2, x_34, x_36);
+if (lean_obj_tag(x_37) == 0)
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_40 = lean_ctor_get(x_39, 0);
-lean_inc(x_40);
-x_41 = lean_ctor_get(x_39, 1);
-lean_inc(x_41);
-if (lean_is_exclusive(x_39)) {
- lean_ctor_release(x_39, 0);
- lean_ctor_release(x_39, 1);
- x_42 = x_39;
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_38 = lean_ctor_get(x_37, 0);
+lean_inc(x_38);
+x_39 = lean_ctor_get(x_37, 1);
+lean_inc(x_39);
+if (lean_is_exclusive(x_37)) {
+ lean_ctor_release(x_37, 0);
+ lean_ctor_release(x_37, 1);
+ x_40 = x_37;
 } else {
- lean_dec_ref(x_39);
- x_42 = lean_box(0);
+ lean_dec_ref(x_37);
+ x_40 = lean_box(0);
 }
-x_43 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_41, x_33);
-if (lean_is_scalar(x_42)) {
- x_44 = lean_alloc_ctor(0, 2, 0);
+x_41 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_39, x_32);
+if (lean_is_scalar(x_40)) {
+ x_42 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_44 = x_42;
+ x_42 = x_40;
 }
-lean_ctor_set(x_44, 0, x_40);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_ctor_set(x_42, 0, x_38);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
 }
 else
 {
-lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
-x_45 = lean_ctor_get(x_39, 0);
-lean_inc(x_45);
-x_46 = lean_ctor_get(x_39, 1);
-lean_inc(x_46);
-if (lean_is_exclusive(x_39)) {
- lean_ctor_release(x_39, 0);
- lean_ctor_release(x_39, 1);
- x_47 = x_39;
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_43 = lean_ctor_get(x_37, 0);
+lean_inc(x_43);
+x_44 = lean_ctor_get(x_37, 1);
+lean_inc(x_44);
+if (lean_is_exclusive(x_37)) {
+ lean_ctor_release(x_37, 0);
+ lean_ctor_release(x_37, 1);
+ x_45 = x_37;
 } else {
- lean_dec_ref(x_39);
- x_47 = lean_box(0);
+ lean_dec_ref(x_37);
+ x_45 = lean_box(0);
 }
 lean_inc(x_3);
-x_48 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_3, x_1, x_45);
-x_49 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_46, x_33);
-if (lean_is_scalar(x_47)) {
- x_50 = lean_alloc_ctor(1, 2, 0);
+x_46 = l___private_Init_Lean_Elab_Term_5__fromMetaException(x_3, x_1, x_43);
+x_47 = l___private_Init_Lean_Elab_Term_6__fromMetaState(x_1, x_3, x_4, x_44, x_32);
+if (lean_is_scalar(x_45)) {
+ x_48 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_50 = x_47;
+ x_48 = x_45;
 }
-lean_ctor_set(x_50, 0, x_48);
-lean_ctor_set(x_50, 1, x_49);
-return x_50;
+lean_ctor_set(x_48, 0, x_46);
+lean_ctor_set(x_48, 1, x_47);
+return x_48;
 }
 }
 }
@@ -9791,16 +8856,25 @@ return x_2;
 lean_object* l_Lean_Elab_Term_withNode___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
+lean_object* x_5; 
 if (lean_obj_tag(x_1) == 1)
 {
-lean_object* x_5; 
-x_5 = lean_apply_3(x_2, x_1, x_3, x_4);
-return x_5;
+lean_object* x_17; 
+x_17 = lean_apply_3(x_2, x_1, x_3, x_4);
+return x_17;
 }
 else
 {
-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_18; 
 lean_dec(x_2);
+x_18 = lean_box(0);
+x_5 = x_18;
+goto block_16;
+}
+block_16:
+{
+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_dec(x_5);
 x_6 = lean_box(0);
 x_7 = lean_unsigned_to_nat(0u);
 lean_inc(x_1);
@@ -12135,6 +11209,229 @@ return x_18;
 }
 }
 }
+lean_object* _init_l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("unexpected syntax");
+return x_1;
+}
+}
+lean_object* _init_l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__1;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__2;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+if (lean_obj_tag(x_6) == 0)
+{
+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_dec(x_3);
+lean_dec(x_1);
+lean_inc(x_2);
+x_9 = l___private_Init_Lean_Elab_Term_2__prettyPrint(x_2, x_7, x_8);
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+x_11 = lean_ctor_get(x_9, 1);
+lean_inc(x_11);
+lean_dec(x_9);
+x_12 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_12, 0, x_10);
+x_13 = l_Lean_MessageData_ofList___closed__3;
+x_14 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_14, 1, x_12);
+x_15 = lean_unsigned_to_nat(2u);
+x_16 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_14);
+x_17 = l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__3;
+x_18 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_16);
+x_19 = l_Lean_Elab_Term_throwError___rarg(x_2, x_18, x_7, x_11);
+return x_19;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_ctor_get(x_6, 0);
+lean_inc(x_20);
+x_21 = lean_ctor_get(x_6, 1);
+lean_inc(x_21);
+lean_dec(x_6);
+lean_inc(x_7);
+lean_inc(x_3);
+lean_inc(x_2);
+x_22 = lean_apply_4(x_20, x_2, x_3, x_7, x_8);
+if (lean_obj_tag(x_22) == 0)
+{
+lean_dec(x_21);
+lean_dec(x_7);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_22;
+}
+else
+{
+lean_object* x_23; 
+x_23 = lean_ctor_get(x_22, 0);
+lean_inc(x_23);
+if (lean_obj_tag(x_23) == 0)
+{
+lean_object* x_24; 
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+if (lean_obj_tag(x_24) == 0)
+{
+lean_dec(x_21);
+lean_dec(x_1);
+if (x_4 == 0)
+{
+uint8_t x_25; 
+lean_dec(x_24);
+lean_dec(x_7);
+lean_dec(x_3);
+lean_dec(x_2);
+x_25 = !lean_is_exclusive(x_22);
+if (x_25 == 0)
+{
+lean_object* x_26; 
+x_26 = lean_ctor_get(x_22, 0);
+lean_dec(x_26);
+return x_22;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; 
+x_27 = lean_ctor_get(x_22, 1);
+lean_inc(x_27);
+lean_dec(x_22);
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_23);
+lean_ctor_set(x_28, 1, x_27);
+return x_28;
+}
+}
+else
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+lean_dec(x_23);
+x_29 = lean_ctor_get(x_22, 1);
+lean_inc(x_29);
+lean_dec(x_22);
+x_30 = lean_ctor_get(x_24, 0);
+lean_inc(x_30);
+lean_dec(x_24);
+x_31 = l___private_Init_Lean_Elab_Term_10__exceptionToSorry(x_2, x_30, x_3, x_7, x_29);
+lean_dec(x_2);
+return x_31;
+}
+}
+else
+{
+lean_object* x_32; 
+lean_dec(x_23);
+x_32 = lean_ctor_get(x_22, 1);
+lean_inc(x_32);
+lean_dec(x_22);
+x_6 = x_21;
+x_8 = x_32;
+goto _start;
+}
+}
+else
+{
+lean_dec(x_21);
+if (x_5 == 0)
+{
+uint8_t x_34; 
+lean_dec(x_7);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_34 = !lean_is_exclusive(x_22);
+if (x_34 == 0)
+{
+lean_object* x_35; 
+x_35 = lean_ctor_get(x_22, 0);
+lean_dec(x_35);
+return x_22;
+}
+else
+{
+lean_object* x_36; lean_object* x_37; 
+x_36 = lean_ctor_get(x_22, 1);
+lean_inc(x_36);
+lean_dec(x_22);
+x_37 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_37, 0, x_23);
+lean_ctor_set(x_37, 1, x_36);
+return x_37;
+}
+}
+else
+{
+lean_object* x_38; 
+lean_dec(x_22);
+x_38 = l___private_Init_Lean_Elab_Term_11__postponeElabTerm(x_2, x_3, x_7, x_1);
+return x_38;
+}
+}
+}
+}
+}
+}
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; uint8_t x_10; lean_object* x_11; 
+x_9 = lean_unbox(x_4);
+lean_dec(x_4);
+x_10 = lean_unbox(x_5);
+lean_dec(x_5);
+x_11 = l___private_Init_Lean_Elab_Term_12__elabTermUsing___main(x_1, x_2, x_3, x_9, x_10, x_6, x_7, x_8);
+return x_11;
+}
+}
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l___private_Init_Lean_Elab_Term_12__elabTermUsing___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+return x_9;
+}
+}
+lean_object* l___private_Init_Lean_Elab_Term_12__elabTermUsing___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+uint8_t x_9; uint8_t x_10; lean_object* x_11; 
+x_9 = lean_unbox(x_4);
+lean_dec(x_4);
+x_10 = lean_unbox(x_5);
+lean_dec(x_5);
+x_11 = l___private_Init_Lean_Elab_Term_12__elabTermUsing(x_1, x_2, x_3, x_9, x_10, x_6, x_7, x_8);
+return x_11;
+}
+}
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_Term_elabTerm___spec__4(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -12424,66 +11721,75 @@ lean_ctor_set(x_6, 5, x_10);
 x_11 = !lean_is_exclusive(x_5);
 if (x_11 == 0)
 {
-lean_object* x_12; 
+lean_object* x_12; lean_object* x_13; lean_object* x_34; 
 x_12 = lean_ctor_get(x_5, 9);
 lean_dec(x_12);
 lean_ctor_set(x_5, 9, x_8);
 if (lean_obj_tag(x_1) == 1)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
-x_13 = lean_ctor_get(x_1, 0);
-lean_inc(x_13);
-x_47 = l_Lean_Elab_Term_getOptions(x_5, x_6);
-x_48 = lean_ctor_get(x_47, 0);
+lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; uint8_t x_50; 
+x_46 = l_Lean_Elab_Term_getOptions(x_5, x_6);
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+x_48 = lean_ctor_get(x_46, 1);
 lean_inc(x_48);
-x_49 = lean_ctor_get(x_47, 1);
-lean_inc(x_49);
+lean_dec(x_46);
+x_49 = l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__4;
+x_50 = l_Lean_checkTraceOption(x_47, x_49);
 lean_dec(x_47);
-x_50 = l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__4;
-x_51 = l_Lean_checkTraceOption(x_48, x_50);
-lean_dec(x_48);
-if (x_51 == 0)
+if (x_50 == 0)
 {
-x_14 = x_49;
-goto block_46;
+x_13 = x_48;
+goto block_33;
 }
 else
 {
-lean_object* x_52; lean_object* x_53; lean_object* x_54; 
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
 lean_inc(x_1);
-x_52 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_52, 0, x_1);
-x_53 = l_Lean_Elab_Term_logTrace(x_50, x_1, x_52, x_5, x_49);
-x_54 = lean_ctor_get(x_53, 1);
-lean_inc(x_54);
-lean_dec(x_53);
-x_14 = x_54;
-goto block_46;
+x_51 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_51, 0, x_1);
+x_52 = l_Lean_Elab_Term_logTrace(x_49, x_1, x_51, x_5, x_48);
+x_53 = lean_ctor_get(x_52, 1);
+lean_inc(x_53);
+lean_dec(x_52);
+x_13 = x_53;
+goto block_33;
 }
-block_46:
+}
+else
 {
-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; 
-x_15 = l_Lean_Elab_Term_termElabAttribute;
-x_16 = lean_ctor_get(x_15, 1);
+lean_object* x_54; 
+lean_dec(x_2);
+x_54 = lean_box(0);
+x_34 = x_54;
+goto block_45;
+}
+block_33:
+{
+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; 
+x_14 = l_Lean_Elab_Term_termElabAttribute;
+x_15 = lean_ctor_get(x_14, 1);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_13, 0);
 lean_inc(x_16);
-x_17 = lean_ctor_get(x_14, 0);
+x_17 = lean_ctor_get(x_16, 0);
 lean_inc(x_17);
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-lean_dec(x_17);
-x_19 = l_Lean_PersistentEnvExtension_getState___rarg(x_16, x_18);
-lean_dec(x_18);
 lean_dec(x_16);
-x_20 = lean_ctor_get(x_19, 1);
-lean_inc(x_20);
-lean_dec(x_19);
-x_21 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTerm___spec__1(x_20, x_13);
+x_18 = l_Lean_PersistentEnvExtension_getState___rarg(x_15, x_17);
+lean_dec(x_17);
+lean_dec(x_15);
+x_19 = lean_ctor_get(x_18, 1);
+lean_inc(x_19);
+lean_dec(x_18);
+lean_inc(x_1);
+x_20 = l_Lean_Syntax_getKind(x_1);
+x_21 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTerm___spec__1(x_19, x_20);
 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; lean_object* x_29; lean_object* x_30; 
 lean_dec(x_2);
 x_22 = l_Lean_Name_toString___closed__1;
-x_23 = l_Lean_Name_toStringWithSep___main(x_22, x_13);
+x_23 = l_Lean_Name_toStringWithSep___main(x_22, x_20);
 x_24 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_24, 0, x_23);
 x_25 = lean_alloc_ctor(0, 1, 0);
@@ -12496,420 +11802,237 @@ x_28 = l_Lean_Elab_Term_elabTerm___closed__6;
 x_29 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_29, 0, x_27);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Elab_Term_throwError___rarg(x_1, x_29, x_5, x_14);
+x_30 = l_Lean_Elab_Term_throwError___rarg(x_1, x_29, x_5, x_13);
 return x_30;
 }
 else
 {
 lean_object* x_31; lean_object* x_32; 
-lean_dec(x_13);
+lean_dec(x_20);
 x_31 = lean_ctor_get(x_21, 0);
 lean_inc(x_31);
 lean_dec(x_21);
-lean_inc(x_14);
-lean_inc(x_5);
-lean_inc(x_2);
+lean_inc(x_13);
+x_32 = l___private_Init_Lean_Elab_Term_12__elabTermUsing___main(x_13, x_1, x_2, x_4, x_3, x_31, x_5, x_13);
+return x_32;
+}
+}
+block_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; lean_object* x_44; 
+lean_dec(x_34);
+x_35 = lean_box(0);
+x_36 = lean_unsigned_to_nat(0u);
 lean_inc(x_1);
-x_32 = lean_apply_4(x_31, x_1, x_2, x_5, x_14);
-if (lean_obj_tag(x_32) == 0)
-{
-lean_dec(x_14);
-lean_dec(x_5);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_32;
-}
-else
-{
-lean_object* x_33; 
-x_33 = lean_ctor_get(x_32, 0);
-lean_inc(x_33);
-if (lean_obj_tag(x_33) == 0)
-{
-lean_dec(x_14);
-if (x_4 == 0)
-{
-uint8_t x_34; 
-lean_dec(x_5);
-lean_dec(x_2);
-lean_dec(x_1);
-x_34 = !lean_is_exclusive(x_32);
-if (x_34 == 0)
-{
-lean_object* x_35; 
-x_35 = lean_ctor_get(x_32, 0);
-lean_dec(x_35);
-return x_32;
-}
-else
-{
-lean_object* x_36; lean_object* x_37; 
-x_36 = lean_ctor_get(x_32, 1);
-lean_inc(x_36);
-lean_dec(x_32);
-x_37 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_37, 0, x_33);
-lean_ctor_set(x_37, 1, x_36);
-return x_37;
-}
-}
-else
-{
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_32, 1);
-lean_inc(x_38);
-lean_dec(x_32);
-x_39 = lean_ctor_get(x_33, 0);
-lean_inc(x_39);
-lean_dec(x_33);
-x_40 = l___private_Init_Lean_Elab_Term_10__exceptionToSorry(x_1, x_39, x_2, x_5, x_38);
-lean_dec(x_1);
-return x_40;
-}
-}
-else
-{
-if (x_3 == 0)
-{
-uint8_t x_41; 
-lean_dec(x_14);
-lean_dec(x_5);
-lean_dec(x_2);
-lean_dec(x_1);
-x_41 = !lean_is_exclusive(x_32);
-if (x_41 == 0)
-{
-lean_object* x_42; 
-x_42 = lean_ctor_get(x_32, 0);
-lean_dec(x_42);
-return x_32;
-}
-else
-{
-lean_object* x_43; lean_object* x_44; 
-x_43 = lean_ctor_get(x_32, 1);
-lean_inc(x_43);
-lean_dec(x_32);
-x_44 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_44, 0, x_33);
-lean_ctor_set(x_44, 1, x_43);
+x_37 = l_Lean_Syntax_formatStxAux___main(x_35, x_36, x_1);
+x_38 = l_Lean_Options_empty;
+x_39 = l_Lean_Format_pretty(x_37, x_38);
+x_40 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_40, 0, x_39);
+x_41 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_41, 0, x_40);
+x_42 = l_Lean_Elab_Term_withNode___rarg___closed__3;
+x_43 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_43, 0, x_42);
+lean_ctor_set(x_43, 1, x_41);
+x_44 = l_Lean_Elab_Term_throwError___rarg(x_1, x_43, x_5, x_6);
 return x_44;
 }
 }
 else
 {
-lean_object* x_45; 
-lean_dec(x_32);
-x_45 = l___private_Init_Lean_Elab_Term_11__postponeElabTerm(x_1, x_2, x_5, x_14);
-return x_45;
-}
-}
-}
-}
-}
-}
-else
-{
-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; 
-lean_dec(x_2);
-x_55 = lean_box(0);
-x_56 = lean_unsigned_to_nat(0u);
-lean_inc(x_1);
-x_57 = l_Lean_Syntax_formatStxAux___main(x_55, x_56, x_1);
-x_58 = l_Lean_Options_empty;
-x_59 = l_Lean_Format_pretty(x_57, x_58);
-x_60 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_60, 0, x_59);
-x_61 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_61, 0, x_60);
-x_62 = l_Lean_Elab_Term_withNode___rarg___closed__3;
-x_63 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_63, 0, x_62);
-lean_ctor_set(x_63, 1, x_61);
-x_64 = l_Lean_Elab_Term_throwError___rarg(x_1, x_63, x_5, x_6);
-return x_64;
-}
-}
-else
-{
-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; uint8_t x_74; lean_object* x_75; 
-x_65 = lean_ctor_get(x_5, 0);
-x_66 = lean_ctor_get(x_5, 1);
-x_67 = lean_ctor_get(x_5, 2);
-x_68 = lean_ctor_get(x_5, 3);
-x_69 = lean_ctor_get(x_5, 4);
-x_70 = lean_ctor_get(x_5, 5);
-x_71 = lean_ctor_get(x_5, 6);
-x_72 = lean_ctor_get(x_5, 7);
-x_73 = lean_ctor_get(x_5, 8);
-x_74 = lean_ctor_get_uint8(x_5, sizeof(void*)*10);
-lean_inc(x_73);
-lean_inc(x_72);
-lean_inc(x_71);
-lean_inc(x_70);
-lean_inc(x_69);
-lean_inc(x_68);
-lean_inc(x_67);
-lean_inc(x_66);
-lean_inc(x_65);
+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; uint8_t x_64; lean_object* x_65; lean_object* x_66; lean_object* x_87; 
+x_55 = lean_ctor_get(x_5, 0);
+x_56 = lean_ctor_get(x_5, 1);
+x_57 = lean_ctor_get(x_5, 2);
+x_58 = lean_ctor_get(x_5, 3);
+x_59 = lean_ctor_get(x_5, 4);
+x_60 = lean_ctor_get(x_5, 5);
+x_61 = lean_ctor_get(x_5, 6);
+x_62 = lean_ctor_get(x_5, 7);
+x_63 = lean_ctor_get(x_5, 8);
+x_64 = lean_ctor_get_uint8(x_5, sizeof(void*)*10);
+lean_inc(x_63);
+lean_inc(x_62);
+lean_inc(x_61);
+lean_inc(x_60);
+lean_inc(x_59);
+lean_inc(x_58);
+lean_inc(x_57);
+lean_inc(x_56);
+lean_inc(x_55);
 lean_dec(x_5);
-x_75 = lean_alloc_ctor(0, 10, 1);
-lean_ctor_set(x_75, 0, x_65);
-lean_ctor_set(x_75, 1, x_66);
-lean_ctor_set(x_75, 2, x_67);
-lean_ctor_set(x_75, 3, x_68);
-lean_ctor_set(x_75, 4, x_69);
-lean_ctor_set(x_75, 5, x_70);
-lean_ctor_set(x_75, 6, x_71);
-lean_ctor_set(x_75, 7, x_72);
-lean_ctor_set(x_75, 8, x_73);
-lean_ctor_set(x_75, 9, x_8);
-lean_ctor_set_uint8(x_75, sizeof(void*)*10, x_74);
+x_65 = lean_alloc_ctor(0, 10, 1);
+lean_ctor_set(x_65, 0, x_55);
+lean_ctor_set(x_65, 1, x_56);
+lean_ctor_set(x_65, 2, x_57);
+lean_ctor_set(x_65, 3, x_58);
+lean_ctor_set(x_65, 4, x_59);
+lean_ctor_set(x_65, 5, x_60);
+lean_ctor_set(x_65, 6, x_61);
+lean_ctor_set(x_65, 7, x_62);
+lean_ctor_set(x_65, 8, x_63);
+lean_ctor_set(x_65, 9, x_8);
+lean_ctor_set_uint8(x_65, sizeof(void*)*10, x_64);
 if (lean_obj_tag(x_1) == 1)
 {
-lean_object* x_76; lean_object* x_77; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; uint8_t x_112; 
-x_76 = lean_ctor_get(x_1, 0);
-lean_inc(x_76);
-x_108 = l_Lean_Elab_Term_getOptions(x_75, x_6);
-x_109 = lean_ctor_get(x_108, 0);
-lean_inc(x_109);
-x_110 = lean_ctor_get(x_108, 1);
-lean_inc(x_110);
-lean_dec(x_108);
-x_111 = l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__4;
-x_112 = l_Lean_checkTraceOption(x_109, x_111);
-lean_dec(x_109);
-if (x_112 == 0)
-{
-x_77 = x_110;
-goto block_107;
-}
-else
-{
-lean_object* x_113; lean_object* x_114; lean_object* x_115; 
-lean_inc(x_1);
-x_113 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_113, 0, x_1);
-x_114 = l_Lean_Elab_Term_logTrace(x_111, x_1, x_113, x_75, x_110);
-x_115 = lean_ctor_get(x_114, 1);
-lean_inc(x_115);
-lean_dec(x_114);
-x_77 = x_115;
-goto block_107;
-}
-block_107:
-{
-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_78 = l_Lean_Elab_Term_termElabAttribute;
-x_79 = lean_ctor_get(x_78, 1);
-lean_inc(x_79);
-x_80 = lean_ctor_get(x_77, 0);
-lean_inc(x_80);
-x_81 = lean_ctor_get(x_80, 0);
-lean_inc(x_81);
-lean_dec(x_80);
-x_82 = l_Lean_PersistentEnvExtension_getState___rarg(x_79, x_81);
-lean_dec(x_81);
-lean_dec(x_79);
-x_83 = lean_ctor_get(x_82, 1);
-lean_inc(x_83);
-lean_dec(x_82);
-x_84 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTerm___spec__1(x_83, x_76);
-if (lean_obj_tag(x_84) == 0)
-{
-lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
-lean_dec(x_2);
-x_85 = l_Lean_Name_toString___closed__1;
-x_86 = l_Lean_Name_toStringWithSep___main(x_85, x_76);
-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_Elab_Term_elabTerm___closed__3;
-x_90 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_90, 0, x_89);
-lean_ctor_set(x_90, 1, x_88);
-x_91 = l_Lean_Elab_Term_elabTerm___closed__6;
-x_92 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_92, 0, x_90);
-lean_ctor_set(x_92, 1, x_91);
-x_93 = l_Lean_Elab_Term_throwError___rarg(x_1, x_92, x_75, x_77);
-return x_93;
-}
-else
-{
-lean_object* x_94; lean_object* x_95; 
-lean_dec(x_76);
-x_94 = lean_ctor_get(x_84, 0);
-lean_inc(x_94);
-lean_dec(x_84);
-lean_inc(x_77);
-lean_inc(x_75);
-lean_inc(x_2);
-lean_inc(x_1);
-x_95 = lean_apply_4(x_94, x_1, x_2, x_75, x_77);
-if (lean_obj_tag(x_95) == 0)
-{
-lean_dec(x_77);
-lean_dec(x_75);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_95;
-}
-else
-{
-lean_object* x_96; 
-x_96 = lean_ctor_get(x_95, 0);
-lean_inc(x_96);
-if (lean_obj_tag(x_96) == 0)
-{
-lean_dec(x_77);
-if (x_4 == 0)
-{
-lean_object* x_97; lean_object* x_98; lean_object* x_99; 
-lean_dec(x_75);
-lean_dec(x_2);
-lean_dec(x_1);
-x_97 = lean_ctor_get(x_95, 1);
-lean_inc(x_97);
-if (lean_is_exclusive(x_95)) {
- lean_ctor_release(x_95, 0);
- lean_ctor_release(x_95, 1);
- x_98 = x_95;
-} else {
- lean_dec_ref(x_95);
- x_98 = lean_box(0);
-}
-if (lean_is_scalar(x_98)) {
- x_99 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_99 = x_98;
-}
-lean_ctor_set(x_99, 0, x_96);
-lean_ctor_set(x_99, 1, x_97);
-return x_99;
-}
-else
-{
-lean_object* x_100; lean_object* x_101; lean_object* x_102; 
-x_100 = lean_ctor_get(x_95, 1);
+lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; uint8_t x_103; 
+x_99 = l_Lean_Elab_Term_getOptions(x_65, x_6);
+x_100 = lean_ctor_get(x_99, 0);
 lean_inc(x_100);
-lean_dec(x_95);
-x_101 = lean_ctor_get(x_96, 0);
+x_101 = lean_ctor_get(x_99, 1);
 lean_inc(x_101);
-lean_dec(x_96);
-x_102 = l___private_Init_Lean_Elab_Term_10__exceptionToSorry(x_1, x_101, x_2, x_75, x_100);
-lean_dec(x_1);
-return x_102;
-}
+lean_dec(x_99);
+x_102 = l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__4;
+x_103 = l_Lean_checkTraceOption(x_100, x_102);
+lean_dec(x_100);
+if (x_103 == 0)
+{
+x_66 = x_101;
+goto block_86;
 }
 else
 {
-if (x_3 == 0)
-{
-lean_object* x_103; lean_object* x_104; lean_object* x_105; 
-lean_dec(x_77);
-lean_dec(x_75);
-lean_dec(x_2);
-lean_dec(x_1);
-x_103 = lean_ctor_get(x_95, 1);
-lean_inc(x_103);
-if (lean_is_exclusive(x_95)) {
- lean_ctor_release(x_95, 0);
- lean_ctor_release(x_95, 1);
- x_104 = x_95;
-} else {
- lean_dec_ref(x_95);
- x_104 = lean_box(0);
-}
-if (lean_is_scalar(x_104)) {
- x_105 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_105 = x_104;
-}
-lean_ctor_set(x_105, 0, x_96);
-lean_ctor_set(x_105, 1, x_103);
-return x_105;
-}
-else
-{
-lean_object* x_106; 
-lean_dec(x_95);
-x_106 = l___private_Init_Lean_Elab_Term_11__postponeElabTerm(x_1, x_2, x_75, x_77);
-return x_106;
-}
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
-lean_dec(x_2);
-x_116 = lean_box(0);
-x_117 = lean_unsigned_to_nat(0u);
+lean_object* x_104; lean_object* x_105; lean_object* x_106; 
 lean_inc(x_1);
-x_118 = l_Lean_Syntax_formatStxAux___main(x_116, x_117, x_1);
-x_119 = l_Lean_Options_empty;
-x_120 = l_Lean_Format_pretty(x_118, x_119);
-x_121 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_121, 0, x_120);
-x_122 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_122, 0, x_121);
-x_123 = l_Lean_Elab_Term_withNode___rarg___closed__3;
-x_124 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_124, 0, x_123);
-lean_ctor_set(x_124, 1, x_122);
-x_125 = l_Lean_Elab_Term_throwError___rarg(x_1, x_124, x_75, x_6);
-return x_125;
+x_104 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_104, 0, x_1);
+x_105 = l_Lean_Elab_Term_logTrace(x_102, x_1, x_104, x_65, x_101);
+x_106 = lean_ctor_get(x_105, 1);
+lean_inc(x_106);
+lean_dec(x_105);
+x_66 = x_106;
+goto block_86;
+}
+}
+else
+{
+lean_object* x_107; 
+lean_dec(x_2);
+x_107 = lean_box(0);
+x_87 = x_107;
+goto block_98;
+}
+block_86:
+{
+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; 
+x_67 = l_Lean_Elab_Term_termElabAttribute;
+x_68 = lean_ctor_get(x_67, 1);
+lean_inc(x_68);
+x_69 = lean_ctor_get(x_66, 0);
+lean_inc(x_69);
+x_70 = lean_ctor_get(x_69, 0);
+lean_inc(x_70);
+lean_dec(x_69);
+x_71 = l_Lean_PersistentEnvExtension_getState___rarg(x_68, x_70);
+lean_dec(x_70);
+lean_dec(x_68);
+x_72 = lean_ctor_get(x_71, 1);
+lean_inc(x_72);
+lean_dec(x_71);
+lean_inc(x_1);
+x_73 = l_Lean_Syntax_getKind(x_1);
+x_74 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTerm___spec__1(x_72, x_73);
+if (lean_obj_tag(x_74) == 0)
+{
+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_dec(x_2);
+x_75 = l_Lean_Name_toString___closed__1;
+x_76 = l_Lean_Name_toStringWithSep___main(x_75, x_73);
+x_77 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_77, 0, x_76);
+x_78 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_78, 0, x_77);
+x_79 = l_Lean_Elab_Term_elabTerm___closed__3;
+x_80 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_80, 0, x_79);
+lean_ctor_set(x_80, 1, x_78);
+x_81 = l_Lean_Elab_Term_elabTerm___closed__6;
+x_82 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_82, 0, x_80);
+lean_ctor_set(x_82, 1, x_81);
+x_83 = l_Lean_Elab_Term_throwError___rarg(x_1, x_82, x_65, x_66);
+return x_83;
+}
+else
+{
+lean_object* x_84; lean_object* x_85; 
+lean_dec(x_73);
+x_84 = lean_ctor_get(x_74, 0);
+lean_inc(x_84);
+lean_dec(x_74);
+lean_inc(x_66);
+x_85 = l___private_Init_Lean_Elab_Term_12__elabTermUsing___main(x_66, x_1, x_2, x_4, x_3, x_84, x_65, x_66);
+return x_85;
+}
+}
+block_98:
+{
+lean_object* x_88; lean_object* x_89; 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_dec(x_87);
+x_88 = lean_box(0);
+x_89 = lean_unsigned_to_nat(0u);
+lean_inc(x_1);
+x_90 = l_Lean_Syntax_formatStxAux___main(x_88, x_89, x_1);
+x_91 = l_Lean_Options_empty;
+x_92 = l_Lean_Format_pretty(x_90, x_91);
+x_93 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_93, 0, x_92);
+x_94 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_94, 0, x_93);
+x_95 = l_Lean_Elab_Term_withNode___rarg___closed__3;
+x_96 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_96, 0, x_95);
+lean_ctor_set(x_96, 1, x_94);
+x_97 = l_Lean_Elab_Term_throwError___rarg(x_1, x_96, x_65, x_6);
+return x_97;
 }
 }
 }
 else
 {
-lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; uint8_t x_144; lean_object* x_145; lean_object* x_146; 
-x_126 = lean_ctor_get(x_6, 0);
-x_127 = lean_ctor_get(x_6, 1);
-x_128 = lean_ctor_get(x_6, 2);
-x_129 = lean_ctor_get(x_6, 3);
-x_130 = lean_ctor_get(x_6, 4);
-x_131 = lean_ctor_get(x_6, 5);
-lean_inc(x_131);
-lean_inc(x_130);
-lean_inc(x_129);
-lean_inc(x_128);
-lean_inc(x_127);
-lean_inc(x_126);
+lean_object* x_108; lean_object* x_109; 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_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; uint8_t x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_150; 
+x_108 = lean_ctor_get(x_6, 0);
+x_109 = lean_ctor_get(x_6, 1);
+x_110 = lean_ctor_get(x_6, 2);
+x_111 = lean_ctor_get(x_6, 3);
+x_112 = lean_ctor_get(x_6, 4);
+x_113 = lean_ctor_get(x_6, 5);
+lean_inc(x_113);
+lean_inc(x_112);
+lean_inc(x_111);
+lean_inc(x_110);
+lean_inc(x_109);
+lean_inc(x_108);
 lean_dec(x_6);
-x_132 = lean_unsigned_to_nat(1u);
-x_133 = lean_nat_add(x_131, x_132);
-x_134 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_134, 0, x_126);
-lean_ctor_set(x_134, 1, x_127);
-lean_ctor_set(x_134, 2, x_128);
-lean_ctor_set(x_134, 3, x_129);
-lean_ctor_set(x_134, 4, x_130);
-lean_ctor_set(x_134, 5, x_133);
-x_135 = lean_ctor_get(x_5, 0);
-lean_inc(x_135);
-x_136 = lean_ctor_get(x_5, 1);
-lean_inc(x_136);
-x_137 = lean_ctor_get(x_5, 2);
-lean_inc(x_137);
-x_138 = lean_ctor_get(x_5, 3);
-lean_inc(x_138);
-x_139 = lean_ctor_get(x_5, 4);
-lean_inc(x_139);
-x_140 = lean_ctor_get(x_5, 5);
-lean_inc(x_140);
-x_141 = lean_ctor_get(x_5, 6);
-lean_inc(x_141);
-x_142 = lean_ctor_get(x_5, 7);
-lean_inc(x_142);
-x_143 = lean_ctor_get(x_5, 8);
-lean_inc(x_143);
-x_144 = lean_ctor_get_uint8(x_5, sizeof(void*)*10);
+x_114 = lean_unsigned_to_nat(1u);
+x_115 = lean_nat_add(x_113, x_114);
+x_116 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_116, 0, x_108);
+lean_ctor_set(x_116, 1, x_109);
+lean_ctor_set(x_116, 2, x_110);
+lean_ctor_set(x_116, 3, x_111);
+lean_ctor_set(x_116, 4, x_112);
+lean_ctor_set(x_116, 5, x_115);
+x_117 = lean_ctor_get(x_5, 0);
+lean_inc(x_117);
+x_118 = lean_ctor_get(x_5, 1);
+lean_inc(x_118);
+x_119 = lean_ctor_get(x_5, 2);
+lean_inc(x_119);
+x_120 = lean_ctor_get(x_5, 3);
+lean_inc(x_120);
+x_121 = lean_ctor_get(x_5, 4);
+lean_inc(x_121);
+x_122 = lean_ctor_get(x_5, 5);
+lean_inc(x_122);
+x_123 = lean_ctor_get(x_5, 6);
+lean_inc(x_123);
+x_124 = lean_ctor_get(x_5, 7);
+lean_inc(x_124);
+x_125 = lean_ctor_get(x_5, 8);
+lean_inc(x_125);
+x_126 = lean_ctor_get_uint8(x_5, sizeof(void*)*10);
 if (lean_is_exclusive(x_5)) {
  lean_ctor_release(x_5, 0);
  lean_ctor_release(x_5, 1);
@@ -12921,225 +12044,139 @@ if (lean_is_exclusive(x_5)) {
  lean_ctor_release(x_5, 7);
  lean_ctor_release(x_5, 8);
  lean_ctor_release(x_5, 9);
- x_145 = x_5;
+ x_127 = x_5;
 } else {
  lean_dec_ref(x_5);
- x_145 = lean_box(0);
+ x_127 = lean_box(0);
 }
-if (lean_is_scalar(x_145)) {
- x_146 = lean_alloc_ctor(0, 10, 1);
+if (lean_is_scalar(x_127)) {
+ x_128 = lean_alloc_ctor(0, 10, 1);
 } else {
- x_146 = x_145;
+ x_128 = x_127;
 }
-lean_ctor_set(x_146, 0, x_135);
-lean_ctor_set(x_146, 1, x_136);
-lean_ctor_set(x_146, 2, x_137);
-lean_ctor_set(x_146, 3, x_138);
-lean_ctor_set(x_146, 4, x_139);
-lean_ctor_set(x_146, 5, x_140);
-lean_ctor_set(x_146, 6, x_141);
-lean_ctor_set(x_146, 7, x_142);
-lean_ctor_set(x_146, 8, x_143);
-lean_ctor_set(x_146, 9, x_131);
-lean_ctor_set_uint8(x_146, sizeof(void*)*10, x_144);
+lean_ctor_set(x_128, 0, x_117);
+lean_ctor_set(x_128, 1, x_118);
+lean_ctor_set(x_128, 2, x_119);
+lean_ctor_set(x_128, 3, x_120);
+lean_ctor_set(x_128, 4, x_121);
+lean_ctor_set(x_128, 5, x_122);
+lean_ctor_set(x_128, 6, x_123);
+lean_ctor_set(x_128, 7, x_124);
+lean_ctor_set(x_128, 8, x_125);
+lean_ctor_set(x_128, 9, x_113);
+lean_ctor_set_uint8(x_128, sizeof(void*)*10, x_126);
 if (lean_obj_tag(x_1) == 1)
 {
-lean_object* x_147; lean_object* x_148; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; uint8_t x_183; 
-x_147 = lean_ctor_get(x_1, 0);
+lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; uint8_t x_166; 
+x_162 = l_Lean_Elab_Term_getOptions(x_128, x_116);
+x_163 = lean_ctor_get(x_162, 0);
+lean_inc(x_163);
+x_164 = lean_ctor_get(x_162, 1);
+lean_inc(x_164);
+lean_dec(x_162);
+x_165 = l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__4;
+x_166 = l_Lean_checkTraceOption(x_163, x_165);
+lean_dec(x_163);
+if (x_166 == 0)
+{
+x_129 = x_164;
+goto block_149;
+}
+else
+{
+lean_object* x_167; lean_object* x_168; lean_object* x_169; 
+lean_inc(x_1);
+x_167 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_167, 0, x_1);
+x_168 = l_Lean_Elab_Term_logTrace(x_165, x_1, x_167, x_128, x_164);
+x_169 = lean_ctor_get(x_168, 1);
+lean_inc(x_169);
+lean_dec(x_168);
+x_129 = x_169;
+goto block_149;
+}
+}
+else
+{
+lean_object* x_170; 
+lean_dec(x_2);
+x_170 = lean_box(0);
+x_150 = x_170;
+goto block_161;
+}
+block_149:
+{
+lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+x_130 = l_Lean_Elab_Term_termElabAttribute;
+x_131 = lean_ctor_get(x_130, 1);
+lean_inc(x_131);
+x_132 = lean_ctor_get(x_129, 0);
+lean_inc(x_132);
+x_133 = lean_ctor_get(x_132, 0);
+lean_inc(x_133);
+lean_dec(x_132);
+x_134 = l_Lean_PersistentEnvExtension_getState___rarg(x_131, x_133);
+lean_dec(x_133);
+lean_dec(x_131);
+x_135 = lean_ctor_get(x_134, 1);
+lean_inc(x_135);
+lean_dec(x_134);
+lean_inc(x_1);
+x_136 = l_Lean_Syntax_getKind(x_1);
+x_137 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTerm___spec__1(x_135, x_136);
+if (lean_obj_tag(x_137) == 0)
+{
+lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; 
+lean_dec(x_2);
+x_138 = l_Lean_Name_toString___closed__1;
+x_139 = l_Lean_Name_toStringWithSep___main(x_138, x_136);
+x_140 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_140, 0, x_139);
+x_141 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_141, 0, x_140);
+x_142 = l_Lean_Elab_Term_elabTerm___closed__3;
+x_143 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_143, 0, x_142);
+lean_ctor_set(x_143, 1, x_141);
+x_144 = l_Lean_Elab_Term_elabTerm___closed__6;
+x_145 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_145, 0, x_143);
+lean_ctor_set(x_145, 1, x_144);
+x_146 = l_Lean_Elab_Term_throwError___rarg(x_1, x_145, x_128, x_129);
+return x_146;
+}
+else
+{
+lean_object* x_147; lean_object* x_148; 
+lean_dec(x_136);
+x_147 = lean_ctor_get(x_137, 0);
 lean_inc(x_147);
-x_179 = l_Lean_Elab_Term_getOptions(x_146, x_134);
-x_180 = lean_ctor_get(x_179, 0);
-lean_inc(x_180);
-x_181 = lean_ctor_get(x_179, 1);
-lean_inc(x_181);
-lean_dec(x_179);
-x_182 = l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__4;
-x_183 = l_Lean_checkTraceOption(x_180, x_182);
-lean_dec(x_180);
-if (x_183 == 0)
-{
-x_148 = x_181;
-goto block_178;
+lean_dec(x_137);
+lean_inc(x_129);
+x_148 = l___private_Init_Lean_Elab_Term_12__elabTermUsing___main(x_129, x_1, x_2, x_4, x_3, x_147, x_128, x_129);
+return x_148;
 }
-else
-{
-lean_object* x_184; lean_object* x_185; lean_object* x_186; 
-lean_inc(x_1);
-x_184 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_184, 0, x_1);
-x_185 = l_Lean_Elab_Term_logTrace(x_182, x_1, x_184, x_146, x_181);
-x_186 = lean_ctor_get(x_185, 1);
-lean_inc(x_186);
-lean_dec(x_185);
-x_148 = x_186;
-goto block_178;
 }
-block_178:
+block_161:
 {
-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; 
-x_149 = l_Lean_Elab_Term_termElabAttribute;
-x_150 = lean_ctor_get(x_149, 1);
-lean_inc(x_150);
-x_151 = lean_ctor_get(x_148, 0);
-lean_inc(x_151);
-x_152 = lean_ctor_get(x_151, 0);
-lean_inc(x_152);
-lean_dec(x_151);
-x_153 = l_Lean_PersistentEnvExtension_getState___rarg(x_150, x_152);
-lean_dec(x_152);
+lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; 
 lean_dec(x_150);
-x_154 = lean_ctor_get(x_153, 1);
-lean_inc(x_154);
-lean_dec(x_153);
-x_155 = l_Lean_SMap_find_x3f___at_Lean_Elab_Term_elabTerm___spec__1(x_154, x_147);
-if (lean_obj_tag(x_155) == 0)
-{
-lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
-lean_dec(x_2);
-x_156 = l_Lean_Name_toString___closed__1;
-x_157 = l_Lean_Name_toStringWithSep___main(x_156, x_147);
-x_158 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_158, 0, x_157);
-x_159 = lean_alloc_ctor(0, 1, 0);
+x_151 = lean_box(0);
+x_152 = lean_unsigned_to_nat(0u);
+lean_inc(x_1);
+x_153 = l_Lean_Syntax_formatStxAux___main(x_151, x_152, x_1);
+x_154 = l_Lean_Options_empty;
+x_155 = l_Lean_Format_pretty(x_153, x_154);
+x_156 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_156, 0, x_155);
+x_157 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_157, 0, x_156);
+x_158 = l_Lean_Elab_Term_withNode___rarg___closed__3;
+x_159 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_159, 0, x_158);
-x_160 = l_Lean_Elab_Term_elabTerm___closed__3;
-x_161 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_161, 0, x_160);
-lean_ctor_set(x_161, 1, x_159);
-x_162 = l_Lean_Elab_Term_elabTerm___closed__6;
-x_163 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_163, 0, x_161);
-lean_ctor_set(x_163, 1, x_162);
-x_164 = l_Lean_Elab_Term_throwError___rarg(x_1, x_163, x_146, x_148);
-return x_164;
-}
-else
-{
-lean_object* x_165; lean_object* x_166; 
-lean_dec(x_147);
-x_165 = lean_ctor_get(x_155, 0);
-lean_inc(x_165);
-lean_dec(x_155);
-lean_inc(x_148);
-lean_inc(x_146);
-lean_inc(x_2);
-lean_inc(x_1);
-x_166 = lean_apply_4(x_165, x_1, x_2, x_146, x_148);
-if (lean_obj_tag(x_166) == 0)
-{
-lean_dec(x_148);
-lean_dec(x_146);
-lean_dec(x_2);
-lean_dec(x_1);
-return x_166;
-}
-else
-{
-lean_object* x_167; 
-x_167 = lean_ctor_get(x_166, 0);
-lean_inc(x_167);
-if (lean_obj_tag(x_167) == 0)
-{
-lean_dec(x_148);
-if (x_4 == 0)
-{
-lean_object* x_168; lean_object* x_169; lean_object* x_170; 
-lean_dec(x_146);
-lean_dec(x_2);
-lean_dec(x_1);
-x_168 = lean_ctor_get(x_166, 1);
-lean_inc(x_168);
-if (lean_is_exclusive(x_166)) {
- lean_ctor_release(x_166, 0);
- lean_ctor_release(x_166, 1);
- x_169 = x_166;
-} else {
- lean_dec_ref(x_166);
- x_169 = lean_box(0);
-}
-if (lean_is_scalar(x_169)) {
- x_170 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_170 = x_169;
-}
-lean_ctor_set(x_170, 0, x_167);
-lean_ctor_set(x_170, 1, x_168);
-return x_170;
-}
-else
-{
-lean_object* x_171; lean_object* x_172; lean_object* x_173; 
-x_171 = lean_ctor_get(x_166, 1);
-lean_inc(x_171);
-lean_dec(x_166);
-x_172 = lean_ctor_get(x_167, 0);
-lean_inc(x_172);
-lean_dec(x_167);
-x_173 = l___private_Init_Lean_Elab_Term_10__exceptionToSorry(x_1, x_172, x_2, x_146, x_171);
-lean_dec(x_1);
-return x_173;
-}
-}
-else
-{
-if (x_3 == 0)
-{
-lean_object* x_174; lean_object* x_175; lean_object* x_176; 
-lean_dec(x_148);
-lean_dec(x_146);
-lean_dec(x_2);
-lean_dec(x_1);
-x_174 = lean_ctor_get(x_166, 1);
-lean_inc(x_174);
-if (lean_is_exclusive(x_166)) {
- lean_ctor_release(x_166, 0);
- lean_ctor_release(x_166, 1);
- x_175 = x_166;
-} else {
- lean_dec_ref(x_166);
- x_175 = lean_box(0);
-}
-if (lean_is_scalar(x_175)) {
- x_176 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_176 = x_175;
-}
-lean_ctor_set(x_176, 0, x_167);
-lean_ctor_set(x_176, 1, x_174);
-return x_176;
-}
-else
-{
-lean_object* x_177; 
-lean_dec(x_166);
-x_177 = l___private_Init_Lean_Elab_Term_11__postponeElabTerm(x_1, x_2, x_146, x_148);
-return x_177;
-}
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; 
-lean_dec(x_2);
-x_187 = lean_box(0);
-x_188 = lean_unsigned_to_nat(0u);
-lean_inc(x_1);
-x_189 = l_Lean_Syntax_formatStxAux___main(x_187, x_188, x_1);
-x_190 = l_Lean_Options_empty;
-x_191 = l_Lean_Format_pretty(x_189, x_190);
-x_192 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_192, 0, x_191);
-x_193 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_193, 0, x_192);
-x_194 = l_Lean_Elab_Term_withNode___rarg___closed__3;
-x_195 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_195, 0, x_194);
-lean_ctor_set(x_195, 1, x_193);
-x_196 = l_Lean_Elab_Term_throwError___rarg(x_1, x_195, x_146, x_134);
-return x_196;
+lean_ctor_set(x_159, 1, x_157);
+x_160 = l_Lean_Elab_Term_throwError___rarg(x_1, x_159, x_128, x_116);
+return x_160;
 }
 }
 }
@@ -13216,7 +12253,7 @@ x_9 = l_Lean_Elab_Term_elabTerm(x_1, x_2, x_7, x_8, x_5, x_6);
 return x_9;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_12__resumeElabTerm(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_Term_13__resumeElabTerm(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 uint8_t x_6; lean_object* x_7; 
@@ -13225,13 +12262,13 @@ x_7 = l_Lean_Elab_Term_elabTerm(x_1, x_2, x_6, x_3, x_4, x_5);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_12__resumeElabTerm___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_Term_13__resumeElabTerm___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 uint8_t x_6; lean_object* x_7; 
 x_6 = lean_unbox(x_3);
 lean_dec(x_3);
-x_7 = l___private_Init_Lean_Elab_Term_12__resumeElabTerm(x_1, x_2, x_6, x_4, x_5);
+x_7 = l___private_Init_Lean_Elab_Term_13__resumeElabTerm(x_1, x_2, x_6, x_4, x_5);
 return x_7;
 }
 }
@@ -16258,7 +15295,7 @@ lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_13__resumePostponed___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_14__resumePostponed___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
@@ -16266,423 +15303,315 @@ x_4 = lean_apply_1(x_1, x_3);
 return x_4;
 }
 }
-lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_13__resumePostponed___spec__1(lean_object* x_1) {
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_14__resumePostponed___spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at___private_Init_Lean_Elab_Term_13__resumePostponed___spec__1___rarg___boxed), 3, 0);
+x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at___private_Init_Lean_Elab_Term_14__resumePostponed___spec__1___rarg___boxed), 3, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_13__resumePostponed___lambda__1(uint8_t 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* _init_l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1() {
 _start:
 {
-lean_object* x_8; lean_object* x_9; uint8_t x_35; 
-x_35 = !lean_is_exclusive(x_6);
-if (x_35 == 0)
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_TermElabM_inhabited___boxed), 2, 1);
+lean_closure_set(x_1, 0, lean_box(0));
+return x_1;
+}
+}
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+_start:
 {
-lean_object* x_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; 
-x_36 = lean_ctor_get(x_6, 8);
-lean_dec(x_36);
-lean_ctor_set(x_6, 8, x_2);
-x_37 = l_Lean_Elab_Term_getMVarDecl(x_3, x_6, x_7);
-x_38 = lean_ctor_get(x_37, 0);
-lean_inc(x_38);
-x_39 = lean_ctor_get(x_37, 1);
+lean_object* x_8; lean_object* x_9; 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; uint8_t 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; 
+x_39 = lean_ctor_get(x_6, 0);
 lean_inc(x_39);
-lean_dec(x_37);
-x_40 = lean_ctor_get(x_38, 2);
+x_40 = lean_ctor_get(x_6, 1);
 lean_inc(x_40);
-lean_dec(x_38);
-lean_inc(x_6);
-x_41 = l_Lean_Elab_Term_instantiateMVars(x_4, x_40, x_6, x_39);
-x_42 = lean_ctor_get(x_41, 0);
+x_41 = lean_ctor_get(x_6, 2);
+lean_inc(x_41);
+x_42 = lean_ctor_get(x_6, 3);
 lean_inc(x_42);
-x_43 = lean_ctor_get(x_41, 1);
+x_43 = lean_ctor_get(x_6, 4);
 lean_inc(x_43);
-lean_dec(x_41);
-x_44 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_44, 0, x_42);
+x_44 = lean_ctor_get(x_6, 5);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_6, 6);
+lean_inc(x_45);
+x_46 = lean_ctor_get(x_6, 7);
+lean_inc(x_46);
+x_47 = lean_ctor_get(x_6, 9);
+lean_inc(x_47);
+x_48 = lean_ctor_get_uint8(x_6, sizeof(void*)*10);
+x_49 = lean_alloc_ctor(0, 10, 1);
+lean_ctor_set(x_49, 0, x_39);
+lean_ctor_set(x_49, 1, x_40);
+lean_ctor_set(x_49, 2, x_41);
+lean_ctor_set(x_49, 3, x_42);
+lean_ctor_set(x_49, 4, x_43);
+lean_ctor_set(x_49, 5, x_44);
+lean_ctor_set(x_49, 6, x_45);
+lean_ctor_set(x_49, 7, x_46);
+lean_ctor_set(x_49, 8, x_2);
+lean_ctor_set(x_49, 9, x_47);
+lean_ctor_set_uint8(x_49, sizeof(void*)*10, x_48);
+x_50 = l_Lean_Elab_Term_getMVarDecl(x_3, x_49, x_7);
+x_51 = lean_ctor_get(x_50, 0);
+lean_inc(x_51);
+x_52 = lean_ctor_get(x_50, 1);
+lean_inc(x_52);
+lean_dec(x_50);
+x_53 = lean_ctor_get(x_51, 2);
+lean_inc(x_53);
+lean_dec(x_51);
+lean_inc(x_49);
+x_54 = l_Lean_Elab_Term_instantiateMVars(x_4, x_53, x_49, x_52);
+x_55 = lean_ctor_get(x_54, 0);
+lean_inc(x_55);
+x_56 = lean_ctor_get(x_54, 1);
+lean_inc(x_56);
+lean_dec(x_54);
+x_57 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_57, 0, x_55);
 if (x_1 == 0)
 {
-uint8_t x_45; uint8_t x_46; lean_object* x_47; 
-x_45 = 0;
-x_46 = 1;
-lean_inc(x_6);
-x_47 = l_Lean_Elab_Term_elabTerm(x_4, x_44, x_45, x_46, x_6, x_43);
-if (lean_obj_tag(x_47) == 0)
-{
-lean_object* x_48; lean_object* x_49; lean_object* x_50; uint8_t x_51; 
-lean_dec(x_5);
-x_48 = lean_ctor_get(x_47, 0);
-lean_inc(x_48);
-x_49 = lean_ctor_get(x_47, 1);
+uint8_t x_58; uint8_t x_59; lean_object* x_60; 
+x_58 = 0;
+x_59 = 1;
 lean_inc(x_49);
-lean_dec(x_47);
-x_50 = l_Lean_Elab_Term_assignExprMVar(x_3, x_48, x_6, x_49);
-lean_dec(x_6);
-x_51 = !lean_is_exclusive(x_50);
-if (x_51 == 0)
-{
-lean_object* x_52; lean_object* x_53; 
-x_52 = lean_ctor_get(x_50, 0);
-lean_dec(x_52);
-x_53 = lean_box(x_46);
-lean_ctor_set(x_50, 0, x_53);
-return x_50;
-}
-else
-{
-lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_54 = lean_ctor_get(x_50, 1);
-lean_inc(x_54);
-lean_dec(x_50);
-x_55 = lean_box(x_46);
-x_56 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_56, 0, x_55);
-lean_ctor_set(x_56, 1, x_54);
-return x_56;
-}
-}
-else
-{
-lean_object* x_57; lean_object* x_58; 
-lean_dec(x_6);
-lean_dec(x_3);
-x_57 = lean_ctor_get(x_47, 0);
-lean_inc(x_57);
-x_58 = lean_ctor_get(x_47, 1);
-lean_inc(x_58);
-lean_dec(x_47);
-x_8 = x_57;
-x_9 = x_58;
-goto block_34;
-}
-}
-else
-{
-uint8_t x_59; lean_object* x_60; 
-x_59 = 0;
-lean_inc(x_6);
-x_60 = l_Lean_Elab_Term_elabTerm(x_4, x_44, x_59, x_59, x_6, x_43);
+x_60 = l_Lean_Elab_Term_elabTerm(x_4, x_57, x_58, x_59, x_49, x_56);
 if (lean_obj_tag(x_60) == 0)
 {
 lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; 
+lean_dec(x_6);
 lean_dec(x_5);
 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 = l_Lean_Elab_Term_assignExprMVar(x_3, x_61, x_6, x_62);
-lean_dec(x_6);
+x_63 = l_Lean_Elab_Term_assignExprMVar(x_3, x_61, x_49, x_62);
+lean_dec(x_49);
 x_64 = !lean_is_exclusive(x_63);
 if (x_64 == 0)
 {
-lean_object* x_65; uint8_t x_66; lean_object* x_67; 
+lean_object* x_65; lean_object* x_66; 
 x_65 = lean_ctor_get(x_63, 0);
 lean_dec(x_65);
-x_66 = 1;
-x_67 = lean_box(x_66);
-lean_ctor_set(x_63, 0, x_67);
+x_66 = lean_box(x_59);
+lean_ctor_set(x_63, 0, x_66);
 return x_63;
 }
 else
 {
-lean_object* x_68; uint8_t x_69; lean_object* x_70; lean_object* x_71; 
-x_68 = lean_ctor_get(x_63, 1);
-lean_inc(x_68);
+lean_object* x_67; lean_object* x_68; lean_object* x_69; 
+x_67 = lean_ctor_get(x_63, 1);
+lean_inc(x_67);
 lean_dec(x_63);
-x_69 = 1;
-x_70 = lean_box(x_69);
-x_71 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_71, 0, x_70);
-lean_ctor_set(x_71, 1, x_68);
-return x_71;
+x_68 = lean_box(x_59);
+x_69 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_69, 0, x_68);
+lean_ctor_set(x_69, 1, x_67);
+return x_69;
 }
 }
 else
 {
-lean_object* x_72; lean_object* x_73; 
-lean_dec(x_6);
+lean_object* x_70; lean_object* x_71; 
+lean_dec(x_49);
 lean_dec(x_3);
-x_72 = lean_ctor_get(x_60, 0);
-lean_inc(x_72);
-x_73 = lean_ctor_get(x_60, 1);
-lean_inc(x_73);
+x_70 = lean_ctor_get(x_60, 0);
+lean_inc(x_70);
+x_71 = lean_ctor_get(x_60, 1);
+lean_inc(x_71);
 lean_dec(x_60);
-x_8 = x_72;
-x_9 = x_73;
-goto block_34;
-}
+x_8 = x_70;
+x_9 = x_71;
+goto block_38;
 }
 }
 else
 {
-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; uint8_t 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; lean_object* x_91; lean_object* x_92; 
-x_74 = lean_ctor_get(x_6, 0);
-x_75 = lean_ctor_get(x_6, 1);
-x_76 = lean_ctor_get(x_6, 2);
-x_77 = lean_ctor_get(x_6, 3);
-x_78 = lean_ctor_get(x_6, 4);
-x_79 = lean_ctor_get(x_6, 5);
-x_80 = lean_ctor_get(x_6, 6);
-x_81 = lean_ctor_get(x_6, 7);
-x_82 = lean_ctor_get(x_6, 9);
-x_83 = lean_ctor_get_uint8(x_6, sizeof(void*)*10);
-lean_inc(x_82);
-lean_inc(x_81);
-lean_inc(x_80);
-lean_inc(x_79);
-lean_inc(x_78);
-lean_inc(x_77);
-lean_inc(x_76);
-lean_inc(x_75);
-lean_inc(x_74);
+uint8_t x_72; lean_object* x_73; 
+x_72 = 0;
+lean_inc(x_49);
+x_73 = l_Lean_Elab_Term_elabTerm(x_4, x_57, x_72, x_72, x_49, x_56);
+if (lean_obj_tag(x_73) == 0)
+{
+lean_object* x_74; lean_object* x_75; lean_object* x_76; uint8_t x_77; 
 lean_dec(x_6);
-x_84 = lean_alloc_ctor(0, 10, 1);
-lean_ctor_set(x_84, 0, x_74);
-lean_ctor_set(x_84, 1, x_75);
-lean_ctor_set(x_84, 2, x_76);
-lean_ctor_set(x_84, 3, x_77);
-lean_ctor_set(x_84, 4, x_78);
-lean_ctor_set(x_84, 5, x_79);
-lean_ctor_set(x_84, 6, x_80);
-lean_ctor_set(x_84, 7, x_81);
-lean_ctor_set(x_84, 8, x_2);
-lean_ctor_set(x_84, 9, x_82);
-lean_ctor_set_uint8(x_84, sizeof(void*)*10, x_83);
-x_85 = l_Lean_Elab_Term_getMVarDecl(x_3, x_84, x_7);
-x_86 = lean_ctor_get(x_85, 0);
+lean_dec(x_5);
+x_74 = lean_ctor_get(x_73, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_73, 1);
+lean_inc(x_75);
+lean_dec(x_73);
+x_76 = l_Lean_Elab_Term_assignExprMVar(x_3, x_74, x_49, x_75);
+lean_dec(x_49);
+x_77 = !lean_is_exclusive(x_76);
+if (x_77 == 0)
+{
+lean_object* x_78; uint8_t x_79; lean_object* x_80; 
+x_78 = lean_ctor_get(x_76, 0);
+lean_dec(x_78);
+x_79 = 1;
+x_80 = lean_box(x_79);
+lean_ctor_set(x_76, 0, x_80);
+return x_76;
+}
+else
+{
+lean_object* x_81; uint8_t x_82; lean_object* x_83; lean_object* x_84; 
+x_81 = lean_ctor_get(x_76, 1);
+lean_inc(x_81);
+lean_dec(x_76);
+x_82 = 1;
+x_83 = lean_box(x_82);
+x_84 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_84, 0, x_83);
+lean_ctor_set(x_84, 1, x_81);
+return x_84;
+}
+}
+else
+{
+lean_object* x_85; lean_object* x_86; 
+lean_dec(x_49);
+lean_dec(x_3);
+x_85 = lean_ctor_get(x_73, 0);
+lean_inc(x_85);
+x_86 = lean_ctor_get(x_73, 1);
 lean_inc(x_86);
-x_87 = lean_ctor_get(x_85, 1);
-lean_inc(x_87);
-lean_dec(x_85);
-x_88 = lean_ctor_get(x_86, 2);
-lean_inc(x_88);
-lean_dec(x_86);
-lean_inc(x_84);
-x_89 = l_Lean_Elab_Term_instantiateMVars(x_4, x_88, x_84, x_87);
-x_90 = lean_ctor_get(x_89, 0);
-lean_inc(x_90);
-x_91 = lean_ctor_get(x_89, 1);
-lean_inc(x_91);
-lean_dec(x_89);
-x_92 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_92, 0, x_90);
-if (x_1 == 0)
-{
-uint8_t x_93; uint8_t x_94; lean_object* x_95; 
-x_93 = 0;
-x_94 = 1;
-lean_inc(x_84);
-x_95 = l_Lean_Elab_Term_elabTerm(x_4, x_92, x_93, x_94, x_84, x_91);
-if (lean_obj_tag(x_95) == 0)
-{
-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_dec(x_5);
-x_96 = lean_ctor_get(x_95, 0);
-lean_inc(x_96);
-x_97 = lean_ctor_get(x_95, 1);
-lean_inc(x_97);
-lean_dec(x_95);
-x_98 = l_Lean_Elab_Term_assignExprMVar(x_3, x_96, x_84, x_97);
-lean_dec(x_84);
-x_99 = lean_ctor_get(x_98, 1);
-lean_inc(x_99);
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- x_100 = x_98;
-} else {
- lean_dec_ref(x_98);
- x_100 = lean_box(0);
-}
-x_101 = lean_box(x_94);
-if (lean_is_scalar(x_100)) {
- x_102 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_102 = x_100;
-}
-lean_ctor_set(x_102, 0, x_101);
-lean_ctor_set(x_102, 1, x_99);
-return x_102;
-}
-else
-{
-lean_object* x_103; lean_object* x_104; 
-lean_dec(x_84);
-lean_dec(x_3);
-x_103 = lean_ctor_get(x_95, 0);
-lean_inc(x_103);
-x_104 = lean_ctor_get(x_95, 1);
-lean_inc(x_104);
-lean_dec(x_95);
-x_8 = x_103;
-x_9 = x_104;
-goto block_34;
+lean_dec(x_73);
+x_8 = x_85;
+x_9 = x_86;
+goto block_38;
 }
 }
-else
-{
-uint8_t x_105; lean_object* x_106; 
-x_105 = 0;
-lean_inc(x_84);
-x_106 = l_Lean_Elab_Term_elabTerm(x_4, x_92, x_105, x_105, x_84, x_91);
-if (lean_obj_tag(x_106) == 0)
-{
-lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; uint8_t x_112; lean_object* x_113; lean_object* x_114; 
-lean_dec(x_5);
-x_107 = lean_ctor_get(x_106, 0);
-lean_inc(x_107);
-x_108 = lean_ctor_get(x_106, 1);
-lean_inc(x_108);
-lean_dec(x_106);
-x_109 = l_Lean_Elab_Term_assignExprMVar(x_3, x_107, x_84, x_108);
-lean_dec(x_84);
-x_110 = lean_ctor_get(x_109, 1);
-lean_inc(x_110);
-if (lean_is_exclusive(x_109)) {
- lean_ctor_release(x_109, 0);
- lean_ctor_release(x_109, 1);
- x_111 = x_109;
-} else {
- lean_dec_ref(x_109);
- x_111 = lean_box(0);
-}
-x_112 = 1;
-x_113 = lean_box(x_112);
-if (lean_is_scalar(x_111)) {
- x_114 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_114 = x_111;
-}
-lean_ctor_set(x_114, 0, x_113);
-lean_ctor_set(x_114, 1, x_110);
-return x_114;
-}
-else
-{
-lean_object* x_115; lean_object* x_116; 
-lean_dec(x_84);
-lean_dec(x_3);
-x_115 = lean_ctor_get(x_106, 0);
-lean_inc(x_115);
-x_116 = lean_ctor_get(x_106, 1);
-lean_inc(x_116);
-lean_dec(x_106);
-x_8 = x_115;
-x_9 = x_116;
-goto block_34;
-}
-}
-}
-block_34:
+block_38:
 {
 if (lean_obj_tag(x_8) == 0)
 {
-if (x_1 == 0)
-{
-lean_object* x_10; uint8_t x_11; 
-lean_dec(x_5);
+lean_object* x_10; 
 x_10 = lean_ctor_get(x_8, 0);
 lean_inc(x_10);
 lean_dec(x_8);
-x_11 = !lean_is_exclusive(x_9);
-if (x_11 == 0)
+if (lean_obj_tag(x_10) == 0)
 {
-lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; lean_object* x_16; 
-x_12 = lean_ctor_get(x_9, 2);
-x_13 = l_PersistentArray_push___rarg(x_12, x_10);
-lean_ctor_set(x_9, 2, x_13);
-x_14 = 1;
-x_15 = lean_box(x_14);
-x_16 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_9);
-return x_16;
+lean_dec(x_6);
+if (x_1 == 0)
+{
+lean_object* x_11; uint8_t x_12; 
+lean_dec(x_5);
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = !lean_is_exclusive(x_9);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; uint8_t x_15; lean_object* x_16; lean_object* x_17; 
+x_13 = lean_ctor_get(x_9, 2);
+x_14 = l_PersistentArray_push___rarg(x_13, x_11);
+lean_ctor_set(x_9, 2, x_14);
+x_15 = 1;
+x_16 = lean_box(x_15);
+x_17 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_17, 0, x_16);
+lean_ctor_set(x_17, 1, x_9);
+return x_17;
 }
 else
 {
-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; uint8_t x_25; lean_object* x_26; lean_object* x_27; 
-x_17 = lean_ctor_get(x_9, 0);
-x_18 = lean_ctor_get(x_9, 1);
-x_19 = lean_ctor_get(x_9, 2);
-x_20 = lean_ctor_get(x_9, 3);
-x_21 = lean_ctor_get(x_9, 4);
-x_22 = lean_ctor_get(x_9, 5);
+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; uint8_t x_26; lean_object* x_27; lean_object* x_28; 
+x_18 = lean_ctor_get(x_9, 0);
+x_19 = lean_ctor_get(x_9, 1);
+x_20 = lean_ctor_get(x_9, 2);
+x_21 = lean_ctor_get(x_9, 3);
+x_22 = lean_ctor_get(x_9, 4);
+x_23 = lean_ctor_get(x_9, 5);
+lean_inc(x_23);
 lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
-lean_inc(x_17);
 lean_dec(x_9);
-x_23 = l_PersistentArray_push___rarg(x_19, x_10);
-x_24 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_24, 0, x_17);
-lean_ctor_set(x_24, 1, x_18);
-lean_ctor_set(x_24, 2, x_23);
-lean_ctor_set(x_24, 3, x_20);
-lean_ctor_set(x_24, 4, x_21);
-lean_ctor_set(x_24, 5, x_22);
-x_25 = 1;
-x_26 = lean_box(x_25);
-x_27 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_27, 0, x_26);
-lean_ctor_set(x_27, 1, x_24);
-return x_27;
+x_24 = l_PersistentArray_push___rarg(x_20, x_11);
+x_25 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_25, 0, x_18);
+lean_ctor_set(x_25, 1, x_19);
+lean_ctor_set(x_25, 2, x_24);
+lean_ctor_set(x_25, 3, x_21);
+lean_ctor_set(x_25, 4, x_22);
+lean_ctor_set(x_25, 5, x_23);
+x_26 = 1;
+x_27 = lean_box(x_26);
+x_28 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_28, 0, x_27);
+lean_ctor_set(x_28, 1, x_25);
+return x_28;
 }
 }
 else
 {
-uint8_t x_28; lean_object* x_29; lean_object* x_30; 
+uint8_t x_29; lean_object* x_30; lean_object* x_31; 
+lean_dec(x_10);
 lean_dec(x_9);
-lean_dec(x_8);
-x_28 = 0;
-x_29 = lean_box(x_28);
-x_30 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_30, 0, x_29);
-lean_ctor_set(x_30, 1, x_5);
-return x_30;
+x_29 = 0;
+x_30 = lean_box(x_29);
+x_31 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_31, 0, x_30);
+lean_ctor_set(x_31, 1, x_5);
+return x_31;
 }
 }
 else
 {
-uint8_t x_31; lean_object* x_32; lean_object* x_33; 
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
 lean_dec(x_5);
-x_31 = 0;
-x_32 = lean_box(x_31);
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_32);
-lean_ctor_set(x_33, 1, x_9);
-return x_33;
+x_32 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
+x_33 = l_unreachable_x21___rarg(x_32);
+x_34 = lean_apply_2(x_33, x_6, x_9);
+return x_34;
+}
+}
+else
+{
+uint8_t x_35; lean_object* x_36; lean_object* x_37; 
+lean_dec(x_6);
+lean_dec(x_5);
+x_35 = 0;
+x_36 = lean_box(x_35);
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_9);
+return x_37;
 }
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_13__resumePostponed___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_14__resumePostponed___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_EStateM_MonadState___closed__2;
-x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at___private_Init_Lean_Elab_Term_13__resumePostponed___spec__1___rarg___boxed), 3, 1);
+x_2 = lean_alloc_closure((void*)(l_ReaderT_lift___at___private_Init_Lean_Elab_Term_14__resumePostponed___spec__1___rarg___boxed), 3, 1);
 lean_closure_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_13__resumePostponed(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
 x_7 = lean_box(x_4);
 lean_inc(x_3);
-x_8 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_Term_13__resumePostponed___lambda__1___boxed), 7, 4);
+x_8 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___boxed), 7, 4);
 lean_closure_set(x_8, 0, x_7);
 lean_closure_set(x_8, 1, x_1);
 lean_closure_set(x_8, 2, x_3);
 lean_closure_set(x_8, 3, x_2);
-x_9 = l___private_Init_Lean_Elab_Term_13__resumePostponed___closed__1;
+x_9 = l___private_Init_Lean_Elab_Term_14__resumePostponed___closed__1;
 x_10 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Term_TermElabM_MonadLog___spec__2___rarg), 4, 2);
 lean_closure_set(x_10, 0, x_9);
 lean_closure_set(x_10, 1, x_8);
@@ -16691,32 +15620,32 @@ lean_dec(x_3);
 return x_11;
 }
 }
-lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_13__resumePostponed___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_ReaderT_lift___at___private_Init_Lean_Elab_Term_14__resumePostponed___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_ReaderT_lift___at___private_Init_Lean_Elab_Term_13__resumePostponed___spec__1___rarg(x_1, x_2, x_3);
+x_4 = l_ReaderT_lift___at___private_Init_Lean_Elab_Term_14__resumePostponed___spec__1___rarg(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_13__resumePostponed___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 uint8_t x_8; lean_object* x_9; 
 x_8 = lean_unbox(x_1);
 lean_dec(x_1);
-x_9 = l___private_Init_Lean_Elab_Term_13__resumePostponed___lambda__1(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
+x_9 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1(x_8, x_2, x_3, x_4, x_5, x_6, x_7);
 return x_9;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_13__resumePostponed___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 uint8_t x_7; lean_object* x_8; 
 x_7 = lean_unbox(x_4);
 lean_dec(x_4);
-x_8 = l___private_Init_Lean_Elab_Term_13__resumePostponed(x_1, x_2, x_3, x_7, x_5, x_6);
+x_8 = l___private_Init_Lean_Elab_Term_14__resumePostponed(x_1, x_2, x_3, x_7, x_5, x_6);
 return x_8;
 }
 }
@@ -17135,16 +16064,7 @@ return x_83;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1() {
-_start:
-{
-lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_TermElabM_inhabited___boxed), 2, 1);
-lean_closure_set(x_1, 0, lean_box(0));
-return x_1;
-}
-}
-lean_object* l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_15__synthesizePendingInstMVar___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
@@ -17162,136 +16082,154 @@ x_6 = lean_ctor_get(x_5, 0);
 lean_inc(x_6);
 if (lean_obj_tag(x_6) == 0)
 {
-uint8_t x_7; 
-lean_dec(x_3);
-x_7 = !lean_is_exclusive(x_5);
-if (x_7 == 0)
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = lean_ctor_get(x_5, 1);
-x_9 = lean_ctor_get(x_5, 0);
-lean_dec(x_9);
-x_10 = lean_ctor_get(x_6, 0);
-lean_inc(x_10);
+lean_object* x_7; 
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
 lean_dec(x_6);
-x_11 = !lean_is_exclusive(x_8);
-if (x_11 == 0)
+if (lean_obj_tag(x_7) == 0)
 {
-lean_object* x_12; lean_object* x_13; uint8_t x_14; lean_object* x_15; 
-x_12 = lean_ctor_get(x_8, 2);
-x_13 = l_PersistentArray_push___rarg(x_12, x_10);
-lean_ctor_set(x_8, 2, x_13);
-x_14 = 1;
-x_15 = lean_box(x_14);
+uint8_t x_8; 
+lean_dec(x_3);
+x_8 = !lean_is_exclusive(x_5);
+if (x_8 == 0)
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
+x_9 = lean_ctor_get(x_5, 1);
+x_10 = lean_ctor_get(x_5, 0);
+lean_dec(x_10);
+x_11 = lean_ctor_get(x_7, 0);
+lean_inc(x_11);
+lean_dec(x_7);
+x_12 = !lean_is_exclusive(x_9);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; uint8_t x_15; lean_object* x_16; 
+x_13 = lean_ctor_get(x_9, 2);
+x_14 = l_PersistentArray_push___rarg(x_13, x_11);
+lean_ctor_set(x_9, 2, x_14);
+x_15 = 1;
+x_16 = lean_box(x_15);
 lean_ctor_set_tag(x_5, 0);
-lean_ctor_set(x_5, 0, x_15);
+lean_ctor_set(x_5, 0, x_16);
 return x_5;
 }
 else
 {
-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; uint8_t x_24; lean_object* x_25; 
-x_16 = lean_ctor_get(x_8, 0);
-x_17 = lean_ctor_get(x_8, 1);
-x_18 = lean_ctor_get(x_8, 2);
-x_19 = lean_ctor_get(x_8, 3);
-x_20 = lean_ctor_get(x_8, 4);
-x_21 = lean_ctor_get(x_8, 5);
+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; uint8_t x_25; lean_object* x_26; 
+x_17 = lean_ctor_get(x_9, 0);
+x_18 = lean_ctor_get(x_9, 1);
+x_19 = lean_ctor_get(x_9, 2);
+x_20 = lean_ctor_get(x_9, 3);
+x_21 = lean_ctor_get(x_9, 4);
+x_22 = lean_ctor_get(x_9, 5);
+lean_inc(x_22);
 lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
 lean_inc(x_17);
-lean_inc(x_16);
-lean_dec(x_8);
-x_22 = l_PersistentArray_push___rarg(x_18, x_10);
-x_23 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_23, 0, x_16);
-lean_ctor_set(x_23, 1, x_17);
-lean_ctor_set(x_23, 2, x_22);
-lean_ctor_set(x_23, 3, x_19);
-lean_ctor_set(x_23, 4, x_20);
-lean_ctor_set(x_23, 5, x_21);
-x_24 = 1;
-x_25 = lean_box(x_24);
+lean_dec(x_9);
+x_23 = l_PersistentArray_push___rarg(x_19, x_11);
+x_24 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_24, 0, x_17);
+lean_ctor_set(x_24, 1, x_18);
+lean_ctor_set(x_24, 2, x_23);
+lean_ctor_set(x_24, 3, x_20);
+lean_ctor_set(x_24, 4, x_21);
+lean_ctor_set(x_24, 5, x_22);
+x_25 = 1;
+x_26 = lean_box(x_25);
 lean_ctor_set_tag(x_5, 0);
-lean_ctor_set(x_5, 1, x_23);
-lean_ctor_set(x_5, 0, x_25);
+lean_ctor_set(x_5, 1, x_24);
+lean_ctor_set(x_5, 0, x_26);
 return x_5;
 }
 }
 else
 {
-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; uint8_t x_37; lean_object* x_38; lean_object* x_39; 
-x_26 = lean_ctor_get(x_5, 1);
-lean_inc(x_26);
-lean_dec(x_5);
-x_27 = lean_ctor_get(x_6, 0);
+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; lean_object* x_39; lean_object* x_40; 
+x_27 = lean_ctor_get(x_5, 1);
 lean_inc(x_27);
-lean_dec(x_6);
-x_28 = lean_ctor_get(x_26, 0);
+lean_dec(x_5);
+x_28 = lean_ctor_get(x_7, 0);
 lean_inc(x_28);
-x_29 = lean_ctor_get(x_26, 1);
+lean_dec(x_7);
+x_29 = lean_ctor_get(x_27, 0);
 lean_inc(x_29);
-x_30 = lean_ctor_get(x_26, 2);
+x_30 = lean_ctor_get(x_27, 1);
 lean_inc(x_30);
-x_31 = lean_ctor_get(x_26, 3);
+x_31 = lean_ctor_get(x_27, 2);
 lean_inc(x_31);
-x_32 = lean_ctor_get(x_26, 4);
+x_32 = lean_ctor_get(x_27, 3);
 lean_inc(x_32);
-x_33 = lean_ctor_get(x_26, 5);
+x_33 = lean_ctor_get(x_27, 4);
 lean_inc(x_33);
-if (lean_is_exclusive(x_26)) {
- lean_ctor_release(x_26, 0);
- lean_ctor_release(x_26, 1);
- lean_ctor_release(x_26, 2);
- lean_ctor_release(x_26, 3);
- lean_ctor_release(x_26, 4);
- lean_ctor_release(x_26, 5);
- x_34 = x_26;
+x_34 = lean_ctor_get(x_27, 5);
+lean_inc(x_34);
+if (lean_is_exclusive(x_27)) {
+ lean_ctor_release(x_27, 0);
+ lean_ctor_release(x_27, 1);
+ lean_ctor_release(x_27, 2);
+ lean_ctor_release(x_27, 3);
+ lean_ctor_release(x_27, 4);
+ lean_ctor_release(x_27, 5);
+ x_35 = x_27;
 } else {
- lean_dec_ref(x_26);
- x_34 = lean_box(0);
+ lean_dec_ref(x_27);
+ x_35 = lean_box(0);
 }
-x_35 = l_PersistentArray_push___rarg(x_30, x_27);
-if (lean_is_scalar(x_34)) {
- x_36 = lean_alloc_ctor(0, 6, 0);
+x_36 = l_PersistentArray_push___rarg(x_31, x_28);
+if (lean_is_scalar(x_35)) {
+ x_37 = lean_alloc_ctor(0, 6, 0);
 } else {
- x_36 = x_34;
+ x_37 = x_35;
 }
-lean_ctor_set(x_36, 0, x_28);
-lean_ctor_set(x_36, 1, x_29);
-lean_ctor_set(x_36, 2, x_35);
-lean_ctor_set(x_36, 3, x_31);
-lean_ctor_set(x_36, 4, x_32);
-lean_ctor_set(x_36, 5, x_33);
-x_37 = 1;
-x_38 = lean_box(x_37);
-x_39 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_39, 0, x_38);
-lean_ctor_set(x_39, 1, x_36);
-return x_39;
+lean_ctor_set(x_37, 0, x_29);
+lean_ctor_set(x_37, 1, x_30);
+lean_ctor_set(x_37, 2, x_36);
+lean_ctor_set(x_37, 3, x_32);
+lean_ctor_set(x_37, 4, x_33);
+lean_ctor_set(x_37, 5, x_34);
+x_38 = 1;
+x_39 = lean_box(x_38);
+x_40 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_40, 0, x_39);
+lean_ctor_set(x_40, 1, x_37);
+return x_40;
 }
 }
 else
 {
-lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_40 = lean_ctor_get(x_5, 1);
-lean_inc(x_40);
+lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_41 = lean_ctor_get(x_5, 1);
+lean_inc(x_41);
 lean_dec(x_5);
-x_41 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
-x_42 = l_unreachable_x21___rarg(x_41);
-x_43 = lean_apply_2(x_42, x_3, x_40);
-return x_43;
+x_42 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
+x_43 = l_unreachable_x21___rarg(x_42);
+x_44 = lean_apply_2(x_43, x_3, x_41);
+return x_44;
+}
+}
+else
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_45 = lean_ctor_get(x_5, 1);
+lean_inc(x_45);
+lean_dec(x_5);
+x_46 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
+x_47 = l_unreachable_x21___rarg(x_46);
+x_48 = lean_apply_2(x_47, x_3, x_45);
+return x_48;
 }
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_15__synthesizePendingInstMVar(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; 
 lean_inc(x_2);
-x_5 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1), 4, 2);
+x_5 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_Term_15__synthesizePendingInstMVar___lambda__1), 4, 2);
 lean_closure_set(x_5, 0, x_1);
 lean_closure_set(x_5, 1, x_2);
 x_6 = l_Lean_Elab_Term_withMVarContext___rarg(x_2, x_5, x_3, x_4);
@@ -17299,7 +16237,7 @@ lean_dec(x_2);
 return x_6;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_15__checkWithDefault(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_16__checkWithDefault(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; uint8_t x_7; 
@@ -17366,16 +16304,16 @@ return x_24;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_15__checkWithDefault___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_16__checkWithDefault___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l___private_Init_Lean_Elab_Term_15__checkWithDefault(x_1, x_2, x_3, x_4);
+x_5 = l___private_Init_Lean_Elab_Term_16__checkWithDefault(x_1, x_2, x_3, x_4);
 lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -17383,27 +16321,27 @@ x_1 = lean_mk_string("not implemented yet");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__1;
+x_1 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__2;
+x_1 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
@@ -17418,7 +16356,7 @@ lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 0);
 lean_inc(x_7);
 lean_dec(x_1);
-x_8 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar(x_6, x_7, x_3, x_4);
+x_8 = l___private_Init_Lean_Elab_Term_15__synthesizePendingInstMVar(x_6, x_7, x_3, x_4);
 return x_8;
 }
 case 1:
@@ -17428,7 +16366,7 @@ lean_dec(x_1);
 x_9 = lean_ctor_get(x_5, 0);
 lean_inc(x_9);
 lean_dec(x_5);
-x_10 = l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3;
+x_10 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3;
 x_11 = l_Lean_Elab_Term_throwError___rarg(x_9, x_10, x_3, x_4);
 return x_11;
 }
@@ -17443,7 +16381,7 @@ lean_inc(x_13);
 x_14 = lean_ctor_get(x_1, 0);
 lean_inc(x_14);
 lean_dec(x_1);
-x_15 = l___private_Init_Lean_Elab_Term_13__resumePostponed(x_12, x_13, x_14, x_2, x_3, x_4);
+x_15 = l___private_Init_Lean_Elab_Term_14__resumePostponed(x_12, x_13, x_14, x_2, x_3, x_4);
 return x_15;
 }
 default: 
@@ -17455,24 +16393,24 @@ lean_inc(x_16);
 x_17 = lean_ctor_get(x_1, 0);
 lean_inc(x_17);
 lean_dec(x_1);
-x_18 = l___private_Init_Lean_Elab_Term_15__checkWithDefault(x_16, x_17, x_3, x_4);
+x_18 = l___private_Init_Lean_Elab_Term_16__checkWithDefault(x_16, x_17, x_3, x_4);
 lean_dec(x_16);
 return x_18;
 }
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; lean_object* x_6; 
 x_5 = lean_unbox(x_2);
 lean_dec(x_2);
-x_6 = l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar(x_1, x_5, x_3, x_4);
+x_6 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar(x_1, x_5, x_3, x_4);
 return x_6;
 }
 }
-lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__1(lean_object* x_1) {
+lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
@@ -17481,7 +16419,7 @@ lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__1() {
+lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -17489,27 +16427,27 @@ x_1 = lean_mk_string("not ready yet");
 return x_1;
 }
 }
-lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__2() {
+lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__1;
+x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__3() {
+lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__2;
+x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__4() {
+lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -17517,27 +16455,27 @@ x_1 = lean_mk_string("succeeded");
 return x_1;
 }
 }
-lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__5() {
+lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__4;
+x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__4;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__6() {
+lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__5;
+x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__5;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__7() {
+lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -17545,27 +16483,27 @@ x_1 = lean_mk_string("resuming ?");
 return x_1;
 }
 }
-lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__8() {
+lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__7;
+x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__7;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__9() {
+lean_object* _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__8;
+x_1 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__8;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 if (lean_obj_tag(x_3) == 0)
@@ -17620,7 +16558,7 @@ else
 lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
 x_50 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_50, 0, x_19);
-x_51 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__9;
+x_51 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__9;
 x_52 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_52, 0, x_51);
 lean_ctor_set(x_52, 1, x_50);
@@ -17663,7 +16601,7 @@ block_45:
 lean_object* x_22; 
 lean_inc(x_5);
 lean_inc(x_8);
-x_22 = l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar(x_8, x_1, x_5, x_21);
+x_22 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar(x_8, x_1, x_5, x_21);
 if (lean_obj_tag(x_22) == 0)
 {
 lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; uint8_t x_28; 
@@ -17713,7 +16651,7 @@ lean_dec(x_23);
 if (x_32 == 0)
 {
 lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; 
-x_33 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__3;
+x_33 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__3;
 x_34 = l_Lean_Elab_Term_logTrace(x_18, x_20, x_33, x_5, x_27);
 lean_dec(x_20);
 x_35 = lean_ctor_get(x_34, 1);
@@ -17727,7 +16665,7 @@ goto block_16;
 else
 {
 lean_object* x_37; lean_object* x_38; lean_object* x_39; uint8_t x_40; 
-x_37 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__6;
+x_37 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__6;
 x_38 = l_Lean_Elab_Term_logTrace(x_18, x_20, x_37, x_5, x_27);
 lean_dec(x_20);
 x_39 = lean_ctor_get(x_38, 1);
@@ -17774,7 +16712,7 @@ return x_44;
 }
 }
 }
-lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__3(uint8_t x_1) {
+lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__3(uint8_t x_1) {
 _start:
 {
 if (x_1 == 0)
@@ -17791,7 +16729,7 @@ return x_3;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -17799,17 +16737,17 @@ x_1 = lean_mk_string("resuming");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__2;
-x_2 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__1;
+x_2 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__3() {
 _start:
 {
 lean_object* x_1; 
@@ -17817,27 +16755,27 @@ x_1 = lean_mk_string("resuming synthetic metavariables, mayPostpone: ");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__4() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__3;
+x_1 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__3;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__5() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__4;
+x_1 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__4;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__6() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__6() {
 _start:
 {
 lean_object* x_1; 
@@ -17845,27 +16783,27 @@ x_1 = lean_mk_string(", postponeOnError: ");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__7() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__6;
+x_1 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__6;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__8() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__7;
+x_1 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__7;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__9() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -17875,7 +16813,7 @@ lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__10() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -17885,7 +16823,7 @@ lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep(uint8_t x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep(uint8_t x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; uint8_t x_105; 
@@ -17895,7 +16833,7 @@ lean_inc(x_102);
 x_103 = lean_ctor_get(x_101, 1);
 lean_inc(x_103);
 lean_dec(x_101);
-x_104 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__2;
+x_104 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__2;
 x_105 = l_Lean_checkTraceOption(x_102, x_104);
 lean_dec(x_102);
 if (x_105 == 0)
@@ -17907,21 +16845,21 @@ else
 {
 uint8_t x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; 
 x_106 = lean_ctor_get_uint8(x_2, sizeof(void*)*10);
-x_107 = l_Lean_fmt___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__3(x_106);
+x_107 = l_Lean_fmt___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__3(x_106);
 x_108 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_108, 0, x_107);
-x_109 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__5;
+x_109 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__5;
 x_110 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_110, 0, x_109);
 lean_ctor_set(x_110, 1, x_108);
-x_111 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__8;
+x_111 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__8;
 x_112 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_112, 0, x_110);
 lean_ctor_set(x_112, 1, x_111);
 if (x_1 == 0)
 {
 lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; 
-x_113 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__9;
+x_113 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__9;
 x_114 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_114, 0, x_112);
 lean_ctor_set(x_114, 1, x_113);
@@ -17936,7 +16874,7 @@ goto block_100;
 else
 {
 lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; 
-x_118 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__10;
+x_118 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__10;
 x_119 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_119, 0, x_112);
 lean_ctor_set(x_119, 1, x_118);
@@ -17963,7 +16901,7 @@ x_9 = lean_box(0);
 lean_ctor_set(x_4, 1, x_9);
 x_10 = l_List_reverse___rarg(x_6);
 x_11 = l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__2;
-x_12 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2(x_1, x_11, x_10, x_9, x_2, x_4);
+x_12 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2(x_1, x_11, x_10, x_9, x_2, x_4);
 if (lean_obj_tag(x_12) == 0)
 {
 uint8_t x_13; 
@@ -18178,7 +17116,7 @@ lean_ctor_set(x_72, 4, x_67);
 lean_ctor_set(x_72, 5, x_68);
 x_73 = l_List_reverse___rarg(x_64);
 x_74 = l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__2;
-x_75 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2(x_1, x_74, x_73, x_71, x_2, x_72);
+x_75 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2(x_1, x_74, x_73, x_71, x_2, x_72);
 if (lean_obj_tag(x_75) == 0)
 {
 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; uint8_t x_89; 
@@ -18294,33 +17232,33 @@ return x_99;
 }
 }
 }
-lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 uint8_t x_7; lean_object* x_8; 
 x_7 = lean_unbox(x_1);
 lean_dec(x_1);
-x_8 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2(x_7, x_2, x_3, x_4, x_5, x_6);
+x_8 = l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2(x_7, x_2, x_3, x_4, x_5, x_6);
 return x_8;
 }
 }
-lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__3___boxed(lean_object* x_1) {
+lean_object* l_Lean_fmt___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__3___boxed(lean_object* x_1) {
 _start:
 {
 uint8_t x_2; lean_object* x_3; 
 x_2 = lean_unbox(x_1);
 lean_dec(x_1);
-x_3 = l_Lean_fmt___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__3(x_2);
+x_3 = l_Lean_fmt___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__3(x_2);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; lean_object* x_5; 
 x_4 = lean_unbox(x_1);
 lean_dec(x_1);
-x_5 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep(x_4, x_2, x_3);
+x_5 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep(x_4, x_2, x_3);
 return x_5;
 }
 }
@@ -18906,7 +17844,7 @@ return x_53;
 }
 }
 }
-lean_object* _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1() {
+lean_object* _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -18914,27 +17852,27 @@ x_1 = lean_mk_string("failed to create type class instance for ");
 return x_1;
 }
 }
-lean_object* _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2() {
+lean_object* _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1;
+x_1 = l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3() {
+lean_object* _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2;
+x_1 = l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; 
@@ -18944,7 +17882,7 @@ lean_inc(x_6);
 x_7 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_7, 0, x_6);
 x_8 = l_Lean_indentExpr(x_7);
-x_9 = l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3;
+x_9 = l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3;
 x_10 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_10, 0, x_9);
 lean_ctor_set(x_10, 1, x_8);
@@ -18953,7 +17891,7 @@ x_12 = l_Lean_Elab_log___at_Lean_Elab_Term_logTrace___spec__1(x_5, x_11, x_10, x
 return x_12;
 }
 }
-lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -18984,7 +17922,7 @@ lean_inc(x_9);
 lean_inc(x_9);
 x_10 = lean_alloc_closure((void*)(l_Lean_Elab_Term_getMVarDecl___boxed), 3, 1);
 lean_closure_set(x_10, 0, x_9);
-x_11 = lean_alloc_closure((void*)(l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___boxed), 4, 1);
+x_11 = lean_alloc_closure((void*)(l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___boxed), 4, 1);
 lean_closure_set(x_11, 0, x_6);
 x_12 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Elab_Term_TermElabM_MonadLog___spec__2___rarg), 4, 2);
 lean_closure_set(x_12, 0, x_10);
@@ -19035,7 +17973,7 @@ lean_dec(x_6);
 x_20 = lean_ctor_get(x_1, 1);
 lean_inc(x_20);
 lean_dec(x_1);
-x_21 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_21 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_22 = l_unreachable_x21___rarg(x_21);
 lean_inc(x_2);
 x_23 = lean_apply_2(x_22, x_2, x_3);
@@ -19077,28 +18015,28 @@ return x_29;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; 
 x_3 = lean_ctor_get(x_2, 1);
 lean_inc(x_3);
-x_4 = l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1(x_3, x_1, x_2);
+x_4 = l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1(x_3, x_1, x_2);
 return x_4;
 }
 }
-lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1(x_1, x_2, x_3, x_4);
+x_5 = l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_5;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; uint8_t x_6; 
@@ -19112,7 +18050,7 @@ if (x_6 == 0)
 uint8_t x_7; lean_object* x_8; 
 x_7 = 0;
 lean_inc(x_3);
-x_8 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep(x_7, x_3, x_4);
+x_8 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep(x_7, x_3, x_4);
 if (lean_obj_tag(x_8) == 0)
 {
 lean_object* x_9; uint8_t x_10; 
@@ -19177,7 +18115,7 @@ lean_ctor_set(x_26, 9, x_25);
 lean_ctor_set_uint8(x_26, sizeof(void*)*10, x_7);
 x_27 = 1;
 lean_inc(x_26);
-x_28 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep(x_27, x_26, x_15);
+x_28 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep(x_27, x_26, x_15);
 if (lean_obj_tag(x_28) == 0)
 {
 lean_object* x_29; uint8_t x_30; 
@@ -19191,7 +18129,7 @@ lean_object* x_31; lean_object* x_32;
 x_31 = lean_ctor_get(x_28, 1);
 lean_inc(x_31);
 lean_dec(x_28);
-x_32 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep(x_7, x_26, x_31);
+x_32 = l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep(x_7, x_26, x_31);
 if (lean_obj_tag(x_32) == 0)
 {
 lean_object* x_33; uint8_t x_34; 
@@ -19205,7 +18143,7 @@ lean_object* x_35; lean_object* x_36;
 x_35 = lean_ctor_get(x_32, 1);
 lean_inc(x_35);
 lean_dec(x_32);
-x_36 = l___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars(x_3, x_35);
+x_36 = l___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars(x_3, x_35);
 return x_36;
 }
 else
@@ -19394,31 +18332,31 @@ return x_72;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; lean_object* x_6; 
 x_5 = lean_unbox(x_1);
 lean_dec(x_1);
-x_6 = l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(x_5, x_2, x_3, x_4);
+x_6 = l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(x_5, x_2, x_3, x_4);
 return x_6;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(x_1, x_2, x_3, x_4);
+x_5 = l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(x_1, x_2, x_3, x_4);
 return x_5;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 uint8_t x_5; lean_object* x_6; 
 x_5 = lean_unbox(x_1);
 lean_dec(x_1);
-x_6 = l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux(x_5, x_2, x_3, x_4);
+x_6 = l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux(x_5, x_2, x_3, x_4);
 return x_6;
 }
 }
@@ -19427,7 +18365,7 @@ _start:
 {
 lean_object* x_4; lean_object* x_5; 
 x_4 = lean_box(0);
-x_5 = l___private_Init_Lean_Elab_Term_19__synthesizeSyntheticMVarsAux___main(x_1, x_4, x_2, x_3);
+x_5 = l___private_Init_Lean_Elab_Term_20__synthesizeSyntheticMVarsAux___main(x_1, x_4, x_2, x_3);
 return x_5;
 }
 }
@@ -19441,6 +18379,218 @@ x_5 = l_Lean_Elab_Term_synthesizeSyntheticMVars(x_4, x_2, x_3);
 return x_5;
 }
 }
+lean_object* l_Lean_Elab_Term_tryEnsureHasType_x3f(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+lean_object* x_7; lean_object* x_8; 
+lean_dec(x_5);
+lean_dec(x_3);
+x_7 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_7, 0, x_4);
+x_8 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_8, 0, x_7);
+lean_ctor_set(x_8, 1, x_6);
+return x_8;
+}
+else
+{
+uint8_t x_9; 
+x_9 = !lean_is_exclusive(x_2);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; 
+x_10 = lean_ctor_get(x_2, 0);
+x_11 = l_Lean_Elab_Term_isDefEq(x_1, x_3, x_10, x_5, x_6);
+if (lean_obj_tag(x_11) == 0)
+{
+lean_object* x_12; uint8_t x_13; 
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
+x_13 = lean_unbox(x_12);
+lean_dec(x_12);
+if (x_13 == 0)
+{
+uint8_t x_14; 
+lean_free_object(x_2);
+lean_dec(x_4);
+x_14 = !lean_is_exclusive(x_11);
+if (x_14 == 0)
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_ctor_get(x_11, 0);
+lean_dec(x_15);
+x_16 = lean_box(0);
+lean_ctor_set(x_11, 0, x_16);
+return x_11;
+}
+else
+{
+lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_17 = lean_ctor_get(x_11, 1);
+lean_inc(x_17);
+lean_dec(x_11);
+x_18 = lean_box(0);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_18);
+lean_ctor_set(x_19, 1, x_17);
+return x_19;
+}
+}
+else
+{
+uint8_t x_20; 
+x_20 = !lean_is_exclusive(x_11);
+if (x_20 == 0)
+{
+lean_object* x_21; 
+x_21 = lean_ctor_get(x_11, 0);
+lean_dec(x_21);
+lean_ctor_set(x_2, 0, x_4);
+lean_ctor_set(x_11, 0, x_2);
+return x_11;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; 
+x_22 = lean_ctor_get(x_11, 1);
+lean_inc(x_22);
+lean_dec(x_11);
+lean_ctor_set(x_2, 0, x_4);
+x_23 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_23, 0, x_2);
+lean_ctor_set(x_23, 1, x_22);
+return x_23;
+}
+}
+}
+else
+{
+uint8_t x_24; 
+lean_free_object(x_2);
+lean_dec(x_4);
+x_24 = !lean_is_exclusive(x_11);
+if (x_24 == 0)
+{
+return x_11;
+}
+else
+{
+lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_25 = lean_ctor_get(x_11, 0);
+x_26 = lean_ctor_get(x_11, 1);
+lean_inc(x_26);
+lean_inc(x_25);
+lean_dec(x_11);
+x_27 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_27, 0, x_25);
+lean_ctor_set(x_27, 1, x_26);
+return x_27;
+}
+}
+}
+else
+{
+lean_object* x_28; lean_object* x_29; 
+x_28 = lean_ctor_get(x_2, 0);
+lean_inc(x_28);
+lean_dec(x_2);
+x_29 = l_Lean_Elab_Term_isDefEq(x_1, x_3, x_28, x_5, x_6);
+if (lean_obj_tag(x_29) == 0)
+{
+lean_object* x_30; uint8_t x_31; 
+x_30 = lean_ctor_get(x_29, 0);
+lean_inc(x_30);
+x_31 = lean_unbox(x_30);
+lean_dec(x_30);
+if (x_31 == 0)
+{
+lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+lean_dec(x_4);
+x_32 = lean_ctor_get(x_29, 1);
+lean_inc(x_32);
+if (lean_is_exclusive(x_29)) {
+ lean_ctor_release(x_29, 0);
+ lean_ctor_release(x_29, 1);
+ x_33 = x_29;
+} else {
+ lean_dec_ref(x_29);
+ x_33 = lean_box(0);
+}
+x_34 = lean_box(0);
+if (lean_is_scalar(x_33)) {
+ x_35 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_35 = x_33;
+}
+lean_ctor_set(x_35, 0, x_34);
+lean_ctor_set(x_35, 1, x_32);
+return x_35;
+}
+else
+{
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_36 = lean_ctor_get(x_29, 1);
+lean_inc(x_36);
+if (lean_is_exclusive(x_29)) {
+ lean_ctor_release(x_29, 0);
+ lean_ctor_release(x_29, 1);
+ x_37 = x_29;
+} else {
+ lean_dec_ref(x_29);
+ x_37 = lean_box(0);
+}
+x_38 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_38, 0, x_4);
+if (lean_is_scalar(x_37)) {
+ x_39 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_39 = x_37;
+}
+lean_ctor_set(x_39, 0, x_38);
+lean_ctor_set(x_39, 1, x_36);
+return x_39;
+}
+}
+else
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+lean_dec(x_4);
+x_40 = lean_ctor_get(x_29, 0);
+lean_inc(x_40);
+x_41 = lean_ctor_get(x_29, 1);
+lean_inc(x_41);
+if (lean_is_exclusive(x_29)) {
+ lean_ctor_release(x_29, 0);
+ lean_ctor_release(x_29, 1);
+ x_42 = x_29;
+} else {
+ lean_dec_ref(x_29);
+ x_42 = lean_box(0);
+}
+if (lean_is_scalar(x_42)) {
+ x_43 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_43 = x_42;
+}
+lean_ctor_set(x_43, 0, x_40);
+lean_ctor_set(x_43, 1, x_41);
+return x_43;
+}
+}
+}
+}
+}
+lean_object* l_Lean_Elab_Term_tryEnsureHasType_x3f___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; 
+x_7 = l_Lean_Elab_Term_tryEnsureHasType_x3f(x_1, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_1);
+return x_7;
+}
+}
 lean_object* _init_l_Lean_Elab_Term_ensureHasType___closed__1() {
 _start:
 {
@@ -19472,134 +18622,145 @@ return x_2;
 lean_object* l_Lean_Elab_Term_ensureHasType(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
+lean_object* x_7; 
+lean_inc(x_5);
+lean_inc(x_4);
+lean_inc(x_3);
+lean_inc(x_2);
+x_7 = l_Lean_Elab_Term_tryEnsureHasType_x3f(x_1, x_2, x_3, x_4, x_5, x_6);
+if (lean_obj_tag(x_7) == 0)
+{
+lean_object* x_8; 
+x_8 = lean_ctor_get(x_7, 0);
+lean_inc(x_8);
+if (lean_obj_tag(x_8) == 0)
+{
+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; 
+x_9 = lean_ctor_get(x_7, 1);
+lean_inc(x_9);
+lean_dec(x_7);
+x_10 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_10, 0, x_4);
+x_11 = l_Lean_indentExpr(x_10);
+x_12 = l_Lean_Elab_Term_ensureHasType___closed__3;
+x_13 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_11);
+x_14 = l_Lean_MessageData_ofList___closed__3;
+x_15 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_15, 0, x_13);
+lean_ctor_set(x_15, 1, x_14);
+x_16 = l_Lean_Meta_Exception_mkAppTypeMismatchMessage___closed__8;
+x_17 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_17, 0, x_15);
+lean_ctor_set(x_17, 1, x_16);
+x_18 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_18, 0, x_3);
+x_19 = l_Lean_indentExpr(x_18);
+x_20 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_20, 0, x_17);
+lean_ctor_set(x_20, 1, x_19);
+x_21 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_14);
+x_22 = l_Lean_KernelException_toMessageData___closed__12;
+x_23 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_23, 0, x_21);
+lean_ctor_set(x_23, 1, x_22);
 if (lean_obj_tag(x_2) == 0)
 {
-lean_object* x_7; 
-lean_dec(x_5);
-lean_dec(x_3);
-lean_dec(x_1);
-x_7 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_7, 0, x_4);
-lean_ctor_set(x_7, 1, x_6);
-return x_7;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; 
-x_8 = lean_ctor_get(x_2, 0);
-lean_inc(x_8);
-lean_dec(x_2);
-lean_inc(x_5);
-lean_inc(x_8);
-lean_inc(x_3);
-x_9 = l_Lean_Elab_Term_isDefEq(x_1, x_3, x_8, x_5, x_6);
-if (lean_obj_tag(x_9) == 0)
-{
-lean_object* x_10; uint8_t x_11; 
-x_10 = lean_ctor_get(x_9, 0);
-lean_inc(x_10);
-x_11 = lean_unbox(x_10);
-lean_dec(x_10);
-if (x_11 == 0)
-{
-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_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_12 = lean_ctor_get(x_9, 1);
-lean_inc(x_12);
-lean_dec(x_9);
-x_13 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_13, 0, x_4);
-x_14 = l_Lean_indentExpr(x_13);
-x_15 = l_Lean_Elab_Term_ensureHasType___closed__3;
-x_16 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_14);
-x_17 = l_Lean_MessageData_ofList___closed__3;
-x_18 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_18, 0, x_16);
-lean_ctor_set(x_18, 1, x_17);
-x_19 = l_Lean_Meta_Exception_mkAppTypeMismatchMessage___closed__8;
-x_20 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_20, 0, x_18);
-lean_ctor_set(x_20, 1, x_19);
-x_21 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_21, 0, x_3);
-x_22 = l_Lean_indentExpr(x_21);
-x_23 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_23, 0, x_20);
-lean_ctor_set(x_23, 1, x_22);
-x_24 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_24, 0, x_23);
-lean_ctor_set(x_24, 1, x_17);
-x_25 = l_Lean_KernelException_toMessageData___closed__12;
-x_26 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_26, 0, x_24);
-lean_ctor_set(x_26, 1, x_25);
+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; 
+x_24 = l_Lean_Expr_Inhabited;
+x_25 = l_Option_get_x21___rarg___closed__3;
+x_26 = lean_panic_fn(x_24, x_25);
 x_27 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_27, 0, x_8);
+lean_ctor_set(x_27, 0, x_26);
 x_28 = l_Lean_indentExpr(x_27);
 x_29 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_29, 0, x_26);
+lean_ctor_set(x_29, 0, x_23);
 lean_ctor_set(x_29, 1, x_28);
-x_30 = l_Lean_Elab_Term_throwError___rarg(x_1, x_29, x_5, x_12);
+x_30 = l_Lean_Elab_Term_throwError___rarg(x_1, x_29, x_5, x_9);
 return x_30;
 }
 else
 {
-uint8_t x_31; 
-lean_dec(x_8);
-lean_dec(x_5);
-lean_dec(x_3);
-lean_dec(x_1);
-x_31 = !lean_is_exclusive(x_9);
-if (x_31 == 0)
-{
-lean_object* x_32; 
-x_32 = lean_ctor_get(x_9, 0);
-lean_dec(x_32);
-lean_ctor_set(x_9, 0, x_4);
-return x_9;
-}
-else
-{
-lean_object* x_33; lean_object* x_34; 
-x_33 = lean_ctor_get(x_9, 1);
-lean_inc(x_33);
-lean_dec(x_9);
-x_34 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_34, 0, x_4);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_31 = lean_ctor_get(x_2, 0);
+lean_inc(x_31);
+lean_dec(x_2);
+x_32 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_32, 0, x_31);
+x_33 = l_Lean_indentExpr(x_32);
+x_34 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_34, 0, x_23);
 lean_ctor_set(x_34, 1, x_33);
-return x_34;
-}
+x_35 = l_Lean_Elab_Term_throwError___rarg(x_1, x_34, x_5, x_9);
+return x_35;
 }
 }
 else
 {
-uint8_t x_35; 
-lean_dec(x_8);
+uint8_t x_36; 
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
+lean_dec(x_2);
 lean_dec(x_1);
-x_35 = !lean_is_exclusive(x_9);
-if (x_35 == 0)
+x_36 = !lean_is_exclusive(x_7);
+if (x_36 == 0)
 {
-return x_9;
+lean_object* x_37; lean_object* x_38; 
+x_37 = lean_ctor_get(x_7, 0);
+lean_dec(x_37);
+x_38 = lean_ctor_get(x_8, 0);
+lean_inc(x_38);
+lean_dec(x_8);
+lean_ctor_set(x_7, 0, x_38);
+return x_7;
 }
 else
 {
-lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_36 = lean_ctor_get(x_9, 0);
-x_37 = lean_ctor_get(x_9, 1);
-lean_inc(x_37);
-lean_inc(x_36);
-lean_dec(x_9);
-x_38 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_38, 0, x_36);
-lean_ctor_set(x_38, 1, x_37);
-return x_38;
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_7, 1);
+lean_inc(x_39);
+lean_dec(x_7);
+x_40 = lean_ctor_get(x_8, 0);
+lean_inc(x_40);
+lean_dec(x_8);
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_41, 1, x_39);
+return x_41;
 }
 }
 }
+else
+{
+uint8_t x_42; 
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_42 = !lean_is_exclusive(x_7);
+if (x_42 == 0)
+{
+return x_7;
+}
+else
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_43 = lean_ctor_get(x_7, 0);
+x_44 = lean_ctor_get(x_7, 1);
+lean_inc(x_44);
+lean_inc(x_43);
+lean_dec(x_7);
+x_45 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_45, 0, x_43);
+lean_ctor_set(x_45, 1, x_44);
+return x_45;
+}
+}
 }
 }
 lean_object* l_Lean_Elab_Term_mkInstMVar(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
@@ -19981,7 +19142,7 @@ x_5 = l_Lean_Elab_Term_addBuiltinTermElab(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -19989,22 +19150,22 @@ x_1 = lean_mk_string("Prod.mk");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__1;
+x_1 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__1;
+x_1 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__2;
+x_3 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -20012,7 +19173,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__4() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -20020,17 +19181,17 @@ x_1 = lean_mk_string("Prod");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__5() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__4;
+x_2 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__6() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__6() {
 _start:
 {
 lean_object* x_1; 
@@ -20038,41 +19199,41 @@ x_1 = lean_mk_string("mk");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__7() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__5;
-x_2 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__6;
+x_1 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__5;
+x_2 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__6;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__8() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__7;
+x_2 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__7;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__9() {
+lean_object* _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__8;
+x_2 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__8;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main(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; uint8_t x_7; 
@@ -20102,10 +19263,10 @@ x_15 = lean_ctor_get(x_13, 1);
 lean_inc(x_15);
 lean_dec(x_13);
 x_16 = lean_box(0);
-x_17 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__7;
+x_17 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__7;
 x_18 = lean_name_mk_numeral(x_17, x_14);
-x_19 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__3;
-x_20 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__9;
+x_19 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__3;
+x_20 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__9;
 x_21 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_21, 0, x_16);
 lean_ctor_set(x_21, 1, x_19);
@@ -20137,29 +19298,29 @@ goto _start;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___boxed(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; 
-x_6 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main(x_1, x_2, x_3, x_4, x_5);
+x_6 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 lean_dec(x_1);
 return x_6;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux(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; 
-x_6 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main(x_1, x_2, x_3, x_4, x_5);
+x_6 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main(x_1, x_2, x_3, x_4, x_5);
 return x_6;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_20__mkPairsAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_Term_21__mkPairsAux___boxed(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; 
-x_6 = l___private_Init_Lean_Elab_Term_20__mkPairsAux(x_1, x_2, x_3, x_4, x_5);
+x_6 = l___private_Init_Lean_Elab_Term_21__mkPairsAux(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 lean_dec(x_1);
 return x_6;
@@ -20174,7 +19335,7 @@ x_5 = lean_unsigned_to_nat(1u);
 x_6 = lean_nat_sub(x_4, x_5);
 lean_dec(x_4);
 x_7 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_1);
-x_8 = l___private_Init_Lean_Elab_Term_20__mkPairsAux___main(x_1, x_6, x_7, x_2, x_3);
+x_8 = l___private_Init_Lean_Elab_Term_21__mkPairsAux___main(x_1, x_6, x_7, x_2, x_3);
 return x_8;
 }
 }
@@ -20188,7 +19349,7 @@ lean_dec(x_1);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_21__elabCDot(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_22__elabCDot(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; 
@@ -20448,7 +19609,7 @@ else
 {
 lean_object* x_40; 
 lean_dec(x_1);
-x_40 = l___private_Init_Lean_Elab_Term_21__elabCDot(x_29, x_2, x_3, x_4);
+x_40 = l___private_Init_Lean_Elab_Term_22__elabCDot(x_29, x_2, x_3, x_4);
 return x_40;
 }
 }
@@ -20613,7 +19774,7 @@ x_92 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_92, 0, x_90);
 lean_inc(x_3);
 lean_inc(x_92);
-x_93 = l___private_Init_Lean_Elab_Term_21__elabCDot(x_29, x_92, x_3, x_91);
+x_93 = l___private_Init_Lean_Elab_Term_22__elabCDot(x_29, x_92, x_3, x_91);
 if (lean_obj_tag(x_93) == 0)
 {
 lean_object* x_94; lean_object* x_95; lean_object* x_96; 
@@ -20857,32 +20018,30 @@ return x_3;
 lean_object* l_Lean_Elab_Term_elabListLit(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_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; uint8_t x_22; lean_object* x_23; 
-x_5 = lean_ctor_get(x_1, 1);
-x_6 = l_Lean_stxInh;
-x_7 = lean_unsigned_to_nat(0u);
-x_8 = lean_array_get(x_6, x_5, x_7);
-x_9 = l_Lean_Elab_Term_elabListLit___closed__3;
-x_10 = l_Lean_Elab_Term_mkTermId(x_8, x_9);
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_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; uint8_t x_20; lean_object* x_21; 
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = l_Lean_Syntax_getArg(x_1, x_5);
+x_7 = lean_unsigned_to_nat(1u);
+x_8 = l_Lean_Syntax_getArg(x_1, x_7);
+x_9 = lean_unsigned_to_nat(2u);
+x_10 = l_Lean_Syntax_getArg(x_1, x_9);
+x_11 = l_Lean_Elab_Term_elabListLit___closed__3;
+x_12 = l_Lean_Elab_Term_mkTermId(x_6, x_11);
+lean_dec(x_6);
+x_13 = l_Lean_Elab_Term_elabListLit___closed__5;
+x_14 = l_Lean_Elab_Term_mkTermId(x_10, x_13);
+lean_dec(x_10);
+x_15 = l_Lean_Syntax_getArgs(x_8);
 lean_dec(x_8);
-x_11 = lean_unsigned_to_nat(1u);
-x_12 = lean_array_get(x_6, x_5, x_11);
-x_13 = l_Lean_Syntax_getArgs(x_12);
-lean_dec(x_12);
-x_14 = lean_unsigned_to_nat(2u);
-x_15 = l_Array_empty___closed__1;
-x_16 = l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(x_14, x_13, x_7, x_15);
-lean_dec(x_13);
-x_17 = lean_array_get_size(x_16);
-x_18 = lean_array_get(x_6, x_5, x_14);
-x_19 = l_Lean_Elab_Term_elabListLit___closed__5;
-x_20 = l_Lean_Elab_Term_mkTermId(x_18, x_19);
-lean_dec(x_18);
-x_21 = l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_Elab_Term_elabListLit___spec__1(x_5, x_10, x_16, x_17, lean_box(0), x_20);
-lean_dec(x_16);
-x_22 = 1;
-x_23 = l_Lean_Elab_Term_elabTerm(x_21, x_2, x_22, x_22, x_3, x_4);
-return x_23;
+x_16 = l_Array_empty___closed__1;
+x_17 = l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(x_9, x_15, x_5, x_16);
+lean_dec(x_15);
+x_18 = lean_array_get_size(x_17);
+x_19 = l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_Elab_Term_elabListLit___spec__1(x_1, x_12, x_17, x_18, lean_box(0), x_14);
+lean_dec(x_17);
+x_20 = 1;
+x_21 = l_Lean_Elab_Term_elabTerm(x_19, x_2, x_20, x_20, x_3, x_4);
+return x_21;
 }
 }
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_Elab_Term_elabListLit___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
@@ -21255,7 +20414,7 @@ x_5 = l_Lean_Elab_Term_addBuiltinTermElab(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_22__resolveLocalNameAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_Term_23__resolveLocalNameAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
@@ -21325,15 +20484,15 @@ return x_17;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_22__resolveLocalNameAux(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_Term_23__resolveLocalNameAux(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l___private_Init_Lean_Elab_Term_22__resolveLocalNameAux___main(x_1, x_2, x_3);
+x_4 = l___private_Init_Lean_Elab_Term_23__resolveLocalNameAux___main(x_1, x_2, x_3);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_23__resolveLocalName(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_Term_24__resolveLocalName(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -21344,7 +20503,7 @@ if (x_5 == 0)
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = lean_ctor_get(x_4, 0);
 x_7 = lean_box(0);
-x_8 = l___private_Init_Lean_Elab_Term_22__resolveLocalNameAux___main(x_6, x_1, x_7);
+x_8 = l___private_Init_Lean_Elab_Term_23__resolveLocalNameAux___main(x_6, x_1, x_7);
 lean_ctor_set(x_4, 0, x_8);
 return x_4;
 }
@@ -21357,7 +20516,7 @@ lean_inc(x_10);
 lean_inc(x_9);
 lean_dec(x_4);
 x_11 = lean_box(0);
-x_12 = l___private_Init_Lean_Elab_Term_22__resolveLocalNameAux___main(x_9, x_1, x_11);
+x_12 = l___private_Init_Lean_Elab_Term_23__resolveLocalNameAux___main(x_9, x_1, x_11);
 x_13 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_13, 0, x_12);
 lean_ctor_set(x_13, 1, x_10);
@@ -21365,16 +20524,16 @@ return x_13;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_23__resolveLocalName___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_Term_24__resolveLocalName___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l___private_Init_Lean_Elab_Term_23__resolveLocalName(x_1, x_2, x_3);
+x_4 = l___private_Init_Lean_Elab_Term_24__resolveLocalName(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars___spec__1(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* l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -21413,32 +20572,32 @@ return x_16;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; 
 x_5 = lean_box(0);
 lean_inc(x_2);
-x_6 = l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars___spec__1(x_1, x_2, x_2, x_5, x_3, x_4);
+x_6 = l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars___spec__1(x_1, x_2, x_2, x_5, x_3, x_4);
 lean_dec(x_2);
 return x_6;
 }
 }
-lean_object* l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Nat_foldMAux___main___at___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars(x_1, x_2, x_3, x_4);
+x_5 = l___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars(x_1, x_2, x_3, x_4);
 lean_dec(x_1);
 return x_5;
 }
@@ -21466,9 +20625,11 @@ return x_2;
 lean_object* _init_l_Lean_Elab_Term_mkConst___closed__3() {
 _start:
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("too many explicit universe levels");
-return x_1;
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Char_HasRepr___closed__1;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
 }
 }
 lean_object* _init_l_Lean_Elab_Term_mkConst___closed__4() {
@@ -21476,7 +20637,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; 
 x_1 = l_Lean_Elab_Term_mkConst___closed__3;
-x_2 = lean_alloc_ctor(2, 1, 0);
+x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
@@ -21484,8 +20645,26 @@ return x_2;
 lean_object* _init_l_Lean_Elab_Term_mkConst___closed__5() {
 _start:
 {
+lean_object* x_1; 
+x_1 = lean_mk_string("too many explicit universe levels");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Elab_Term_mkConst___closed__6() {
+_start:
+{
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_mkConst___closed__4;
+x_1 = l_Lean_Elab_Term_mkConst___closed__5;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Elab_Term_mkConst___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Elab_Term_mkConst___closed__6;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -21513,7 +20692,7 @@ x_11 = l_Lean_Elab_Term_mkConst___closed__2;
 x_12 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_12, 0, x_11);
 lean_ctor_set(x_12, 1, x_10);
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_13 = l_Lean_Elab_Term_mkConst___closed__4;
 x_14 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_14, 0, x_12);
 lean_ctor_set(x_14, 1, x_13);
@@ -21539,7 +20718,7 @@ lean_object* x_22; lean_object* x_23; uint8_t x_24;
 x_22 = lean_nat_sub(x_19, x_20);
 lean_dec(x_20);
 lean_dec(x_19);
-x_23 = l___private_Init_Lean_Elab_Term_24__mkFreshLevelMVars(x_1, x_22, x_4, x_8);
+x_23 = l___private_Init_Lean_Elab_Term_25__mkFreshLevelMVars(x_1, x_22, x_4, x_8);
 lean_dec(x_1);
 x_24 = !lean_is_exclusive(x_23);
 if (x_24 == 0)
@@ -21574,14 +20753,14 @@ lean_dec(x_20);
 lean_dec(x_19);
 lean_dec(x_3);
 lean_dec(x_2);
-x_33 = l_Lean_Elab_Term_mkConst___closed__5;
+x_33 = l_Lean_Elab_Term_mkConst___closed__7;
 x_34 = l_Lean_Elab_Term_throwError___rarg(x_1, x_33, x_4, x_8);
 return x_34;
 }
 }
 }
 }
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_Term_25__mkConsts___spec__1(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* l_List_foldlM___main___at___private_Init_Lean_Elab_Term_26__mkConsts___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 if (lean_obj_tag(x_4) == 0)
@@ -21751,7 +20930,7 @@ goto _start;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_25__mkConsts(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_Term_26__mkConsts(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; 
@@ -21760,7 +20939,7 @@ x_7 = lean_ctor_get(x_6, 1);
 lean_inc(x_7);
 lean_dec(x_6);
 x_8 = lean_box(0);
-x_9 = l_List_foldlM___main___at___private_Init_Lean_Elab_Term_25__mkConsts___spec__1(x_1, x_3, x_8, x_2, x_4, x_7);
+x_9 = l_List_foldlM___main___at___private_Init_Lean_Elab_Term_26__mkConsts___spec__1(x_1, x_3, x_8, x_2, x_4, x_7);
 return x_9;
 }
 }
@@ -21853,7 +21032,7 @@ _start:
 {
 lean_object* x_7; lean_object* x_8; 
 lean_inc(x_2);
-x_7 = l___private_Init_Lean_Elab_Term_23__resolveLocalName(x_2, x_5, x_6);
+x_7 = l___private_Init_Lean_Elab_Term_24__resolveLocalName(x_2, x_5, x_6);
 x_8 = lean_ctor_get(x_7, 0);
 lean_inc(x_8);
 if (lean_obj_tag(x_8) == 0)
@@ -21869,7 +21048,7 @@ lean_object* x_11; uint8_t x_12;
 lean_dec(x_2);
 lean_inc(x_5);
 lean_inc(x_1);
-x_11 = l___private_Init_Lean_Elab_Term_25__mkConsts(x_1, x_3, x_4, x_5, x_9);
+x_11 = l___private_Init_Lean_Elab_Term_26__mkConsts(x_1, x_3, x_4, x_5, x_9);
 x_12 = !lean_is_exclusive(x_11);
 if (x_12 == 0)
 {
@@ -21888,7 +21067,7 @@ else
 lean_object* x_16; lean_object* x_17; uint8_t x_18; 
 lean_free_object(x_11);
 lean_dec(x_13);
-x_16 = l_Lean_Elab_Term_mkConst___closed__5;
+x_16 = l_Lean_Elab_Term_mkConst___closed__7;
 x_17 = l_Lean_Elab_Term_throwError___rarg(x_1, x_16, x_5, x_14);
 x_18 = !lean_is_exclusive(x_17);
 if (x_18 == 0)
@@ -21933,7 +21112,7 @@ else
 {
 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_dec(x_22);
-x_26 = l_Lean_Elab_Term_mkConst___closed__5;
+x_26 = l_Lean_Elab_Term_mkConst___closed__7;
 x_27 = l_Lean_Elab_Term_throwError___rarg(x_1, x_26, x_5, x_23);
 x_28 = lean_ctor_get(x_27, 0);
 lean_inc(x_28);
@@ -21990,7 +21169,7 @@ lean_object* x_43; uint8_t x_44;
 lean_dec(x_2);
 lean_inc(x_5);
 lean_inc(x_1);
-x_43 = l___private_Init_Lean_Elab_Term_25__mkConsts(x_1, x_41, x_4, x_5, x_40);
+x_43 = l___private_Init_Lean_Elab_Term_26__mkConsts(x_1, x_41, x_4, x_5, x_40);
 x_44 = !lean_is_exclusive(x_43);
 if (x_44 == 0)
 {
@@ -22009,7 +21188,7 @@ else
 lean_object* x_48; lean_object* x_49; uint8_t x_50; 
 lean_free_object(x_43);
 lean_dec(x_45);
-x_48 = l_Lean_Elab_Term_mkConst___closed__5;
+x_48 = l_Lean_Elab_Term_mkConst___closed__7;
 x_49 = l_Lean_Elab_Term_throwError___rarg(x_1, x_48, x_5, x_46);
 x_50 = !lean_is_exclusive(x_49);
 if (x_50 == 0)
@@ -22054,7 +21233,7 @@ else
 {
 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_dec(x_54);
-x_58 = l_Lean_Elab_Term_mkConst___closed__5;
+x_58 = l_Lean_Elab_Term_mkConst___closed__7;
 x_59 = l_Lean_Elab_Term_throwError___rarg(x_1, x_58, x_5, x_55);
 x_60 = lean_ctor_get(x_59, 0);
 lean_inc(x_60);
@@ -22094,7 +21273,7 @@ x_68 = l_Lean_Elab_Term_resolveName___closed__3;
 x_69 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_69, 0, x_68);
 lean_ctor_set(x_69, 1, x_67);
-x_70 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_70 = l_Lean_Elab_Term_mkConst___closed__4;
 x_71 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_71, 0, x_69);
 lean_ctor_set(x_71, 1, x_70);
@@ -22379,35 +21558,31 @@ return x_2;
 lean_object* l_Lean_Elab_Term_elabStr(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_5 = lean_ctor_get(x_1, 1);
-lean_inc(x_5);
-x_6 = l_Lean_stxInh;
-x_7 = lean_unsigned_to_nat(0u);
-x_8 = lean_array_get(x_6, x_5, x_7);
-lean_dec(x_5);
-x_9 = l_Lean_Syntax_isStrLit_x3f(x_8);
-lean_dec(x_8);
-if (lean_obj_tag(x_9) == 0)
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = l_Lean_Syntax_getArg(x_1, x_5);
+x_7 = l_Lean_Syntax_isStrLit_x3f(x_6);
+lean_dec(x_6);
+if (lean_obj_tag(x_7) == 0)
 {
-lean_object* x_10; lean_object* x_11; 
-x_10 = l_Lean_Elab_Term_elabStr___closed__3;
-x_11 = l_Lean_Elab_Term_throwError___rarg(x_1, x_10, x_3, x_4);
-return x_11;
+lean_object* x_8; lean_object* x_9; 
+x_8 = l_Lean_Elab_Term_elabStr___closed__3;
+x_9 = l_Lean_Elab_Term_throwError___rarg(x_1, x_8, x_3, x_4);
+return x_9;
 }
 else
 {
-lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
 lean_dec(x_3);
 lean_dec(x_1);
-x_12 = lean_ctor_get(x_9, 0);
-lean_inc(x_12);
-lean_dec(x_9);
-x_13 = l_Lean_mkStrLit(x_12);
-x_14 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_14, 0, x_13);
-lean_ctor_set(x_14, 1, x_4);
-return x_14;
+x_10 = lean_ctor_get(x_7, 0);
+lean_inc(x_10);
+lean_dec(x_7);
+x_11 = l_Lean_mkStrLit(x_10);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_4);
+return x_12;
 }
 }
 }
@@ -22506,49 +21681,45 @@ return x_2;
 lean_object* l_Lean_Elab_Term_elabNum(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-x_62 = lean_ctor_get(x_1, 1);
-lean_inc(x_62);
-x_63 = l_Lean_stxInh;
-x_64 = lean_unsigned_to_nat(0u);
-x_65 = lean_array_get(x_63, x_62, x_64);
-lean_dec(x_62);
-x_66 = l_Lean_numLitKind;
-x_67 = l_Lean_Syntax_isNatLitAux(x_66, x_65);
-lean_dec(x_65);
-if (lean_obj_tag(x_67) == 0)
+lean_object* x_5; lean_object* x_6; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; 
+x_62 = lean_unsigned_to_nat(0u);
+x_63 = l_Lean_Syntax_getArg(x_1, x_62);
+x_64 = l_Lean_numLitKind;
+x_65 = l_Lean_Syntax_isNatLitAux(x_64, x_63);
+lean_dec(x_63);
+if (lean_obj_tag(x_65) == 0)
 {
-lean_object* x_68; lean_object* x_69; uint8_t x_70; 
+lean_object* x_66; lean_object* x_67; uint8_t x_68; 
 lean_dec(x_2);
-x_68 = l_Lean_Elab_Term_elabStr___closed__3;
-x_69 = l_Lean_Elab_Term_throwError___rarg(x_1, x_68, x_3, x_4);
-x_70 = !lean_is_exclusive(x_69);
-if (x_70 == 0)
+x_66 = l_Lean_Elab_Term_elabStr___closed__3;
+x_67 = l_Lean_Elab_Term_throwError___rarg(x_1, x_66, x_3, x_4);
+x_68 = !lean_is_exclusive(x_67);
+if (x_68 == 0)
 {
-return x_69;
+return x_67;
 }
 else
 {
-lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_71 = lean_ctor_get(x_69, 0);
-x_72 = lean_ctor_get(x_69, 1);
-lean_inc(x_72);
-lean_inc(x_71);
-lean_dec(x_69);
-x_73 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_73, 0, x_71);
-lean_ctor_set(x_73, 1, x_72);
-return x_73;
-}
-}
-else
-{
-lean_object* x_74; lean_object* x_75; 
-x_74 = lean_ctor_get(x_67, 0);
-lean_inc(x_74);
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_67, 0);
+x_70 = lean_ctor_get(x_67, 1);
+lean_inc(x_70);
+lean_inc(x_69);
 lean_dec(x_67);
-x_75 = l_Lean_mkNatLit(x_74);
-x_5 = x_75;
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_69);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
+}
+}
+else
+{
+lean_object* x_72; lean_object* x_73; 
+x_72 = lean_ctor_get(x_65, 0);
+lean_inc(x_72);
+lean_dec(x_65);
+x_73 = l_Lean_mkNatLit(x_72);
+x_5 = x_73;
 x_6 = x_4;
 goto block_61;
 }
@@ -22852,40 +22023,36 @@ return x_3;
 lean_object* l_Lean_Elab_Term_elabChar(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_5 = lean_ctor_get(x_1, 1);
-lean_inc(x_5);
-x_6 = l_Lean_stxInh;
-x_7 = lean_unsigned_to_nat(0u);
-x_8 = lean_array_get(x_6, x_5, x_7);
-lean_dec(x_5);
-x_9 = l_Lean_Syntax_isCharLit_x3f(x_8);
-lean_dec(x_8);
-if (lean_obj_tag(x_9) == 0)
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = l_Lean_Syntax_getArg(x_1, x_5);
+x_7 = l_Lean_Syntax_isCharLit_x3f(x_6);
+lean_dec(x_6);
+if (lean_obj_tag(x_7) == 0)
 {
-lean_object* x_10; lean_object* x_11; 
-x_10 = l_Lean_Elab_Term_elabStr___closed__3;
-x_11 = l_Lean_Elab_Term_throwError___rarg(x_1, x_10, x_3, x_4);
-return x_11;
+lean_object* x_8; lean_object* x_9; 
+x_8 = l_Lean_Elab_Term_elabStr___closed__3;
+x_9 = l_Lean_Elab_Term_throwError___rarg(x_1, x_8, x_3, x_4);
+return x_9;
 }
 else
 {
-lean_object* x_12; uint32_t 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_10; uint32_t x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
 lean_dec(x_3);
 lean_dec(x_1);
-x_12 = lean_ctor_get(x_9, 0);
-lean_inc(x_12);
-lean_dec(x_9);
-x_13 = lean_unbox_uint32(x_12);
-lean_dec(x_12);
-x_14 = lean_uint32_to_nat(x_13);
-x_15 = l_Lean_mkNatLit(x_14);
-x_16 = l_Lean_Elab_Term_elabChar___closed__4;
-x_17 = l_Lean_mkApp(x_16, x_15);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_4);
-return x_18;
+x_10 = lean_ctor_get(x_7, 0);
+lean_inc(x_10);
+lean_dec(x_7);
+x_11 = lean_unbox_uint32(x_10);
+lean_dec(x_10);
+x_12 = lean_uint32_to_nat(x_11);
+x_13 = l_Lean_mkNatLit(x_12);
+x_14 = l_Lean_Elab_Term_elabChar___closed__4;
+x_15 = l_Lean_mkApp(x_14, x_13);
+x_16 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_4);
+return x_16;
 }
 }
 }
@@ -22935,7 +22102,7 @@ x_5 = l_Lean_Elab_Term_addBuiltinTermElab(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* l___private_Init_Lean_Elab_Term_26__regTraceClasses(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_Term_27__regTraceClasses(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -23070,22 +22237,8 @@ l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec_
 lean_mark_persistent(l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec__1___closed__2);
 l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec__1___closed__3 = _init_l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec__1___closed__3();
 lean_mark_persistent(l_List_foldlM___main___at___private_Init_Lean_Elab_Term_3__addMacroStack___spec__1___closed__3);
-l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__1 = _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__1);
-l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__2 = _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__2);
-l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__3 = _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__3();
-lean_mark_persistent(l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__3);
-l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__4 = _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__4();
-lean_mark_persistent(l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__4);
-l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__5 = _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__5();
-lean_mark_persistent(l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__5);
-l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__6 = _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__6();
-lean_mark_persistent(l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__6);
-l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__7 = _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__7();
-lean_mark_persistent(l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__7);
-l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8 = _init_l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8();
-lean_mark_persistent(l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8);
+l_Lean_Elab_Term_throwUnsupportedSyntax___rarg___closed__1 = _init_l_Lean_Elab_Term_throwUnsupportedSyntax___rarg___closed__1();
+lean_mark_persistent(l_Lean_Elab_Term_throwUnsupportedSyntax___rarg___closed__1);
 l_Lean_Elab_Term_TermElabM_MonadQuotation___closed__1 = _init_l_Lean_Elab_Term_TermElabM_MonadQuotation___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_TermElabM_MonadQuotation___closed__1);
 l_Lean_Elab_Term_TermElabM_MonadQuotation___closed__2 = _init_l_Lean_Elab_Term_TermElabM_MonadQuotation___closed__2();
@@ -23241,6 +22394,12 @@ l___private_Init_Lean_Elab_Term_11__postponeElabTerm___closed__3 = _init_l___pri
 lean_mark_persistent(l___private_Init_Lean_Elab_Term_11__postponeElabTerm___closed__3);
 l___private_Init_Lean_Elab_Term_11__postponeElabTerm___closed__4 = _init_l___private_Init_Lean_Elab_Term_11__postponeElabTerm___closed__4();
 lean_mark_persistent(l___private_Init_Lean_Elab_Term_11__postponeElabTerm___closed__4);
+l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__1 = _init_l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__1);
+l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__2 = _init_l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__2);
+l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__3 = _init_l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_12__elabTermUsing___main___closed__3);
 l_Lean_Elab_Term_elabTerm___closed__1 = _init_l_Lean_Elab_Term_elabTerm___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabTerm___closed__1);
 l_Lean_Elab_Term_elabTerm___closed__2 = _init_l_Lean_Elab_Term_elabTerm___closed__2();
@@ -23257,8 +22416,10 @@ l_Lean_Elab_Term_ensureType___closed__1 = _init_l_Lean_Elab_Term_ensureType___cl
 lean_mark_persistent(l_Lean_Elab_Term_ensureType___closed__1);
 l_Lean_Elab_Term_ensureType___closed__2 = _init_l_Lean_Elab_Term_ensureType___closed__2();
 lean_mark_persistent(l_Lean_Elab_Term_ensureType___closed__2);
-l___private_Init_Lean_Elab_Term_13__resumePostponed___closed__1 = _init_l___private_Init_Lean_Elab_Term_13__resumePostponed___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_13__resumePostponed___closed__1);
+l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1 = _init_l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1);
+l___private_Init_Lean_Elab_Term_14__resumePostponed___closed__1 = _init_l___private_Init_Lean_Elab_Term_14__resumePostponed___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_14__resumePostponed___closed__1);
 l_Lean_Elab_Term_synthesizeInstMVarCore___closed__1 = _init_l_Lean_Elab_Term_synthesizeInstMVarCore___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_synthesizeInstMVarCore___closed__1);
 l_Lean_Elab_Term_synthesizeInstMVarCore___closed__2 = _init_l_Lean_Elab_Term_synthesizeInstMVarCore___closed__2();
@@ -23285,64 +22446,62 @@ l_Lean_Elab_Term_synthesizeInstMVarCore___closed__12 = _init_l_Lean_Elab_Term_sy
 lean_mark_persistent(l_Lean_Elab_Term_synthesizeInstMVarCore___closed__12);
 l_Lean_Elab_Term_synthesizeInstMVarCore___closed__13 = _init_l_Lean_Elab_Term_synthesizeInstMVarCore___closed__13();
 lean_mark_persistent(l_Lean_Elab_Term_synthesizeInstMVarCore___closed__13);
-l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1 = _init_l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1);
-l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__1 = _init_l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__1);
-l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__2 = _init_l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__2);
-l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3 = _init_l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3);
-l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__1 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__1();
-lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__1);
-l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__2 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__2();
-lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__2);
-l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__3 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__3();
-lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__3);
-l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__4 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__4();
-lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__4);
-l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__5 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__5();
-lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__5);
-l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__6 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__6();
-lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__6);
-l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__7 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__7();
-lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__7);
-l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__8 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__8();
-lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__8);
-l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__9 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__9();
-lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___spec__2___closed__9);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__1 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__1);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__2 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__2);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__3 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__3);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__4 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__4();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__4);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__5 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__5();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__5);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__6 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__6();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__6);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__7 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__7();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__7);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__8 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__8();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__8);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__9 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__9();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__9);
-l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__10 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__10();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVarsStep___closed__10);
+l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__1 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__1);
+l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__2 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__2);
+l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3 = _init_l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3);
+l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__1 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__1();
+lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__1);
+l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__2 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__2();
+lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__2);
+l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__3 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__3();
+lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__3);
+l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__4 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__4();
+lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__4);
+l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__5 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__5();
+lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__5);
+l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__6 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__6();
+lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__6);
+l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__7 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__7();
+lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__7);
+l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__8 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__8();
+lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__8);
+l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__9 = _init_l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__9();
+lean_mark_persistent(l_List_filterAuxM___main___at___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___spec__2___closed__9);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__1 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__1);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__2 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__2);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__3 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__3);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__4 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__4();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__4);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__5 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__5();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__5);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__6 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__6();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__6);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__7 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__7();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__7);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__8 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__8();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__8);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__9 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__9();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__9);
+l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__10 = _init_l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__10();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_18__synthesizeSyntheticMVarsStep___closed__10);
 l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__1 = _init_l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__1();
 lean_mark_persistent(l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__1);
 l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__2 = _init_l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__2();
 lean_mark_persistent(l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__2);
 l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__3 = _init_l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__3();
 lean_mark_persistent(l_List_filterAuxM___main___at_Lean_Elab_Term_synthesizeUsingDefault___spec__1___lambda__1___closed__3);
-l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1 = _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1();
-lean_mark_persistent(l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1);
-l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2 = _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2();
-lean_mark_persistent(l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2);
-l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3 = _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3();
-lean_mark_persistent(l_List_forM___main___at___private_Init_Lean_Elab_Term_18__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3);
+l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1 = _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1();
+lean_mark_persistent(l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__1);
+l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2 = _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2();
+lean_mark_persistent(l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__2);
+l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3 = _init_l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3();
+lean_mark_persistent(l_List_forM___main___at___private_Init_Lean_Elab_Term_19__reportStuckSyntheticMVars___spec__1___lambda__1___closed__3);
 l_Lean_Elab_Term_ensureHasType___closed__1 = _init_l_Lean_Elab_Term_ensureHasType___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_ensureHasType___closed__1);
 l_Lean_Elab_Term_ensureHasType___closed__2 = _init_l_Lean_Elab_Term_ensureHasType___closed__2();
@@ -23387,24 +22546,24 @@ lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabHole___closed__3)
 res = l___regBuiltinTermElab_Lean_Elab_Term_elabHole(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__1 = _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__1);
-l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__2 = _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__2);
-l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__3 = _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__3);
-l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__4 = _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__4();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__4);
-l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__5 = _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__5();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__5);
-l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__6 = _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__6();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__6);
-l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__7 = _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__7();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__7);
-l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__8 = _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__8();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__8);
-l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__9 = _init_l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__9();
-lean_mark_persistent(l___private_Init_Lean_Elab_Term_20__mkPairsAux___main___closed__9);
+l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__1 = _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__1);
+l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__2 = _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__2);
+l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__3 = _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__3);
+l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__4 = _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__4();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__4);
+l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__5 = _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__5();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__5);
+l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__6 = _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__6();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__6);
+l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__7 = _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__7();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__7);
+l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__8 = _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__8();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__8);
+l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__9 = _init_l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__9();
+lean_mark_persistent(l___private_Init_Lean_Elab_Term_21__mkPairsAux___main___closed__9);
 l_Lean_Elab_Term_elabParen___closed__1 = _init_l_Lean_Elab_Term_elabParen___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabParen___closed__1);
 l_Lean_Elab_Term_elabParen___closed__2 = _init_l_Lean_Elab_Term_elabParen___closed__2();
@@ -23490,6 +22649,10 @@ l_Lean_Elab_Term_mkConst___closed__4 = _init_l_Lean_Elab_Term_mkConst___closed__
 lean_mark_persistent(l_Lean_Elab_Term_mkConst___closed__4);
 l_Lean_Elab_Term_mkConst___closed__5 = _init_l_Lean_Elab_Term_mkConst___closed__5();
 lean_mark_persistent(l_Lean_Elab_Term_mkConst___closed__5);
+l_Lean_Elab_Term_mkConst___closed__6 = _init_l_Lean_Elab_Term_mkConst___closed__6();
+lean_mark_persistent(l_Lean_Elab_Term_mkConst___closed__6);
+l_Lean_Elab_Term_mkConst___closed__7 = _init_l_Lean_Elab_Term_mkConst___closed__7();
+lean_mark_persistent(l_Lean_Elab_Term_mkConst___closed__7);
 l_Lean_Elab_Term_resolveName___closed__1 = _init_l_Lean_Elab_Term_resolveName___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_resolveName___closed__1);
 l_Lean_Elab_Term_resolveName___closed__2 = _init_l_Lean_Elab_Term_resolveName___closed__2();
@@ -23574,7 +22737,7 @@ lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabChar___closed__3)
 res = l___regBuiltinTermElab_Lean_Elab_Term_elabChar(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = l___private_Init_Lean_Elab_Term_26__regTraceClasses(lean_io_mk_world());
+res = l___private_Init_Lean_Elab_Term_27__regTraceClasses(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_mk_io_result(lean_box(0));
diff --git a/stage0/stdlib/Init/Lean/Elab/TermApp.c b/stage0/stdlib/Init/Lean/Elab/TermApp.c
index 8d3bf66815..168fc4f42a 100644
--- a/stage0/stdlib/Init/Lean/Elab/TermApp.c
+++ b/stage0/stdlib/Init/Lean/Elab/TermApp.c
@@ -13,237 +13,232 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-lean_object* l___private_Init_Lean_Elab_TermApp_15__toMessageData(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_16__mergeFailures___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_addNamedArg___closed__5;
+lean_object* l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_16__toMessageData___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getEnv___rarg(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__9;
 extern lean_object* l_Lean_Name_toString___closed__1;
-lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__19;
+lean_object* l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermApp_16__toMessageData(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_8__resolveLValLoop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_app___elambda__1___closed__1;
 extern lean_object* l_Lean_fieldIdxKind;
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__6;
 lean_object* l_Lean_Expr_mvarId_x21(lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValLoop(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isNatLitAux(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabChoice___closed__3;
 extern lean_object* l_Lean_Parser_Term_explicit___elambda__1___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_18__elabAppAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__1;
 lean_object* l_Lean_mkSort(lean_object*);
 lean_object* l_Lean_Elab_Term_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__2;
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshExprMVar(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__2;
 lean_object* l_unreachable_x21___rarg(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
 extern lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__3;
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_Elab_Term_elabExplicitUniv___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_18__expandApp___main(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_fieldIdxKind___closed__2;
 extern lean_object* l_Lean_MessageData_ofList___closed__3;
 lean_object* l_Array_eraseIdx___rarg(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__22;
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_17__mergeFailures___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_inferType(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__8;
 lean_object* l_Lean_Format_pretty(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabId___closed__1;
 extern lean_object* l_Option_get_x21___rarg___closed__3;
-lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermApp_20__regTraceClasses(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabId___closed__2;
 lean_object* lean_array_fswap(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Prod_HasRepr___rarg___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_19__regTraceClasses___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_19__regTraceClasses(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__4;
-lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_10__addLValArg___main___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__7;
 extern lean_object* l_Lean_stxInh;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProj___closed__3;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__16;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* lean_environment_find(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__3;
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_11__addLValArg___main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__11;
 lean_object* l_List_append___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_15__toMessageData___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Exception_mkAppTypeMismatchMessage(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_unfoldDefinition_x3f(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+lean_object* l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_namedArgument___elambda__1___closed__2;
 uint8_t l_Lean_Expr_isAppOf(lean_object*, lean_object*);
 lean_object* lean_local_ctx_find_from_user_name(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_2__elabArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_expr_instantiate1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_NamedArg_hasToString(lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
-extern lean_object* l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
 lean_object* lean_string_append(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_16__mergeFailures___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__1;
 lean_object* l_Lean_Expr_getOptParamDefault_x3f(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__20;
 lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__28;
 lean_object* l_PersistentArray_push___rarg(lean_object*, lean_object*);
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__2(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__10;
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__5___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* l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_filterAux___main___at___private_Init_Lean_Elab_TermApp_15__getSuccess___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_addNamedArg___closed__6;
-lean_object* l___private_Init_Lean_Elab_TermApp_17__elabAppAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__16;
 extern lean_object* l_Lean_Parser_Term_sort___elambda__1___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__7;
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__10;
-lean_object* l___private_Init_Lean_Elab_TermApp_16__mergeFailures(lean_object*);
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__14;
 extern lean_object* l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_16__toMessageData___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_NamedArg_inhabited;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabId___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermApp_17__mergeFailures(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_1__synthesizeAppInstMVars___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_19__expandApp___main___closed__1;
 lean_object* lean_nat_add(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___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_ensureHasType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__7;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrayRef___closed__3;
-lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermApp_18__elabAppAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__7;
 lean_object* l_Lean_Elab_Term_getOptions(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__19;
 extern lean_object* l_Lean_Parser_Term_proj___elambda__1___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__4;
 lean_object* l___private_Init_Lean_Elab_TermApp_1__synthesizeAppInstMVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___boxed(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_Array_HasRepr___rarg___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrayRef___closed__1;
 lean_object* l_Lean_Elab_Term_elabLevel(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Syntax_getKind___closed__4;
+lean_object* l___private_Init_Lean_Elab_TermApp_3__elabArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__2;
 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* l___private_Init_Lean_Elab_TermApp_19__expandApp___main(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___boxed(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___private_Init_Lean_Elab_TermApp_18__expandApp___main___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__6;
-lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_toString___at_Lean_Elab_OpenDecl_HasToString___spec__2(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabChoice___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg(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_throwUnexpectedSyntax___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_id___elambda__1___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__2;
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2;
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabExplicit(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getCurrNamespace(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__1;
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(lean_object*);
 extern lean_object* l_Lean_choiceKind___closed__2;
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2;
 extern lean_object* l_Lean_MessageData_Inhabited;
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___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___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__1;
+lean_object* l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_16__toMessageData___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabId(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_append___main(lean_object*, lean_object*);
 lean_object* l_Array_shrink___main___rarg(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__2;
+extern lean_object* l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__26;
+lean_object* l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTerm(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*);
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__2(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabChoice___closed__1;
 lean_object* l_Lean_Elab_Term_addNamedArg___closed__3;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__8;
+lean_object* l___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_Elab_Term_mkConst___closed__4;
+lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__4(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrayRef___closed__2;
 lean_object* l_Lean_Elab_Term_NamedArg_inhabited___closed__1;
 lean_object* l_Lean_Elab_Term_elabExplicitUniv___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__9;
+lean_object* l___private_Init_Lean_Elab_TermApp_20__regTraceClasses___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__1;
 lean_object* l_Lean_Elab_Term_Arg_hasToString(lean_object*);
+lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_14__elabAppFn(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Nat_repr(lean_object*);
 uint8_t l_Lean_LocalDecl_binderInfo(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__25;
-lean_object* l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__1;
-lean_object* l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__4(lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppFn(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 extern lean_object* l_Lean_choiceKind;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__6;
-extern lean_object* l_Lean_Parser_identFn___rarg___closed__1;
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__11;
-lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__12;
 lean_object* l_Lean_Elab_Term_resolveName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getStructureFields(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSortApp___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_addNamedArg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgs___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_Exception_toTraceMessageData___closed__4;
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__3;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__18;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__13;
 extern lean_object* l_Lean_Options_empty;
 lean_object* lean_expr_dbg_to_string(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__3;
 lean_object* l_Lean_Elab_Term_elabApp(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getPathToBaseStructure_x3f(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__23;
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_17__mergeFailures___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
 uint8_t l_Array_isEmpty___rarg(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
+lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_toExpr(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__28;
 lean_object* l_Lean_Elab_Term_elabChoice(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__14;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_19__expandApp(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabApp(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__5;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__15;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__1;
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_formatEntry___closed__1;
 extern lean_object* l_Lean_Elab_Term_TermElabResult_inhabited;
-lean_object* l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_15__toMessageData___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
+lean_object* l___private_Init_Lean_Elab_TermApp_6__throwLValError(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabExplicit___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__6;
 extern lean_object* l_Lean_Parser_Term_arrayRef___elambda__1___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___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_Lean_Name_replacePrefix___main(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__11;
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__7;
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_5__throwLValError(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkConst(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabProj(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MessageData_ofArray(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabExplicit___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_11__addLValArg___main___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__12;
 extern lean_object* l_Option_HasRepr___rarg___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__6;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabExplicit(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermApp_5__elabAppArgs___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__2___boxed(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_Meta_Exception_mkAppTypeMismatchMessage___closed__8;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__8;
 uint8_t l_Array_anyRangeMAux___main___at_Lean_Elab_Term_addNamedArg___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabId(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__17;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__8;
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__5;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__5;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSortApp___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__8;
 uint8_t l_Lean_BinderInfo_beq(uint8_t, uint8_t);
 lean_object* l_Lean_Elab_Term_elabSortApp___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProj___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__17;
 lean_object* l_Lean_mkLevelSucc(lean_object*);
 lean_object* l_Lean_Elab_Term_getLCtx(lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_1__synthesizeAppInstMVars___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__2;
 lean_object* l_Lean_Elab_Term_elabSortApp(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__27;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__4;
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__3;
 lean_object* l_Lean_mkApp(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__9;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabExplicit___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermApp_9__resolveLVal(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProj___closed__2;
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_8__resolveLVal(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_BinderInfo_isExplicit(uint8_t);
 lean_object* l_Lean_Elab_Term_registerSyntheticMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getKind(lean_object*);
@@ -251,84 +246,91 @@ lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore(lean_object*, lean_object*,
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabChoice(lean_object*);
 lean_object* l_Lean_Elab_getPos___at_Lean_Elab_Term_throwError___spec__2(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__5___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* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__2;
 extern lean_object* l_Lean_Parser_Term_app___elambda__1___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__2;
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__9;
 lean_object* l_Lean_Elab_Term_whnfCore(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___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___regBuiltinTermElab_Lean_Elab_Term_elabArrayRef(lean_object*);
 extern lean_object* l___private_Init_Util_1__mkPanicMessage___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermApp_14__elabAppFn___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__4;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__11;
 lean_object* l_Lean_Elab_Term_elabExplicitUniv(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__1;
 extern lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__4;
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__27;
 lean_object* l_Lean_Elab_Term_tryPostponeIfMVar(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppFn___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__12;
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__13;
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__9;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabApp___closed__3;
-lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__23;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__3;
 lean_object* l_Lean_Elab_Term_whnfForall(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__15;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__18;
+lean_object* l___private_Init_Lean_Elab_TermApp_2__ensureArgType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_Elab_Term_addNamedArg___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__8;
 lean_object* l_Lean_Expr_consumeMData___main(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
 lean_object* l_Lean_Elab_Term_addNamedArg___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__4;
 lean_object* l_Array_toList___rarg(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__2;
 lean_object* l_Lean_Elab_Term_addBuiltinTermElab(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__10;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabApp___closed__2;
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__1;
 lean_object* l_Lean_Syntax_foldArgsAuxM___main___at_Lean_Syntax_foldSepRevArgsM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__20;
 lean_object* l_Lean_Elab_Term_Arg_inhabited___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__7;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__6;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabApp___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__9;
+lean_object* l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_tryEnsureHasType_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_addNamedArg___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__5;
 uint8_t l_Lean_Position_DecidableEq(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_14__elabAppFn___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__4;
+lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProj(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__5;
-lean_object* l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__1;
 lean_object* l_Lean_Syntax_formatStxAux___main(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_10__addLValArg___main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Nat_Inhabited;
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__10;
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_List_isEmpty___rarg(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_15__toMessageData___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_applyResult(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__26;
 lean_object* l_Lean_Name_toStringWithSep___main(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermApp_14__getSuccess(lean_object*);
 uint8_t l_Lean_isStructureLike(lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__12;
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__1;
+lean_object* l___private_Init_Lean_Elab_TermApp_15__getSuccess(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSortApp(lean_object*);
 lean_object* l___private_Init_Lean_Elab_TermApp_1__synthesizeAppInstMVars(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_18__expandApp(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__22;
+lean_object* l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__1(lean_object*);
 lean_object* l_Array_insertAt___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_findField_x3f___main(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__2;
 extern lean_object* l_Lean_Parser_Term_sortApp___elambda__1___closed__2;
-lean_object* l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__1(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__3;
+lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_components(lean_object*);
+lean_object* l_Lean_Elab_Term_getMCtx___rarg(lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_3__iterateRevMAux___main___at_Lean_Elab_Term_elabExplicitUniv___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___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_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__2;
 lean_object* l_Lean_Elab_Term_addNamedArg___closed__4;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSortApp___closed__3;
 uint8_t l_Lean_isStructure(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__5;
-lean_object* l_Array_filterAux___main___at___private_Init_Lean_Elab_TermApp_14__getSuccess___spec__1(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_17__elabAppAux___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__25;
 lean_object* l_Lean_Elab_Term_Arg_inhabited;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__3;
 lean_object* _init_l_Lean_Elab_Term_Arg_inhabited___closed__1() {
 _start:
 {
@@ -738,148 +740,226 @@ lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_2__elabArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_TermApp_2__ensureArgType(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
-if (lean_obj_tag(x_2) == 0)
+lean_object* x_7; 
+lean_inc(x_5);
+lean_inc(x_3);
+x_7 = l_Lean_Elab_Term_inferType(x_1, x_3, x_5, x_6);
+if (lean_obj_tag(x_7) == 0)
 {
-lean_object* x_6; lean_object* x_7; uint8_t x_8; lean_object* x_9; 
-x_6 = lean_ctor_get(x_2, 0);
-lean_inc(x_6);
-lean_dec(x_2);
-x_7 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_7, 0, x_3);
-x_8 = 1;
-lean_inc(x_4);
-lean_inc(x_7);
-x_9 = l_Lean_Elab_Term_elabTerm(x_6, x_7, x_8, x_8, x_4, x_5);
-if (lean_obj_tag(x_9) == 0)
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_8 = lean_ctor_get(x_7, 0);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_7, 1);
+lean_inc(x_9);
+lean_dec(x_7);
+x_10 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_10, 0, x_4);
+lean_inc(x_5);
+lean_inc(x_3);
+x_11 = l_Lean_Elab_Term_tryEnsureHasType_x3f(x_1, x_10, x_8, x_3, x_5, x_9);
+if (lean_obj_tag(x_11) == 0)
 {
-lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_10 = lean_ctor_get(x_9, 0);
-lean_inc(x_10);
-x_11 = lean_ctor_get(x_9, 1);
-lean_inc(x_11);
-lean_dec(x_9);
-lean_inc(x_4);
-lean_inc(x_10);
-x_12 = l_Lean_Elab_Term_inferType(x_1, x_10, x_4, x_11);
+lean_object* x_12; 
+x_12 = lean_ctor_get(x_11, 0);
+lean_inc(x_12);
 if (lean_obj_tag(x_12) == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; 
-x_13 = lean_ctor_get(x_12, 0);
+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_26; lean_object* x_27; lean_object* x_28; 
+x_13 = lean_ctor_get(x_11, 1);
 lean_inc(x_13);
-x_14 = lean_ctor_get(x_12, 1);
-lean_inc(x_14);
-lean_dec(x_12);
-x_15 = l_Lean_Elab_Term_ensureHasType(x_1, x_7, x_13, x_10, x_4, x_14);
-return x_15;
-}
-else
-{
-uint8_t x_16; 
-lean_dec(x_10);
-lean_dec(x_7);
-lean_dec(x_4);
-lean_dec(x_1);
-x_16 = !lean_is_exclusive(x_12);
-if (x_16 == 0)
-{
-return x_12;
-}
-else
-{
-lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_17 = lean_ctor_get(x_12, 0);
-x_18 = lean_ctor_get(x_12, 1);
+lean_dec(x_11);
+x_14 = l_Lean_Elab_Term_getEnv___rarg(x_13);
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = l_Lean_Elab_Term_getMCtx___rarg(x_16);
+x_18 = lean_ctor_get(x_17, 0);
 lean_inc(x_18);
-lean_inc(x_17);
+x_19 = lean_ctor_get(x_17, 1);
+lean_inc(x_19);
+lean_dec(x_17);
+x_20 = l_Lean_Elab_Term_getLCtx(x_5, x_19);
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_20, 1);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = l_Lean_Elab_Term_getOptions(x_5, x_22);
+x_24 = lean_ctor_get(x_23, 0);
+lean_inc(x_24);
+x_25 = lean_ctor_get(x_23, 1);
+lean_inc(x_25);
+lean_dec(x_23);
+x_26 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_26, 0, x_15);
+lean_ctor_set(x_26, 1, x_18);
+lean_ctor_set(x_26, 2, x_21);
+lean_ctor_set(x_26, 3, x_24);
+x_27 = l_Lean_Meta_Exception_mkAppTypeMismatchMessage(x_2, x_3, x_26);
+x_28 = l_Lean_Elab_Term_throwError___rarg(x_1, x_27, x_5, x_25);
+return x_28;
+}
+else
+{
+uint8_t x_29; 
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_29 = !lean_is_exclusive(x_11);
+if (x_29 == 0)
+{
+lean_object* x_30; lean_object* x_31; 
+x_30 = lean_ctor_get(x_11, 0);
+lean_dec(x_30);
+x_31 = lean_ctor_get(x_12, 0);
+lean_inc(x_31);
 lean_dec(x_12);
-x_19 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_19, 0, x_17);
-lean_ctor_set(x_19, 1, x_18);
+lean_ctor_set(x_11, 0, x_31);
+return x_11;
+}
+else
+{
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_11, 1);
+lean_inc(x_32);
+lean_dec(x_11);
+x_33 = lean_ctor_get(x_12, 0);
+lean_inc(x_33);
+lean_dec(x_12);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_32);
+return x_34;
+}
+}
+}
+else
+{
+uint8_t x_35; 
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_35 = !lean_is_exclusive(x_11);
+if (x_35 == 0)
+{
+return x_11;
+}
+else
+{
+lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_36 = lean_ctor_get(x_11, 0);
+x_37 = lean_ctor_get(x_11, 1);
+lean_inc(x_37);
+lean_inc(x_36);
+lean_dec(x_11);
+x_38 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_38, 0, x_36);
+lean_ctor_set(x_38, 1, x_37);
+return x_38;
+}
+}
+}
+else
+{
+uint8_t x_39; 
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_39 = !lean_is_exclusive(x_7);
+if (x_39 == 0)
+{
+return x_7;
+}
+else
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_ctor_get(x_7, 0);
+x_41 = lean_ctor_get(x_7, 1);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_dec(x_7);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
+}
+}
+}
+}
+lean_object* l___private_Init_Lean_Elab_TermApp_3__elabArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+if (lean_obj_tag(x_3) == 0)
+{
+lean_object* x_7; lean_object* x_8; uint8_t x_9; lean_object* x_10; 
+x_7 = lean_ctor_get(x_3, 0);
+lean_inc(x_7);
+lean_dec(x_3);
+lean_inc(x_4);
+x_8 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_8, 0, x_4);
+x_9 = 1;
+lean_inc(x_5);
+x_10 = l_Lean_Elab_Term_elabTerm(x_7, x_8, x_9, x_9, x_5, x_6);
+if (lean_obj_tag(x_10) == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+lean_dec(x_10);
+x_13 = l___private_Init_Lean_Elab_TermApp_2__ensureArgType(x_1, x_2, x_11, x_4, x_5, x_12);
+return x_13;
+}
+else
+{
+uint8_t x_14; 
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+lean_dec(x_1);
+x_14 = !lean_is_exclusive(x_10);
+if (x_14 == 0)
+{
+return x_10;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_10, 0);
+x_16 = lean_ctor_get(x_10, 1);
+lean_inc(x_16);
+lean_inc(x_15);
+lean_dec(x_10);
+x_17 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_17, 0, x_15);
+lean_ctor_set(x_17, 1, x_16);
+return x_17;
+}
+}
+}
+else
+{
+lean_object* x_18; lean_object* x_19; 
+x_18 = lean_ctor_get(x_3, 0);
+lean_inc(x_18);
+lean_dec(x_3);
+x_19 = l___private_Init_Lean_Elab_TermApp_2__ensureArgType(x_1, x_2, x_18, x_4, x_5, x_6);
 return x_19;
 }
 }
 }
-else
-{
-uint8_t x_20; 
-lean_dec(x_7);
-lean_dec(x_4);
-lean_dec(x_1);
-x_20 = !lean_is_exclusive(x_9);
-if (x_20 == 0)
-{
-return x_9;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_9, 0);
-x_22 = lean_ctor_get(x_9, 1);
-lean_inc(x_22);
-lean_inc(x_21);
-lean_dec(x_9);
-x_23 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_23, 0, x_21);
-lean_ctor_set(x_23, 1, x_22);
-return x_23;
-}
-}
-}
-else
-{
-lean_object* x_24; lean_object* x_25; 
-x_24 = lean_ctor_get(x_2, 0);
-lean_inc(x_24);
-lean_dec(x_2);
-lean_inc(x_4);
-lean_inc(x_24);
-x_25 = l_Lean_Elab_Term_inferType(x_1, x_24, x_4, x_5);
-if (lean_obj_tag(x_25) == 0)
-{
-lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_26 = lean_ctor_get(x_25, 0);
-lean_inc(x_26);
-x_27 = lean_ctor_get(x_25, 1);
-lean_inc(x_27);
-lean_dec(x_25);
-x_28 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_28, 0, x_3);
-x_29 = l_Lean_Elab_Term_ensureHasType(x_1, x_28, x_26, x_24, x_4, x_27);
-return x_29;
-}
-else
-{
-uint8_t x_30; 
-lean_dec(x_24);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_30 = !lean_is_exclusive(x_25);
-if (x_30 == 0)
-{
-return x_25;
-}
-else
-{
-lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_31 = lean_ctor_get(x_25, 0);
-x_32 = lean_ctor_get(x_25, 1);
-lean_inc(x_32);
-lean_inc(x_31);
-lean_dec(x_25);
-x_33 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_33, 0, x_31);
-lean_ctor_set(x_33, 1, x_32);
-return x_33;
-}
-}
-}
-}
-}
-lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -921,7 +1001,7 @@ return x_13;
 }
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__2(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__2(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
@@ -957,7 +1037,7 @@ goto _start;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -965,27 +1045,27 @@ x_1 = lean_mk_string("too many arguments");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__1;
+x_1 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__2;
+x_1 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__4() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -993,27 +1073,27 @@ x_1 = lean_mk_string("explicit parameter '");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__5() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__4;
+x_1 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__4;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__6() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__5;
+x_1 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__5;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__7() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -1021,27 +1101,27 @@ x_1 = lean_mk_string("' is missing, unused named arguments ");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__8() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__7;
+x_1 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__7;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__9() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__8;
+x_1 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__8;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 lean_object* x_12; 
@@ -1068,7 +1148,7 @@ lean_inc(x_43);
 x_44 = lean_ctor_get_uint64(x_13, sizeof(void*)*3);
 lean_dec(x_13);
 x_45 = lean_unsigned_to_nat(0u);
-x_46 = l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__1(x_41, x_6, x_45);
+x_46 = l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__1(x_41, x_6, x_45);
 if (lean_obj_tag(x_46) == 0)
 {
 if (x_4 == 0)
@@ -1155,15 +1235,15 @@ lean_dec(x_7);
 lean_dec(x_3);
 x_73 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_73, 0, x_41);
-x_74 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__6;
+x_74 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__6;
 x_75 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_75, 0, x_74);
 lean_ctor_set(x_75, 1, x_73);
-x_76 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__9;
+x_76 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__9;
 x_77 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_77, 0, x_75);
 lean_ctor_set(x_77, 1, x_76);
-x_78 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__2(x_45, x_6);
+x_78 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__2(x_45, x_6);
 x_79 = l_Array_toList___rarg(x_78);
 lean_dec(x_78);
 x_80 = l_List_toString___at_Lean_Elab_OpenDecl_HasToString___spec__2(x_79);
@@ -1297,8 +1377,9 @@ lean_dec(x_41);
 lean_dec(x_8);
 x_107 = lean_array_fget(x_2, x_5);
 lean_inc(x_10);
+lean_inc(x_9);
 lean_inc(x_1);
-x_108 = l___private_Init_Lean_Elab_TermApp_2__elabArg(x_1, x_107, x_42, x_10, x_14);
+x_108 = l___private_Init_Lean_Elab_TermApp_3__elabArg(x_1, x_9, x_107, x_42, x_10, x_14);
 if (lean_obj_tag(x_108) == 0)
 {
 lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
@@ -1379,15 +1460,15 @@ lean_dec(x_7);
 lean_dec(x_3);
 x_124 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_124, 0, x_41);
-x_125 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__6;
+x_125 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__6;
 x_126 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_126, 0, x_125);
 lean_ctor_set(x_126, 1, x_124);
-x_127 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__9;
+x_127 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__9;
 x_128 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_128, 0, x_126);
 lean_ctor_set(x_128, 1, x_127);
-x_129 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__2(x_45, x_6);
+x_129 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__2(x_45, x_6);
 x_130 = l_Array_toList___rarg(x_129);
 lean_dec(x_129);
 x_131 = l_List_toString___at_Lean_Elab_OpenDecl_HasToString___spec__2(x_130);
@@ -1521,8 +1602,9 @@ lean_dec(x_41);
 lean_dec(x_8);
 x_158 = lean_array_fget(x_2, x_5);
 lean_inc(x_10);
+lean_inc(x_9);
 lean_inc(x_1);
-x_159 = l___private_Init_Lean_Elab_TermApp_2__elabArg(x_1, x_158, x_42, x_10, x_14);
+x_159 = l___private_Init_Lean_Elab_TermApp_3__elabArg(x_1, x_9, x_158, x_42, x_10, x_14);
 if (lean_obj_tag(x_159) == 0)
 {
 lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; 
@@ -1592,8 +1674,9 @@ x_175 = lean_ctor_get(x_173, 1);
 lean_inc(x_175);
 lean_dec(x_173);
 lean_inc(x_10);
+lean_inc(x_9);
 lean_inc(x_1);
-x_176 = l___private_Init_Lean_Elab_TermApp_2__elabArg(x_1, x_175, x_42, x_10, x_14);
+x_176 = l___private_Init_Lean_Elab_TermApp_3__elabArg(x_1, x_9, x_175, x_42, x_10, x_14);
 if (lean_obj_tag(x_176) == 0)
 {
 lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; 
@@ -1665,7 +1748,7 @@ lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_5);
 lean_dec(x_3);
-x_17 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__3;
+x_17 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__3;
 x_18 = l_Lean_Elab_Term_throwError___rarg(x_1, x_17, x_10, x_14);
 return x_18;
 }
@@ -1683,7 +1766,7 @@ lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_3);
-x_21 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__3;
+x_21 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__3;
 x_22 = l_Lean_Elab_Term_throwError___rarg(x_1, x_21, x_10, x_14);
 return x_22;
 }
@@ -1813,47 +1896,47 @@ return x_190;
 }
 }
 }
-lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___spec__1(x_1, x_2, x_3);
+x_4 = l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___spec__1(x_1, x_2, x_3);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 uint8_t x_12; lean_object* x_13; 
 x_12 = lean_unbox(x_4);
 lean_dec(x_4);
-x_13 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main(x_1, x_2, x_3, x_12, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+x_13 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main(x_1, x_2, x_3, x_12, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 lean_dec(x_2);
 return x_13;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 lean_object* x_12; 
-x_12 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+x_12 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 return x_12;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 uint8_t x_12; lean_object* x_13; 
 x_12 = lean_unbox(x_4);
 lean_dec(x_4);
-x_13 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux(x_1, x_2, x_3, x_12, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+x_13 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux(x_1, x_2, x_3, x_12, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 lean_dec(x_2);
 return x_13;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_9; 
@@ -1884,7 +1967,7 @@ lean_inc(x_16);
 lean_dec(x_15);
 x_17 = lean_unsigned_to_nat(0u);
 x_18 = l_Array_empty___closed__1;
-x_19 = l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main(x_1, x_4, x_5, x_6, x_17, x_3, x_18, x_13, x_2, x_7, x_16);
+x_19 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main(x_1, x_4, x_5, x_6, x_17, x_3, x_18, x_13, x_2, x_7, x_16);
 return x_19;
 }
 else
@@ -1945,18 +2028,18 @@ return x_27;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_4__elabAppArgs___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Elab_TermApp_5__elabAppArgs___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 uint8_t x_9; lean_object* x_10; 
 x_9 = lean_unbox(x_6);
 lean_dec(x_6);
-x_10 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_2, x_3, x_4, x_5, x_9, x_7, x_8);
+x_10 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_2, x_3, x_4, x_5, x_9, x_7, x_8);
 lean_dec(x_4);
 return x_10;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 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; 
@@ -1984,15 +2067,15 @@ x_17 = l_Lean_Elab_Term_throwError___rarg(x_1, x_16, x_5, x_6);
 return x_17;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_5__throwLValError(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_TermApp_6__throwLValError(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg), 6, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg), 6, 0);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -2000,27 +2083,27 @@ x_1 = lean_mk_string("invalid field notation, type is not of the form (C ...) wh
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__1;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__2;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__4() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -2028,27 +2111,27 @@ x_1 = lean_mk_string("invalid [..] notation, type is not of the form (C ...) whe
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__5() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__4;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__4;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__6() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__5;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__5;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__7() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -2056,27 +2139,27 @@ x_1 = lean_mk_string("invalid projection, structure has only ");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__8() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__7;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__7;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__9() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__8;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__8;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__10() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__10() {
 _start:
 {
 lean_object* x_1; 
@@ -2084,27 +2167,27 @@ x_1 = lean_mk_string(" field(s)");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__11() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__10;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__10;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__12() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__11;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__11;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__13() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__13() {
 _start:
 {
 lean_object* x_1; 
@@ -2112,27 +2195,27 @@ x_1 = lean_mk_string("invalid projection, structure expected");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__14() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__14() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__13;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__13;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__15() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__15() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__14;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__14;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__16() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__16() {
 _start:
 {
 lean_object* x_1; 
@@ -2140,27 +2223,27 @@ x_1 = lean_mk_string("invalid projection, index must be greater than 0");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__17() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__17() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__16;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__16;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__18() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__18() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__17;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__17;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__19() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__19() {
 _start:
 {
 lean_object* x_1; 
@@ -2168,27 +2251,27 @@ x_1 = lean_mk_string("invalid field notation, '");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__20() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__20() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__19;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__19;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__20;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__20;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__22() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__22() {
 _start:
 {
 lean_object* x_1; 
@@ -2196,27 +2279,27 @@ x_1 = lean_mk_string("' is not a valid \"field\" because environment does not co
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__23() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__23() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__22;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__22;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__23;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__23;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__25() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__25() {
 _start:
 {
 lean_object* x_1; 
@@ -2224,7 +2307,7 @@ x_1 = lean_mk_string("getOp");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__26() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__26() {
 _start:
 {
 lean_object* x_1; 
@@ -2232,27 +2315,27 @@ x_1 = lean_mk_string("invalid [..] notation because environment does not contain
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__27() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__27() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__26;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__26;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__28() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__28() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__27;
+x_1 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__27;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_6__resolveLValAux(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* l___private_Init_Lean_Elab_TermApp_7__resolveLValAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; lean_object* x_13; 
@@ -2297,8 +2380,8 @@ lean_dec(x_21);
 lean_dec(x_19);
 lean_dec(x_15);
 lean_dec(x_14);
-x_44 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__15;
-x_45 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_44, x_5, x_20);
+x_44 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__15;
+x_45 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_44, x_5, x_20);
 x_46 = !lean_is_exclusive(x_45);
 if (x_46 == 0)
 {
@@ -2347,15 +2430,15 @@ x_29 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_29, 0, x_28);
 x_30 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_30, 0, x_29);
-x_31 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__9;
+x_31 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__9;
 x_32 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_32, 0, x_31);
 lean_ctor_set(x_32, 1, x_30);
-x_33 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__12;
+x_33 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__12;
 x_34 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_34, 0, x_32);
 lean_ctor_set(x_34, 1, x_33);
-x_35 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_34, x_5, x_22);
+x_35 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_34, x_5, x_22);
 return x_35;
 }
 else
@@ -2414,7 +2497,7 @@ lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_3);
 lean_dec(x_2);
-x_50 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__18;
+x_50 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__18;
 x_51 = l_Lean_Elab_Term_throwError___rarg(x_1, x_50, x_5, x_6);
 x_52 = !lean_is_exclusive(x_51);
 if (x_52 == 0)
@@ -2494,11 +2577,11 @@ x_76 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_76, 0, x_57);
 x_77 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_77, 0, x_76);
-x_78 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_78 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_79 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_79, 0, x_78);
 lean_ctor_set(x_79, 1, x_77);
-x_80 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_80 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_81 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_81, 0, x_79);
 lean_ctor_set(x_81, 1, x_80);
@@ -2507,11 +2590,11 @@ lean_ctor_set(x_82, 0, x_65);
 x_83 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_83, 0, x_81);
 lean_ctor_set(x_83, 1, x_82);
-x_84 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_84 = l_Lean_Elab_Term_mkConst___closed__4;
 x_85 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_85, 0, x_83);
 lean_ctor_set(x_85, 1, x_84);
-x_86 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_85, x_5, x_73);
+x_86 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_85, x_5, x_73);
 return x_86;
 }
 else
@@ -2554,11 +2637,11 @@ x_93 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_93, 0, x_57);
 x_94 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_94, 0, x_93);
-x_95 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_95 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_96 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_96, 0, x_95);
 lean_ctor_set(x_96, 1, x_94);
-x_97 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_97 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_98 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_98, 0, x_96);
 lean_ctor_set(x_98, 1, x_97);
@@ -2567,11 +2650,11 @@ lean_ctor_set(x_99, 0, x_65);
 x_100 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_100, 0, x_98);
 lean_ctor_set(x_100, 1, x_99);
-x_101 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_101 = l_Lean_Elab_Term_mkConst___closed__4;
 x_102 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_102, 0, x_100);
 lean_ctor_set(x_102, 1, x_101);
-x_103 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_102, x_5, x_73);
+x_103 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_102, x_5, x_73);
 return x_103;
 }
 else
@@ -2632,11 +2715,11 @@ x_111 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_111, 0, x_57);
 x_112 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_112, 0, x_111);
-x_113 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_113 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_114 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_114, 0, x_113);
 lean_ctor_set(x_114, 1, x_112);
-x_115 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_115 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_116 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_116, 0, x_114);
 lean_ctor_set(x_116, 1, x_115);
@@ -2645,11 +2728,11 @@ lean_ctor_set(x_117, 0, x_65);
 x_118 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_118, 0, x_116);
 lean_ctor_set(x_118, 1, x_117);
-x_119 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_119 = l_Lean_Elab_Term_mkConst___closed__4;
 x_120 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_120, 0, x_118);
 lean_ctor_set(x_120, 1, x_119);
-x_121 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_120, x_5, x_108);
+x_121 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_120, x_5, x_108);
 return x_121;
 }
 else
@@ -2693,11 +2776,11 @@ x_129 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_129, 0, x_57);
 x_130 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_130, 0, x_129);
-x_131 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_131 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_132 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_132, 0, x_131);
 lean_ctor_set(x_132, 1, x_130);
-x_133 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_133 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_134 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_134, 0, x_132);
 lean_ctor_set(x_134, 1, x_133);
@@ -2706,11 +2789,11 @@ lean_ctor_set(x_135, 0, x_65);
 x_136 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_136, 0, x_134);
 lean_ctor_set(x_136, 1, x_135);
-x_137 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_137 = l_Lean_Elab_Term_mkConst___closed__4;
 x_138 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_138, 0, x_136);
 lean_ctor_set(x_138, 1, x_137);
-x_139 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_138, x_5, x_108);
+x_139 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_138, x_5, x_108);
 return x_139;
 }
 else
@@ -2799,11 +2882,11 @@ x_159 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_159, 0, x_57);
 x_160 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_160, 0, x_159);
-x_161 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_161 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_162 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_162, 0, x_161);
 lean_ctor_set(x_162, 1, x_160);
-x_163 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_163 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_164 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_164, 0, x_162);
 lean_ctor_set(x_164, 1, x_163);
@@ -2812,11 +2895,11 @@ lean_ctor_set(x_165, 0, x_148);
 x_166 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_166, 0, x_164);
 lean_ctor_set(x_166, 1, x_165);
-x_167 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_167 = l_Lean_Elab_Term_mkConst___closed__4;
 x_168 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_168, 0, x_166);
 lean_ctor_set(x_168, 1, x_167);
-x_169 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_168, x_5, x_156);
+x_169 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_168, x_5, x_156);
 return x_169;
 }
 else
@@ -2859,11 +2942,11 @@ x_176 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_176, 0, x_57);
 x_177 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_177, 0, x_176);
-x_178 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_178 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_179 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_179, 0, x_178);
 lean_ctor_set(x_179, 1, x_177);
-x_180 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_180 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_181 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_181, 0, x_179);
 lean_ctor_set(x_181, 1, x_180);
@@ -2872,11 +2955,11 @@ lean_ctor_set(x_182, 0, x_148);
 x_183 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_183, 0, x_181);
 lean_ctor_set(x_183, 1, x_182);
-x_184 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_184 = l_Lean_Elab_Term_mkConst___closed__4;
 x_185 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_185, 0, x_183);
 lean_ctor_set(x_185, 1, x_184);
-x_186 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_185, x_5, x_156);
+x_186 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_185, x_5, x_156);
 return x_186;
 }
 else
@@ -2937,11 +3020,11 @@ x_194 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_194, 0, x_57);
 x_195 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_195, 0, x_194);
-x_196 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_196 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_197 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_197, 0, x_196);
 lean_ctor_set(x_197, 1, x_195);
-x_198 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_198 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_199 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_199, 0, x_197);
 lean_ctor_set(x_199, 1, x_198);
@@ -2950,11 +3033,11 @@ lean_ctor_set(x_200, 0, x_148);
 x_201 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_201, 0, x_199);
 lean_ctor_set(x_201, 1, x_200);
-x_202 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_202 = l_Lean_Elab_Term_mkConst___closed__4;
 x_203 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_203, 0, x_201);
 lean_ctor_set(x_203, 1, x_202);
-x_204 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_203, x_5, x_191);
+x_204 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_203, x_5, x_191);
 return x_204;
 }
 else
@@ -2998,11 +3081,11 @@ x_212 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_212, 0, x_57);
 x_213 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_213, 0, x_212);
-x_214 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_214 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_215 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_215, 0, x_214);
 lean_ctor_set(x_215, 1, x_213);
-x_216 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_216 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_217 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_217, 0, x_215);
 lean_ctor_set(x_217, 1, x_216);
@@ -3011,11 +3094,11 @@ lean_ctor_set(x_218, 0, x_148);
 x_219 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_219, 0, x_217);
 lean_ctor_set(x_219, 1, x_218);
-x_220 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_220 = l_Lean_Elab_Term_mkConst___closed__4;
 x_221 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_221, 0, x_219);
 lean_ctor_set(x_221, 1, x_220);
-x_222 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_221, x_5, x_191);
+x_222 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_221, x_5, x_191);
 return x_222;
 }
 else
@@ -3135,11 +3218,11 @@ x_246 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_246, 0, x_57);
 x_247 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_247, 0, x_246);
-x_248 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_248 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_249 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_249, 0, x_248);
 lean_ctor_set(x_249, 1, x_247);
-x_250 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_250 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_251 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_251, 0, x_249);
 lean_ctor_set(x_251, 1, x_250);
@@ -3148,11 +3231,11 @@ lean_ctor_set(x_252, 0, x_235);
 x_253 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_253, 0, x_251);
 lean_ctor_set(x_253, 1, x_252);
-x_254 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_254 = l_Lean_Elab_Term_mkConst___closed__4;
 x_255 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_255, 0, x_253);
 lean_ctor_set(x_255, 1, x_254);
-x_256 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_255, x_5, x_242);
+x_256 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_255, x_5, x_242);
 return x_256;
 }
 else
@@ -3201,11 +3284,11 @@ x_264 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_264, 0, x_57);
 x_265 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_265, 0, x_264);
-x_266 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_266 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_267 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_267, 0, x_266);
 lean_ctor_set(x_267, 1, x_265);
-x_268 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_268 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_269 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_269, 0, x_267);
 lean_ctor_set(x_269, 1, x_268);
@@ -3214,11 +3297,11 @@ lean_ctor_set(x_270, 0, x_235);
 x_271 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_271, 0, x_269);
 lean_ctor_set(x_271, 1, x_270);
-x_272 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_272 = l_Lean_Elab_Term_mkConst___closed__4;
 x_273 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_273, 0, x_271);
 lean_ctor_set(x_273, 1, x_272);
-x_274 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_273, x_5, x_242);
+x_274 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_273, x_5, x_242);
 return x_274;
 }
 else
@@ -3319,11 +3402,11 @@ x_294 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_294, 0, x_57);
 x_295 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_295, 0, x_294);
-x_296 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_296 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_297 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_297, 0, x_296);
 lean_ctor_set(x_297, 1, x_295);
-x_298 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_298 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_299 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_299, 0, x_297);
 lean_ctor_set(x_299, 1, x_298);
@@ -3332,11 +3415,11 @@ lean_ctor_set(x_300, 0, x_283);
 x_301 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_301, 0, x_299);
 lean_ctor_set(x_301, 1, x_300);
-x_302 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_302 = l_Lean_Elab_Term_mkConst___closed__4;
 x_303 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_303, 0, x_301);
 lean_ctor_set(x_303, 1, x_302);
-x_304 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_303, x_5, x_290);
+x_304 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_303, x_5, x_290);
 return x_304;
 }
 else
@@ -3385,11 +3468,11 @@ x_312 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_312, 0, x_57);
 x_313 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_313, 0, x_312);
-x_314 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21;
+x_314 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21;
 x_315 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_315, 0, x_314);
 lean_ctor_set(x_315, 1, x_313);
-x_316 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24;
+x_316 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24;
 x_317 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_317, 0, x_315);
 lean_ctor_set(x_317, 1, x_316);
@@ -3398,11 +3481,11 @@ lean_ctor_set(x_318, 0, x_283);
 x_319 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_319, 0, x_317);
 lean_ctor_set(x_319, 1, x_318);
-x_320 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_320 = l_Lean_Elab_Term_mkConst___closed__4;
 x_321 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_321, 0, x_319);
 lean_ctor_set(x_321, 1, x_320);
-x_322 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_321, x_5, x_290);
+x_322 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_321, x_5, x_290);
 return x_322;
 }
 else
@@ -3493,7 +3576,7 @@ if (x_334 == 0)
 lean_object* x_335; lean_object* x_336; lean_object* x_337; lean_object* x_338; lean_object* x_339; 
 x_335 = lean_ctor_get(x_333, 0);
 x_336 = lean_ctor_get(x_333, 1);
-x_337 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__25;
+x_337 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__25;
 x_338 = lean_name_mk_string(x_331, x_337);
 lean_inc(x_338);
 x_339 = lean_environment_find(x_335, x_338);
@@ -3504,15 +3587,15 @@ lean_free_object(x_333);
 lean_dec(x_332);
 x_340 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_340, 0, x_338);
-x_341 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__28;
+x_341 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__28;
 x_342 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_342, 0, x_341);
 lean_ctor_set(x_342, 1, x_340);
-x_343 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_343 = l_Lean_Elab_Term_mkConst___closed__4;
 x_344 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_344, 0, x_342);
 lean_ctor_set(x_344, 1, x_343);
-x_345 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_344, x_5, x_336);
+x_345 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_344, x_5, x_336);
 return x_345;
 }
 else
@@ -3538,7 +3621,7 @@ x_348 = lean_ctor_get(x_333, 1);
 lean_inc(x_348);
 lean_inc(x_347);
 lean_dec(x_333);
-x_349 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__25;
+x_349 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__25;
 x_350 = lean_name_mk_string(x_331, x_349);
 lean_inc(x_350);
 x_351 = lean_environment_find(x_347, x_350);
@@ -3548,15 +3631,15 @@ lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355;
 lean_dec(x_332);
 x_352 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_352, 0, x_350);
-x_353 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__28;
+x_353 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__28;
 x_354 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_354, 0, x_353);
 lean_ctor_set(x_354, 1, x_352);
-x_355 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_355 = l_Lean_Elab_Term_mkConst___closed__4;
 x_356 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_356, 0, x_354);
 lean_ctor_set(x_356, 1, x_355);
-x_357 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_356, x_5, x_348);
+x_357 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_356, x_5, x_348);
 return x_357;
 }
 else
@@ -3594,72 +3677,74 @@ if (lean_obj_tag(x_4) == 2)
 {
 lean_object* x_8; lean_object* x_9; 
 lean_dec(x_4);
-x_8 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__6;
-x_9 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_8, x_5, x_6);
+x_8 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__6;
+x_9 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_8, x_5, x_6);
 return x_9;
 }
 else
 {
 lean_object* x_10; lean_object* x_11; 
 lean_dec(x_4);
-x_10 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__3;
-x_11 = l___private_Init_Lean_Elab_TermApp_5__throwLValError___rarg(x_1, x_2, x_3, x_10, x_5, x_6);
+x_10 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__3;
+x_11 = l___private_Init_Lean_Elab_TermApp_6__throwLValError___rarg(x_1, x_2, x_3, x_10, x_5, x_6);
 return x_11;
 }
 }
 }
 }
-lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_5; uint8_t x_6; 
-x_5 = lean_array_get_size(x_1);
-x_6 = lean_nat_dec_lt(x_2, x_5);
-lean_dec(x_5);
-if (x_6 == 0)
+lean_object* x_6; uint8_t x_7; 
+x_6 = lean_array_get_size(x_2);
+x_7 = lean_nat_dec_lt(x_3, x_6);
+lean_dec(x_6);
+if (x_7 == 0)
 {
-lean_object* x_7; lean_object* x_8; 
-lean_dec(x_2);
-x_7 = lean_box(0);
-x_8 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_8, 0, x_7);
-lean_ctor_set(x_8, 1, x_4);
-return x_8;
+lean_object* x_8; lean_object* x_9; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_8 = lean_box(0);
+x_9 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_9, 0, x_8);
+lean_ctor_set(x_9, 1, x_5);
+return x_9;
 }
 else
 {
-lean_object* x_9; uint8_t x_10; 
-x_9 = lean_array_fget(x_1, x_2);
-x_10 = !lean_is_exclusive(x_4);
+uint8_t x_10; 
+x_10 = !lean_is_exclusive(x_5);
 if (x_10 == 0)
 {
 lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_11 = lean_ctor_get(x_4, 2);
-x_12 = l_PersistentArray_push___rarg(x_11, x_9);
-lean_ctor_set(x_4, 2, x_12);
+x_11 = lean_ctor_get(x_5, 2);
+lean_inc(x_1);
+x_12 = l_PersistentArray_push___rarg(x_11, x_1);
+lean_ctor_set(x_5, 2, x_12);
 x_13 = lean_unsigned_to_nat(1u);
-x_14 = lean_nat_add(x_2, x_13);
-lean_dec(x_2);
-x_2 = x_14;
+x_14 = lean_nat_add(x_3, x_13);
+lean_dec(x_3);
+x_3 = x_14;
 goto _start;
 }
 else
 {
 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; 
-x_16 = lean_ctor_get(x_4, 0);
-x_17 = lean_ctor_get(x_4, 1);
-x_18 = lean_ctor_get(x_4, 2);
-x_19 = lean_ctor_get(x_4, 3);
-x_20 = lean_ctor_get(x_4, 4);
-x_21 = lean_ctor_get(x_4, 5);
+x_16 = lean_ctor_get(x_5, 0);
+x_17 = lean_ctor_get(x_5, 1);
+x_18 = lean_ctor_get(x_5, 2);
+x_19 = lean_ctor_get(x_5, 3);
+x_20 = lean_ctor_get(x_5, 4);
+x_21 = lean_ctor_get(x_5, 5);
 lean_inc(x_21);
 lean_inc(x_20);
 lean_inc(x_19);
 lean_inc(x_18);
 lean_inc(x_17);
 lean_inc(x_16);
-lean_dec(x_4);
-x_22 = l_PersistentArray_push___rarg(x_18, x_9);
+lean_dec(x_5);
+lean_inc(x_1);
+x_22 = l_PersistentArray_push___rarg(x_18, x_1);
 x_23 = lean_alloc_ctor(0, 6, 0);
 lean_ctor_set(x_23, 0, x_16);
 lean_ctor_set(x_23, 1, x_17);
@@ -3668,16 +3753,16 @@ lean_ctor_set(x_23, 3, x_19);
 lean_ctor_set(x_23, 4, x_20);
 lean_ctor_set(x_23, 5, x_21);
 x_24 = lean_unsigned_to_nat(1u);
-x_25 = lean_nat_add(x_2, x_24);
-lean_dec(x_2);
-x_2 = x_25;
-x_4 = x_23;
+x_25 = lean_nat_add(x_3, x_24);
+lean_dec(x_3);
+x_3 = x_25;
+x_5 = x_23;
 goto _start;
 }
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main(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* l___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
@@ -3703,7 +3788,7 @@ lean_inc(x_3);
 lean_inc(x_9);
 lean_inc(x_2);
 lean_inc(x_1);
-x_13 = l___private_Init_Lean_Elab_TermApp_6__resolveLValAux(x_1, x_2, x_9, x_3, x_6, x_12);
+x_13 = l___private_Init_Lean_Elab_TermApp_7__resolveLValAux(x_1, x_2, x_9, x_3, x_6, x_12);
 if (lean_obj_tag(x_13) == 0)
 {
 lean_dec(x_9);
@@ -3716,182 +3801,217 @@ return x_13;
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+lean_object* x_14; lean_object* x_15; 
 x_14 = lean_ctor_get(x_13, 0);
 lean_inc(x_14);
-x_15 = lean_ctor_get(x_13, 1);
+x_15 = lean_ctor_get(x_14, 0);
 lean_inc(x_15);
-lean_dec(x_13);
-x_16 = lean_ctor_get(x_14, 0);
-lean_inc(x_16);
-lean_inc(x_6);
-x_17 = l_Lean_Elab_Term_unfoldDefinition_x3f(x_1, x_9, x_6, x_15);
-if (lean_obj_tag(x_17) == 0)
+if (lean_obj_tag(x_15) == 0)
 {
-lean_object* x_18; 
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
+lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_16 = lean_ctor_get(x_13, 1);
+lean_inc(x_16);
+lean_dec(x_13);
+x_17 = lean_ctor_get(x_15, 0);
+lean_inc(x_17);
+lean_dec(x_15);
+lean_inc(x_6);
+x_18 = l_Lean_Elab_Term_unfoldDefinition_x3f(x_1, x_9, x_6, x_16);
 if (lean_obj_tag(x_18) == 0)
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
-lean_dec(x_16);
+lean_object* x_19; 
+x_19 = lean_ctor_get(x_18, 0);
+lean_inc(x_19);
+if (lean_obj_tag(x_19) == 0)
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; uint8_t x_23; 
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_19 = lean_ctor_get(x_17, 1);
-lean_inc(x_19);
-lean_dec(x_17);
-x_20 = lean_unsigned_to_nat(0u);
-x_21 = l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main___spec__1(x_5, x_20, x_6, x_19);
+x_20 = lean_ctor_get(x_18, 1);
+lean_inc(x_20);
+lean_dec(x_18);
+x_21 = lean_unsigned_to_nat(0u);
+x_22 = l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main___spec__1(x_17, x_5, x_21, x_6, x_20);
 lean_dec(x_6);
 lean_dec(x_5);
-x_22 = !lean_is_exclusive(x_21);
-if (x_22 == 0)
+x_23 = !lean_is_exclusive(x_22);
+if (x_23 == 0)
 {
-lean_object* x_23; 
-x_23 = lean_ctor_get(x_21, 0);
-lean_dec(x_23);
-lean_ctor_set_tag(x_21, 1);
-lean_ctor_set(x_21, 0, x_14);
-return x_21;
+lean_object* x_24; 
+x_24 = lean_ctor_get(x_22, 0);
+lean_dec(x_24);
+lean_ctor_set_tag(x_22, 1);
+lean_ctor_set(x_22, 0, x_14);
+return x_22;
 }
 else
 {
-lean_object* x_24; lean_object* x_25; 
-x_24 = lean_ctor_get(x_21, 1);
-lean_inc(x_24);
-lean_dec(x_21);
-x_25 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_25, 0, x_14);
-lean_ctor_set(x_25, 1, x_24);
-return x_25;
+lean_object* x_25; lean_object* x_26; 
+x_25 = lean_ctor_get(x_22, 1);
+lean_inc(x_25);
+lean_dec(x_22);
+x_26 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_26, 0, x_14);
+lean_ctor_set(x_26, 1, x_25);
+return x_26;
 }
 }
 else
 {
-lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
 lean_dec(x_14);
-x_26 = lean_ctor_get(x_17, 1);
-lean_inc(x_26);
-lean_dec(x_17);
-x_27 = lean_ctor_get(x_18, 0);
+x_27 = lean_ctor_get(x_18, 1);
 lean_inc(x_27);
 lean_dec(x_18);
-x_28 = lean_array_push(x_5, x_16);
-x_4 = x_27;
-x_5 = x_28;
-x_7 = x_26;
+x_28 = lean_ctor_get(x_19, 0);
+lean_inc(x_28);
+lean_dec(x_19);
+x_29 = lean_array_push(x_5, x_17);
+x_4 = x_28;
+x_5 = x_29;
+x_7 = x_27;
 goto _start;
 }
 }
 else
 {
-uint8_t x_30; 
-lean_dec(x_16);
+uint8_t x_31; 
+lean_dec(x_17);
 lean_dec(x_14);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_30 = !lean_is_exclusive(x_17);
-if (x_30 == 0)
+x_31 = !lean_is_exclusive(x_18);
+if (x_31 == 0)
 {
-return x_17;
+return x_18;
 }
 else
 {
-lean_object* x_31; lean_object* x_32; lean_object* x_33; 
-x_31 = lean_ctor_get(x_17, 0);
-x_32 = lean_ctor_get(x_17, 1);
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_18, 0);
+x_33 = lean_ctor_get(x_18, 1);
+lean_inc(x_33);
 lean_inc(x_32);
-lean_inc(x_31);
-lean_dec(x_17);
-x_33 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_33, 0, x_31);
-lean_ctor_set(x_33, 1, x_32);
-return x_33;
-}
+lean_dec(x_18);
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+return x_34;
 }
 }
 }
 else
 {
-uint8_t x_34; 
+uint8_t x_35; 
 lean_dec(x_9);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_34 = !lean_is_exclusive(x_11);
-if (x_34 == 0)
+x_35 = !lean_is_exclusive(x_13);
+if (x_35 == 0)
 {
-return x_11;
+lean_object* x_36; 
+x_36 = lean_ctor_get(x_13, 0);
+lean_dec(x_36);
+return x_13;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; 
-x_35 = lean_ctor_get(x_11, 0);
-x_36 = lean_ctor_get(x_11, 1);
-lean_inc(x_36);
-lean_inc(x_35);
-lean_dec(x_11);
-x_37 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_37, 0, x_35);
-lean_ctor_set(x_37, 1, x_36);
-return x_37;
+lean_object* x_37; lean_object* x_38; 
+x_37 = lean_ctor_get(x_13, 1);
+lean_inc(x_37);
+lean_dec(x_13);
+x_38 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_38, 0, x_14);
+lean_ctor_set(x_38, 1, x_37);
+return x_38;
+}
 }
 }
 }
 else
 {
-uint8_t x_38; 
+uint8_t x_39; 
+lean_dec(x_9);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_38 = !lean_is_exclusive(x_8);
-if (x_38 == 0)
+x_39 = !lean_is_exclusive(x_11);
+if (x_39 == 0)
+{
+return x_11;
+}
+else
+{
+lean_object* x_40; lean_object* x_41; lean_object* x_42; 
+x_40 = lean_ctor_get(x_11, 0);
+x_41 = lean_ctor_get(x_11, 1);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_dec(x_11);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_40);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
+}
+}
+}
+else
+{
+uint8_t x_43; 
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_43 = !lean_is_exclusive(x_8);
+if (x_43 == 0)
 {
 return x_8;
 }
 else
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; 
-x_39 = lean_ctor_get(x_8, 0);
-x_40 = lean_ctor_get(x_8, 1);
-lean_inc(x_40);
-lean_inc(x_39);
+lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_44 = lean_ctor_get(x_8, 0);
+x_45 = lean_ctor_get(x_8, 1);
+lean_inc(x_45);
+lean_inc(x_44);
 lean_dec(x_8);
-x_41 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_41, 0, x_39);
-lean_ctor_set(x_41, 1, x_40);
-return x_41;
+x_46 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_46, 0, x_44);
+lean_ctor_set(x_46, 1, x_45);
+return x_46;
 }
 }
 }
 }
-lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_5; 
-x_5 = l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main___spec__1(x_1, x_2, x_3, x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-return x_5;
+lean_object* x_6; 
+x_6 = l_Array_forMAux___main___at___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main___spec__1(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_4);
+lean_dec(x_2);
+return x_6;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_7__resolveLValLoop(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* l___private_Init_Lean_Elab_TermApp_8__resolveLValLoop(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_8__resolveLVal(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_TermApp_9__resolveLVal(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; 
@@ -3907,7 +4027,7 @@ x_8 = lean_ctor_get(x_6, 1);
 lean_inc(x_8);
 lean_dec(x_6);
 x_9 = l_Array_empty___closed__1;
-x_10 = l___private_Init_Lean_Elab_TermApp_7__resolveLValLoop___main(x_1, x_2, x_3, x_7, x_9, x_4, x_8);
+x_10 = l___private_Init_Lean_Elab_TermApp_8__resolveLValLoop___main(x_1, x_2, x_3, x_7, x_9, x_4, x_8);
 return x_10;
 }
 else
@@ -3938,7 +4058,7 @@ return x_14;
 }
 }
 }
-lean_object* _init_l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__1() {
+lean_object* _init_l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -3946,17 +4066,17 @@ x_1 = lean_mk_string("self");
 return x_1;
 }
 }
-lean_object* _init_l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2() {
+lean_object* _init_l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__1;
+x_2 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 if (lean_obj_tag(x_3) == 0)
@@ -3991,7 +4111,7 @@ lean_inc(x_12);
 lean_dec(x_10);
 x_13 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_13, 0, x_2);
-x_14 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2;
+x_14 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2;
 x_15 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_15, 0, x_14);
 lean_ctor_set(x_15, 1, x_13);
@@ -4002,7 +4122,7 @@ x_19 = l_Array_empty___closed__1;
 x_20 = 0;
 lean_inc(x_4);
 lean_inc(x_1);
-x_21 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_11, x_17, x_19, x_18, x_20, x_4, x_12);
+x_21 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_11, x_17, x_19, x_18, x_20, x_4, x_12);
 if (lean_obj_tag(x_21) == 0)
 {
 lean_object* x_22; lean_object* x_23; 
@@ -4071,7 +4191,7 @@ return x_32;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -4079,27 +4199,27 @@ x_1 = lean_mk_string("failed to access field in parent structure");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__1;
+x_1 = l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__2;
+x_1 = l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections(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* l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
@@ -4114,7 +4234,7 @@ if (lean_obj_tag(x_10) == 0)
 {
 lean_object* x_11; lean_object* x_12; 
 lean_dec(x_4);
-x_11 = l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__3;
+x_11 = l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__3;
 x_12 = l_Lean_Elab_Term_throwError___rarg(x_1, x_11, x_5, x_9);
 return x_12;
 }
@@ -4124,21 +4244,21 @@ lean_object* x_13; lean_object* x_14;
 x_13 = lean_ctor_get(x_10, 0);
 lean_inc(x_13);
 lean_dec(x_10);
-x_14 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1(x_1, x_4, x_13, x_5, x_9);
+x_14 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1(x_1, x_4, x_13, x_5, x_9);
 return x_14;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_2);
 return x_7;
 }
 }
-lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_10__addLValArg___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_11__addLValArg___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -4180,7 +4300,7 @@ return x_13;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -4188,27 +4308,27 @@ x_1 = lean_mk_string("invalid field notation, function '");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__1;
+x_1 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__2;
+x_1 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__4() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -4216,27 +4336,27 @@ x_1 = lean_mk_string("' does not have explicit argument with type (");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__5() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__4;
+x_1 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__4;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__6() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__5;
+x_1 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__5;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__7() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -4244,27 +4364,27 @@ x_1 = lean_mk_string(" ...)");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__8() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__7;
+x_1 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__7;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__9() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__8;
+x_1 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__8;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__10() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__10() {
 _start:
 {
 lean_object* x_1; 
@@ -4272,27 +4392,27 @@ x_1 = lean_mk_string("invalid field notation, insufficient number of arguments f
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__11() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__10;
+x_1 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__10;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__12() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__11;
+x_1 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__11;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; 
@@ -4314,7 +4434,7 @@ else
 {
 lean_object* x_30; lean_object* x_31; 
 x_30 = lean_unsigned_to_nat(0u);
-x_31 = l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_10__addLValArg___main___spec__1(x_23, x_7, x_30);
+x_31 = l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_11__addLValArg___main___spec__1(x_23, x_7, x_30);
 if (lean_obj_tag(x_31) == 0)
 {
 lean_object* x_32; uint8_t x_33; 
@@ -4337,11 +4457,11 @@ lean_dec(x_4);
 lean_dec(x_2);
 x_36 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_36, 0, x_3);
-x_37 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__12;
+x_37 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__12;
 x_38 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_38, 0, x_37);
 lean_ctor_set(x_38, 1, x_36);
-x_39 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg___closed__8;
+x_39 = l_Lean_Elab_Term_mkConst___closed__4;
 x_40 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_40, 0, x_38);
 lean_ctor_set(x_40, 1, x_39);
@@ -4408,11 +4528,11 @@ lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean
 lean_dec(x_11);
 x_12 = lean_alloc_ctor(4, 1, 0);
 lean_ctor_set(x_12, 0, x_3);
-x_13 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__3;
+x_13 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__3;
 x_14 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_14, 0, x_13);
 lean_ctor_set(x_14, 1, x_12);
-x_15 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__6;
+x_15 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__6;
 x_16 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_16, 0, x_14);
 lean_ctor_set(x_16, 1, x_15);
@@ -4421,7 +4541,7 @@ lean_ctor_set(x_17, 0, x_2);
 x_18 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_18, 0, x_16);
 lean_ctor_set(x_18, 1, x_17);
-x_19 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__9;
+x_19 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__9;
 x_20 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_20, 0, x_18);
 lean_ctor_set(x_20, 1, x_19);
@@ -4430,43 +4550,43 @@ return x_21;
 }
 }
 }
-lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_10__addLValArg___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_11__addLValArg___main___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_10__addLValArg___main___spec__1(x_1, x_2, x_3);
+x_4 = l_Array_findIdxAux___main___at___private_Init_Lean_Elab_TermApp_11__addLValArg___main___spec__1(x_1, x_2, x_3);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; 
-x_11 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_11 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_8);
 return x_11;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; 
-x_11 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_11 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_11;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_10__addLValArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Elab_TermApp_11__addLValArg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; 
-x_11 = l___private_Init_Lean_Elab_TermApp_10__addLValArg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_11 = l___private_Init_Lean_Elab_TermApp_11__addLValArg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 lean_dec(x_8);
 return x_11;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -4474,23 +4594,23 @@ x_1 = lean_mk_string("idx");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__1;
+x_2 = l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 if (lean_obj_tag(x_7) == 0)
 {
 lean_object* x_10; 
-x_10 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_6, x_2, x_3, x_4, x_5, x_8, x_9);
+x_10 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_6, x_2, x_3, x_4, x_5, x_8, x_9);
 lean_dec(x_3);
 return x_10;
 }
@@ -4505,7 +4625,7 @@ lean_dec(x_7);
 lean_inc(x_8);
 lean_inc(x_6);
 lean_inc(x_1);
-x_13 = l___private_Init_Lean_Elab_TermApp_8__resolveLVal(x_1, x_6, x_11, x_8, x_9);
+x_13 = l___private_Init_Lean_Elab_TermApp_9__resolveLVal(x_1, x_6, x_11, x_8, x_9);
 if (lean_obj_tag(x_13) == 0)
 {
 lean_object* x_14; 
@@ -4527,7 +4647,7 @@ lean_inc(x_18);
 lean_dec(x_14);
 lean_inc(x_8);
 lean_inc(x_1);
-x_19 = l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections(x_1, x_16, x_17, x_6, x_8, x_15);
+x_19 = l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections(x_1, x_16, x_17, x_6, x_8, x_15);
 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; 
@@ -4556,7 +4676,7 @@ if (x_27 == 0)
 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; uint8_t x_35; lean_object* x_36; 
 x_28 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_28, 0, x_20);
-x_29 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2;
+x_29 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2;
 x_30 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -4567,7 +4687,7 @@ x_34 = l_Array_empty___closed__1;
 x_35 = 0;
 lean_inc(x_8);
 lean_inc(x_1);
-x_36 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_25, x_32, x_34, x_33, x_35, x_8, x_26);
+x_36 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_25, x_32, x_34, x_33, x_35, x_8, x_26);
 if (lean_obj_tag(x_36) == 0)
 {
 lean_object* x_37; lean_object* x_38; 
@@ -4616,7 +4736,7 @@ lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47;
 lean_dec(x_12);
 x_44 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_44, 0, x_20);
-x_45 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2;
+x_45 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2;
 x_46 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_46, 0, x_45);
 lean_ctor_set(x_46, 1, x_44);
@@ -4631,7 +4751,7 @@ lean_inc(x_48);
 x_49 = lean_ctor_get(x_47, 1);
 lean_inc(x_49);
 lean_dec(x_47);
-x_50 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_25, x_48, x_3, x_4, x_5, x_8, x_49);
+x_50 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_25, x_48, x_3, x_4, x_5, x_8, x_49);
 lean_dec(x_3);
 return x_50;
 }
@@ -4781,7 +4901,7 @@ x_80 = l_Array_empty___closed__1;
 x_81 = 0;
 lean_inc(x_8);
 lean_inc(x_1);
-x_82 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_73, x_80, x_78, x_79, x_81, x_8, x_74);
+x_82 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_73, x_80, x_78, x_79, x_81, x_8, x_74);
 lean_dec(x_78);
 if (lean_obj_tag(x_82) == 0)
 {
@@ -4844,7 +4964,7 @@ x_93 = lean_unsigned_to_nat(0u);
 lean_inc(x_8);
 lean_inc(x_2);
 lean_inc(x_1);
-x_94 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main(x_1, x_69, x_70, x_6, x_3, x_93, x_2, x_91, x_8, x_92);
+x_94 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main(x_1, x_69, x_70, x_6, x_3, x_93, x_2, x_91, x_8, x_92);
 lean_dec(x_91);
 if (lean_obj_tag(x_94) == 0)
 {
@@ -4854,7 +4974,7 @@ lean_inc(x_95);
 x_96 = lean_ctor_get(x_94, 1);
 lean_inc(x_96);
 lean_dec(x_94);
-x_97 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_73, x_2, x_95, x_4, x_5, x_8, x_96);
+x_97 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_73, x_2, x_95, x_4, x_5, x_8, x_96);
 lean_dec(x_95);
 return x_97;
 }
@@ -4979,7 +5099,7 @@ x_119 = l_Array_empty___closed__1;
 x_120 = 0;
 lean_inc(x_8);
 lean_inc(x_1);
-x_121 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_113, x_119, x_117, x_118, x_120, x_8, x_110);
+x_121 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_113, x_119, x_117, x_118, x_120, x_8, x_110);
 lean_dec(x_117);
 if (lean_obj_tag(x_121) == 0)
 {
@@ -5042,7 +5162,7 @@ x_132 = lean_unsigned_to_nat(0u);
 lean_inc(x_8);
 lean_inc(x_2);
 lean_inc(x_1);
-x_133 = l___private_Init_Lean_Elab_TermApp_10__addLValArg___main(x_1, x_111, x_112, x_6, x_3, x_132, x_2, x_130, x_8, x_131);
+x_133 = l___private_Init_Lean_Elab_TermApp_11__addLValArg___main(x_1, x_111, x_112, x_6, x_3, x_132, x_2, x_130, x_8, x_131);
 lean_dec(x_130);
 if (lean_obj_tag(x_133) == 0)
 {
@@ -5052,7 +5172,7 @@ lean_inc(x_134);
 x_135 = lean_ctor_get(x_133, 1);
 lean_inc(x_135);
 lean_dec(x_133);
-x_136 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_113, x_2, x_134, x_4, x_5, x_8, x_135);
+x_136 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_113, x_2, x_134, x_4, x_5, x_8, x_135);
 lean_dec(x_134);
 return x_136;
 }
@@ -5146,13 +5266,13 @@ if (x_152 == 0)
 lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; uint8_t x_164; lean_object* x_165; 
 x_153 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_153, 0, x_6);
-x_154 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2;
+x_154 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2;
 x_155 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_155, 0, x_154);
 lean_ctor_set(x_155, 1, x_153);
 x_156 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_156, 0, x_147);
-x_157 = l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__2;
+x_157 = l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__2;
 x_158 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_158, 0, x_157);
 lean_ctor_set(x_158, 1, x_156);
@@ -5164,7 +5284,7 @@ x_163 = l_Array_empty___closed__1;
 x_164 = 0;
 lean_inc(x_8);
 lean_inc(x_1);
-x_165 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_150, x_161, x_163, x_162, x_164, x_8, x_151);
+x_165 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_150, x_161, x_163, x_162, x_164, x_8, x_151);
 if (lean_obj_tag(x_165) == 0)
 {
 lean_object* x_166; lean_object* x_167; 
@@ -5213,7 +5333,7 @@ lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176;
 lean_dec(x_12);
 x_173 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_173, 0, x_6);
-x_174 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2;
+x_174 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2;
 x_175 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_175, 0, x_174);
 lean_ctor_set(x_175, 1, x_173);
@@ -5230,7 +5350,7 @@ lean_inc(x_178);
 lean_dec(x_176);
 x_179 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_179, 0, x_147);
-x_180 = l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__2;
+x_180 = l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__2;
 x_181 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_181, 0, x_180);
 lean_ctor_set(x_181, 1, x_179);
@@ -5245,7 +5365,7 @@ lean_inc(x_183);
 x_184 = lean_ctor_get(x_182, 1);
 lean_inc(x_184);
 lean_dec(x_182);
-x_185 = l___private_Init_Lean_Elab_TermApp_4__elabAppArgs(x_1, x_150, x_183, x_3, x_4, x_5, x_8, x_184);
+x_185 = l___private_Init_Lean_Elab_TermApp_5__elabAppArgs(x_1, x_150, x_183, x_3, x_4, x_5, x_8, x_184);
 lean_dec(x_3);
 return x_185;
 }
@@ -5372,35 +5492,35 @@ return x_201;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 uint8_t x_10; lean_object* x_11; 
 x_10 = lean_unbox(x_5);
 lean_dec(x_5);
-x_11 = l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main(x_1, x_2, x_3, x_4, x_10, x_6, x_7, x_8, x_9);
+x_11 = l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main(x_1, x_2, x_3, x_4, x_10, x_6, x_7, x_8, x_9);
 return x_11;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 lean_object* x_10; 
-x_10 = l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+x_10 = l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 return x_10;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 uint8_t x_10; lean_object* x_11; 
 x_10 = lean_unbox(x_5);
 lean_dec(x_5);
-x_11 = l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux(x_1, x_2, x_3, x_4, x_10, x_6, x_7, x_8, x_9);
+x_11 = l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux(x_1, x_2, x_3, x_4, x_10, x_6, x_7, x_8, x_9);
 return x_11;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -5408,27 +5528,27 @@ x_1 = lean_mk_string("invalid use of field notation with `@` modifier");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__1;
+x_1 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__2;
+x_1 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 uint8_t x_10; 
@@ -5438,7 +5558,7 @@ if (x_10 == 0)
 if (x_7 == 0)
 {
 lean_object* x_11; 
-x_11 = l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main(x_1, x_4, x_5, x_6, x_7, x_2, x_3, x_8, x_9);
+x_11 = l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main(x_1, x_4, x_5, x_6, x_7, x_2, x_3, x_8, x_9);
 return x_11;
 }
 else
@@ -5449,7 +5569,7 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_12 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__3;
+x_12 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__3;
 x_13 = l_Lean_Elab_Term_throwError___rarg(x_1, x_12, x_8, x_9);
 x_14 = !lean_is_exclusive(x_13);
 if (x_14 == 0)
@@ -5474,18 +5594,18 @@ return x_17;
 else
 {
 lean_object* x_18; 
-x_18 = l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main(x_1, x_4, x_5, x_6, x_7, x_2, x_3, x_8, x_9);
+x_18 = l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main(x_1, x_4, x_5, x_6, x_7, x_2, x_3, x_8, x_9);
 return x_18;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 uint8_t x_10; lean_object* x_11; 
 x_10 = lean_unbox(x_7);
 lean_dec(x_7);
-x_11 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_2, x_3, x_4, x_5, x_6, x_10, x_8, x_9);
+x_11 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_2, x_3, x_4, x_5, x_6, x_10, x_8, x_9);
 return x_11;
 }
 }
@@ -5597,7 +5717,7 @@ lean_dec(x_1);
 return x_4;
 }
 }
-lean_object* l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__1(lean_object* x_1) {
+lean_object* l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__1(lean_object* x_1) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -5617,7 +5737,7 @@ x_4 = lean_ctor_get(x_1, 0);
 x_5 = lean_ctor_get(x_1, 1);
 x_6 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_6, 0, x_4);
-x_7 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__1(x_5);
+x_7 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__1(x_5);
 lean_ctor_set(x_1, 1, x_7);
 lean_ctor_set(x_1, 0, x_6);
 return x_1;
@@ -5632,7 +5752,7 @@ lean_inc(x_8);
 lean_dec(x_1);
 x_10 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_10, 0, x_8);
-x_11 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__1(x_9);
+x_11 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__1(x_9);
 x_12 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
@@ -5641,7 +5761,7 @@ return x_12;
 }
 }
 }
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 if (lean_obj_tag(x_8) == 0)
@@ -5671,7 +5791,7 @@ lean_inc(x_14);
 x_15 = lean_ctor_get(x_12, 1);
 lean_inc(x_15);
 lean_dec(x_12);
-x_16 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__1(x_15);
+x_16 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__1(x_15);
 lean_inc(x_2);
 x_17 = l_List_append___rarg(x_16, x_2);
 lean_inc(x_10);
@@ -5680,7 +5800,7 @@ lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_1);
-x_18 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_14, x_17, x_3, x_4, x_5, x_6, x_9, x_10);
+x_18 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_14, x_17, x_3, x_4, x_5, x_6, x_9, x_10);
 if (lean_obj_tag(x_18) == 0)
 {
 uint8_t x_19; 
@@ -5717,43 +5837,49 @@ x_27 = lean_ctor_get(x_18, 0);
 lean_inc(x_27);
 if (lean_obj_tag(x_27) == 0)
 {
-uint8_t x_28; 
-x_28 = !lean_is_exclusive(x_18);
-if (x_28 == 0)
+lean_object* x_28; 
+x_28 = lean_ctor_get(x_27, 0);
+lean_inc(x_28);
+if (lean_obj_tag(x_28) == 0)
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_18, 0);
-lean_dec(x_29);
-x_30 = lean_ctor_get(x_27, 0);
-lean_inc(x_30);
+uint8_t x_29; 
 lean_dec(x_27);
-lean_ctor_set(x_18, 0, x_30);
-x_31 = lean_array_push(x_7, x_18);
-x_7 = x_31;
+x_29 = !lean_is_exclusive(x_18);
+if (x_29 == 0)
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_18, 0);
+lean_dec(x_30);
+x_31 = lean_ctor_get(x_28, 0);
+lean_inc(x_31);
+lean_dec(x_28);
+lean_ctor_set(x_18, 0, x_31);
+x_32 = lean_array_push(x_7, x_18);
+x_7 = x_32;
 x_8 = x_13;
 goto _start;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_33 = lean_ctor_get(x_18, 1);
-lean_inc(x_33);
-lean_dec(x_18);
-x_34 = lean_ctor_get(x_27, 0);
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_34 = lean_ctor_get(x_18, 1);
 lean_inc(x_34);
-lean_dec(x_27);
-x_35 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_35, 0, x_34);
-lean_ctor_set(x_35, 1, x_33);
-x_36 = lean_array_push(x_7, x_35);
-x_7 = x_36;
+lean_dec(x_18);
+x_35 = lean_ctor_get(x_28, 0);
+lean_inc(x_35);
+lean_dec(x_28);
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_34);
+x_37 = lean_array_push(x_7, x_36);
+x_7 = x_37;
 x_8 = x_13;
 goto _start;
 }
 }
 else
 {
-uint8_t x_38; 
+uint8_t x_39; 
 lean_dec(x_13);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -5763,31 +5889,64 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_38 = !lean_is_exclusive(x_18);
-if (x_38 == 0)
+x_39 = !lean_is_exclusive(x_18);
+if (x_39 == 0)
 {
-lean_object* x_39; 
-x_39 = lean_ctor_get(x_18, 0);
-lean_dec(x_39);
+lean_object* x_40; 
+x_40 = lean_ctor_get(x_18, 0);
+lean_dec(x_40);
 return x_18;
 }
 else
 {
-lean_object* x_40; lean_object* x_41; 
-x_40 = lean_ctor_get(x_18, 1);
-lean_inc(x_40);
+lean_object* x_41; lean_object* x_42; 
+x_41 = lean_ctor_get(x_18, 1);
+lean_inc(x_41);
 lean_dec(x_18);
-x_41 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_41, 0, x_27);
-lean_ctor_set(x_41, 1, x_40);
-return x_41;
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_27);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
+}
+}
+}
+else
+{
+uint8_t x_43; 
+lean_dec(x_13);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_43 = !lean_is_exclusive(x_18);
+if (x_43 == 0)
+{
+lean_object* x_44; 
+x_44 = lean_ctor_get(x_18, 0);
+lean_dec(x_44);
+return x_18;
+}
+else
+{
+lean_object* x_45; lean_object* x_46; 
+x_45 = lean_ctor_get(x_18, 1);
+lean_inc(x_45);
+lean_dec(x_18);
+x_46 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_46, 0, x_27);
+lean_ctor_set(x_46, 1, x_45);
+return x_46;
 }
 }
 }
 }
 }
 }
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, uint8_t x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 if (lean_obj_tag(x_8) == 0)
@@ -5817,7 +5976,7 @@ lean_inc(x_14);
 x_15 = lean_ctor_get(x_12, 1);
 lean_inc(x_15);
 lean_dec(x_12);
-x_16 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__1(x_15);
+x_16 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__1(x_15);
 lean_inc(x_2);
 x_17 = l_List_append___rarg(x_16, x_2);
 lean_inc(x_10);
@@ -5826,7 +5985,7 @@ lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_1);
-x_18 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_14, x_17, x_3, x_4, x_5, x_6, x_9, x_10);
+x_18 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_14, x_17, x_3, x_4, x_5, x_6, x_9, x_10);
 if (lean_obj_tag(x_18) == 0)
 {
 uint8_t x_19; 
@@ -5863,43 +6022,49 @@ x_27 = lean_ctor_get(x_18, 0);
 lean_inc(x_27);
 if (lean_obj_tag(x_27) == 0)
 {
-uint8_t x_28; 
-x_28 = !lean_is_exclusive(x_18);
-if (x_28 == 0)
+lean_object* x_28; 
+x_28 = lean_ctor_get(x_27, 0);
+lean_inc(x_28);
+if (lean_obj_tag(x_28) == 0)
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_18, 0);
-lean_dec(x_29);
-x_30 = lean_ctor_get(x_27, 0);
-lean_inc(x_30);
+uint8_t x_29; 
 lean_dec(x_27);
-lean_ctor_set(x_18, 0, x_30);
-x_31 = lean_array_push(x_7, x_18);
-x_7 = x_31;
+x_29 = !lean_is_exclusive(x_18);
+if (x_29 == 0)
+{
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_18, 0);
+lean_dec(x_30);
+x_31 = lean_ctor_get(x_28, 0);
+lean_inc(x_31);
+lean_dec(x_28);
+lean_ctor_set(x_18, 0, x_31);
+x_32 = lean_array_push(x_7, x_18);
+x_7 = x_32;
 x_8 = x_13;
 goto _start;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_33 = lean_ctor_get(x_18, 1);
-lean_inc(x_33);
-lean_dec(x_18);
-x_34 = lean_ctor_get(x_27, 0);
+lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_34 = lean_ctor_get(x_18, 1);
 lean_inc(x_34);
-lean_dec(x_27);
-x_35 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_35, 0, x_34);
-lean_ctor_set(x_35, 1, x_33);
-x_36 = lean_array_push(x_7, x_35);
-x_7 = x_36;
+lean_dec(x_18);
+x_35 = lean_ctor_get(x_28, 0);
+lean_inc(x_35);
+lean_dec(x_28);
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_34);
+x_37 = lean_array_push(x_7, x_36);
+x_7 = x_37;
 x_8 = x_13;
 goto _start;
 }
 }
 else
 {
-uint8_t x_38; 
+uint8_t x_39; 
 lean_dec(x_13);
 lean_dec(x_10);
 lean_dec(x_9);
@@ -5909,31 +6074,64 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_38 = !lean_is_exclusive(x_18);
-if (x_38 == 0)
+x_39 = !lean_is_exclusive(x_18);
+if (x_39 == 0)
 {
-lean_object* x_39; 
-x_39 = lean_ctor_get(x_18, 0);
-lean_dec(x_39);
+lean_object* x_40; 
+x_40 = lean_ctor_get(x_18, 0);
+lean_dec(x_40);
 return x_18;
 }
 else
 {
-lean_object* x_40; lean_object* x_41; 
-x_40 = lean_ctor_get(x_18, 1);
-lean_inc(x_40);
+lean_object* x_41; lean_object* x_42; 
+x_41 = lean_ctor_get(x_18, 1);
+lean_inc(x_41);
 lean_dec(x_18);
-x_41 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_41, 0, x_27);
-lean_ctor_set(x_41, 1, x_40);
-return x_41;
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_27);
+lean_ctor_set(x_42, 1, x_41);
+return x_42;
+}
+}
+}
+else
+{
+uint8_t x_43; 
+lean_dec(x_13);
+lean_dec(x_10);
+lean_dec(x_9);
+lean_dec(x_7);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+x_43 = !lean_is_exclusive(x_18);
+if (x_43 == 0)
+{
+lean_object* x_44; 
+x_44 = lean_ctor_get(x_18, 0);
+lean_dec(x_44);
+return x_18;
+}
+else
+{
+lean_object* x_45; lean_object* x_46; 
+x_45 = lean_ctor_get(x_18, 1);
+lean_inc(x_45);
+lean_dec(x_18);
+x_46 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_46, 0, x_27);
+lean_ctor_set(x_46, 1, x_45);
+return x_46;
 }
 }
 }
 }
 }
 }
-lean_object* l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__4(lean_object* x_1) {
+lean_object* l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__4(lean_object* x_1) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -5955,7 +6153,7 @@ x_6 = l_Lean_Name_toString___closed__1;
 x_7 = l_Lean_Name_toStringWithSep___main(x_6, x_4);
 x_8 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_8, 0, x_7);
-x_9 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__4(x_5);
+x_9 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__4(x_5);
 lean_ctor_set(x_1, 1, x_9);
 lean_ctor_set(x_1, 0, x_8);
 return x_1;
@@ -5972,7 +6170,7 @@ x_12 = l_Lean_Name_toString___closed__1;
 x_13 = l_Lean_Name_toStringWithSep___main(x_12, x_10);
 x_14 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_14, 0, x_13);
-x_15 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__4(x_11);
+x_15 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__4(x_11);
 x_16 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_16, 0, x_14);
 lean_ctor_set(x_16, 1, x_15);
@@ -5981,7 +6179,7 @@ return x_16;
 }
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__5(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
 lean_object* x_13; uint8_t x_14; 
@@ -6016,7 +6214,7 @@ lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_3);
 lean_inc(x_1);
-x_19 = l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main(x_1, x_16, x_3, x_4, x_5, x_6, x_7, x_10, x_11, x_12);
+x_19 = l___private_Init_Lean_Elab_TermApp_14__elabAppFn___main(x_1, x_16, x_3, x_4, x_5, x_6, x_7, x_10, x_11, x_12);
 if (lean_obj_tag(x_19) == 0)
 {
 lean_object* x_20; lean_object* x_21; 
@@ -6062,17 +6260,7 @@ return x_26;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_identFn___rarg___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Elab_TermApp_14__elabAppFn___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; lean_object* x_12; uint8_t x_13; 
@@ -6083,256 +6271,320 @@ x_13 = lean_name_eq(x_11, x_12);
 lean_dec(x_11);
 if (x_13 == 0)
 {
-lean_object* x_14; lean_object* x_207; lean_object* x_319; uint8_t x_320; 
-x_319 = l_Lean_Parser_Term_explicit___elambda__1___closed__2;
+lean_object* x_14; lean_object* x_233; lean_object* x_354; uint8_t x_355; 
+x_354 = l_Lean_Parser_Term_explicit___elambda__1___closed__2;
 lean_inc(x_2);
-x_320 = l_Lean_Syntax_isOfKind(x_2, x_319);
-if (x_320 == 0)
+x_355 = l_Lean_Syntax_isOfKind(x_2, x_354);
+if (x_355 == 0)
 {
-lean_object* x_321; 
-x_321 = lean_box(0);
-x_207 = x_321;
-goto block_318;
+lean_object* x_356; 
+x_356 = lean_box(0);
+x_233 = x_356;
+goto block_353;
 }
 else
 {
-lean_object* x_322; lean_object* x_323; lean_object* x_324; uint8_t x_325; 
-x_322 = l_Lean_Syntax_getArgs(x_2);
-x_323 = lean_array_get_size(x_322);
-lean_dec(x_322);
-x_324 = lean_unsigned_to_nat(2u);
-x_325 = lean_nat_dec_eq(x_323, x_324);
-lean_dec(x_323);
-if (x_325 == 0)
+lean_object* x_357; lean_object* x_358; lean_object* x_359; uint8_t x_360; 
+x_357 = l_Lean_Syntax_getArgs(x_2);
+x_358 = lean_array_get_size(x_357);
+lean_dec(x_357);
+x_359 = lean_unsigned_to_nat(2u);
+x_360 = lean_nat_dec_eq(x_358, x_359);
+lean_dec(x_358);
+if (x_360 == 0)
 {
-lean_object* x_326; 
-x_326 = lean_box(0);
-x_207 = x_326;
-goto block_318;
+lean_object* x_361; 
+x_361 = lean_box(0);
+x_233 = x_361;
+goto block_353;
 }
 else
 {
-lean_object* x_327; lean_object* x_328; lean_object* x_329; uint8_t x_330; 
-x_327 = lean_unsigned_to_nat(1u);
-x_328 = l_Lean_Syntax_getArg(x_2, x_327);
-x_329 = l_Lean_Parser_Term_id___elambda__1___closed__2;
-lean_inc(x_328);
-x_330 = l_Lean_Syntax_isOfKind(x_328, x_329);
-if (x_330 == 0)
+lean_object* x_362; lean_object* x_363; lean_object* x_364; uint8_t x_365; 
+x_362 = lean_unsigned_to_nat(1u);
+x_363 = l_Lean_Syntax_getArg(x_2, x_362);
+x_364 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+lean_inc(x_363);
+x_365 = l_Lean_Syntax_isOfKind(x_363, x_364);
+if (x_365 == 0)
 {
-lean_object* x_331; uint8_t x_332; lean_object* x_333; 
-lean_dec(x_328);
-x_331 = lean_box(0);
-x_332 = 1;
+lean_object* x_366; uint8_t x_367; lean_object* x_368; 
+lean_dec(x_363);
+x_366 = lean_box(0);
+x_367 = 1;
 lean_inc(x_9);
-x_333 = l_Lean_Elab_Term_elabTerm(x_2, x_331, x_332, x_332, x_9, x_10);
-if (lean_obj_tag(x_333) == 0)
+x_368 = l_Lean_Elab_Term_elabTerm(x_2, x_366, x_367, x_367, x_9, x_10);
+if (lean_obj_tag(x_368) == 0)
 {
-uint8_t x_334; 
-x_334 = !lean_is_exclusive(x_333);
-if (x_334 == 0)
+uint8_t x_369; 
+x_369 = !lean_is_exclusive(x_368);
+if (x_369 == 0)
 {
-lean_object* x_335; lean_object* x_336; lean_object* x_337; 
-x_335 = lean_ctor_get(x_333, 0);
-x_336 = lean_ctor_get(x_333, 1);
-lean_inc(x_336);
-x_337 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_335, x_3, x_4, x_5, x_6, x_7, x_9, x_336);
-if (lean_obj_tag(x_337) == 0)
+lean_object* x_370; lean_object* x_371; lean_object* x_372; 
+x_370 = lean_ctor_get(x_368, 0);
+x_371 = lean_ctor_get(x_368, 1);
+lean_inc(x_371);
+x_372 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_370, x_3, x_4, x_5, x_6, x_7, x_9, x_371);
+if (lean_obj_tag(x_372) == 0)
 {
-uint8_t x_338; 
-x_338 = !lean_is_exclusive(x_337);
-if (x_338 == 0)
+uint8_t x_373; 
+x_373 = !lean_is_exclusive(x_372);
+if (x_373 == 0)
 {
-lean_object* x_339; 
-x_339 = lean_array_push(x_8, x_337);
-lean_ctor_set(x_333, 0, x_339);
-return x_333;
+lean_object* x_374; 
+x_374 = lean_array_push(x_8, x_372);
+lean_ctor_set(x_368, 0, x_374);
+return x_368;
 }
 else
 {
-lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; 
-x_340 = lean_ctor_get(x_337, 0);
-x_341 = lean_ctor_get(x_337, 1);
-lean_inc(x_341);
-lean_inc(x_340);
-lean_dec(x_337);
-x_342 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_342, 0, x_340);
-lean_ctor_set(x_342, 1, x_341);
-x_343 = lean_array_push(x_8, x_342);
-lean_ctor_set(x_333, 0, x_343);
-return x_333;
+lean_object* x_375; lean_object* x_376; lean_object* x_377; lean_object* x_378; 
+x_375 = lean_ctor_get(x_372, 0);
+x_376 = lean_ctor_get(x_372, 1);
+lean_inc(x_376);
+lean_inc(x_375);
+lean_dec(x_372);
+x_377 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_377, 0, x_375);
+lean_ctor_set(x_377, 1, x_376);
+x_378 = lean_array_push(x_8, x_377);
+lean_ctor_set(x_368, 0, x_378);
+return x_368;
 }
 }
 else
 {
-lean_object* x_344; 
-x_344 = lean_ctor_get(x_337, 0);
-lean_inc(x_344);
-if (lean_obj_tag(x_344) == 0)
+lean_object* x_379; 
+x_379 = lean_ctor_get(x_372, 0);
+lean_inc(x_379);
+if (lean_obj_tag(x_379) == 0)
 {
-uint8_t x_345; 
-x_345 = !lean_is_exclusive(x_337);
-if (x_345 == 0)
+lean_object* x_380; 
+x_380 = lean_ctor_get(x_379, 0);
+lean_inc(x_380);
+if (lean_obj_tag(x_380) == 0)
 {
-lean_object* x_346; lean_object* x_347; lean_object* x_348; 
-x_346 = lean_ctor_get(x_337, 0);
-lean_dec(x_346);
-x_347 = lean_ctor_get(x_344, 0);
-lean_inc(x_347);
-lean_dec(x_344);
-lean_ctor_set(x_337, 0, x_347);
-x_348 = lean_array_push(x_8, x_337);
-lean_ctor_set(x_333, 0, x_348);
-return x_333;
+uint8_t x_381; 
+lean_dec(x_379);
+x_381 = !lean_is_exclusive(x_372);
+if (x_381 == 0)
+{
+lean_object* x_382; lean_object* x_383; lean_object* x_384; 
+x_382 = lean_ctor_get(x_372, 0);
+lean_dec(x_382);
+x_383 = lean_ctor_get(x_380, 0);
+lean_inc(x_383);
+lean_dec(x_380);
+lean_ctor_set(x_372, 0, x_383);
+x_384 = lean_array_push(x_8, x_372);
+lean_ctor_set(x_368, 0, x_384);
+return x_368;
 }
 else
 {
-lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; 
-x_349 = lean_ctor_get(x_337, 1);
-lean_inc(x_349);
-lean_dec(x_337);
-x_350 = lean_ctor_get(x_344, 0);
-lean_inc(x_350);
-lean_dec(x_344);
-x_351 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_351, 0, x_350);
-lean_ctor_set(x_351, 1, x_349);
-x_352 = lean_array_push(x_8, x_351);
-lean_ctor_set(x_333, 0, x_352);
-return x_333;
+lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; 
+x_385 = lean_ctor_get(x_372, 1);
+lean_inc(x_385);
+lean_dec(x_372);
+x_386 = lean_ctor_get(x_380, 0);
+lean_inc(x_386);
+lean_dec(x_380);
+x_387 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_387, 0, x_386);
+lean_ctor_set(x_387, 1, x_385);
+x_388 = lean_array_push(x_8, x_387);
+lean_ctor_set(x_368, 0, x_388);
+return x_368;
 }
 }
 else
 {
-uint8_t x_353; 
-lean_free_object(x_333);
-lean_dec(x_336);
+uint8_t x_389; 
+lean_free_object(x_368);
+lean_dec(x_371);
 lean_dec(x_8);
-x_353 = !lean_is_exclusive(x_337);
-if (x_353 == 0)
+x_389 = !lean_is_exclusive(x_372);
+if (x_389 == 0)
 {
-lean_object* x_354; 
-x_354 = lean_ctor_get(x_337, 0);
-lean_dec(x_354);
-return x_337;
-}
-else
-{
-lean_object* x_355; lean_object* x_356; 
-x_355 = lean_ctor_get(x_337, 1);
-lean_inc(x_355);
-lean_dec(x_337);
-x_356 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_356, 0, x_344);
-lean_ctor_set(x_356, 1, x_355);
-return x_356;
-}
-}
-}
-}
-else
-{
-lean_object* x_357; lean_object* x_358; lean_object* x_359; 
-x_357 = lean_ctor_get(x_333, 0);
-x_358 = lean_ctor_get(x_333, 1);
-lean_inc(x_358);
-lean_inc(x_357);
-lean_dec(x_333);
-lean_inc(x_358);
-x_359 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_357, x_3, x_4, x_5, x_6, x_7, x_9, x_358);
-if (lean_obj_tag(x_359) == 0)
-{
-lean_object* x_360; lean_object* x_361; lean_object* x_362; lean_object* x_363; lean_object* x_364; lean_object* x_365; 
-x_360 = lean_ctor_get(x_359, 0);
-lean_inc(x_360);
-x_361 = lean_ctor_get(x_359, 1);
-lean_inc(x_361);
-if (lean_is_exclusive(x_359)) {
- lean_ctor_release(x_359, 0);
- lean_ctor_release(x_359, 1);
- x_362 = x_359;
-} else {
- lean_dec_ref(x_359);
- x_362 = lean_box(0);
-}
-if (lean_is_scalar(x_362)) {
- x_363 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_363 = x_362;
-}
-lean_ctor_set(x_363, 0, x_360);
-lean_ctor_set(x_363, 1, x_361);
-x_364 = lean_array_push(x_8, x_363);
-x_365 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_365, 0, x_364);
-lean_ctor_set(x_365, 1, x_358);
-return x_365;
-}
-else
-{
-lean_object* x_366; 
-x_366 = lean_ctor_get(x_359, 0);
-lean_inc(x_366);
-if (lean_obj_tag(x_366) == 0)
-{
-lean_object* x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_371; lean_object* x_372; 
-x_367 = lean_ctor_get(x_359, 1);
-lean_inc(x_367);
-if (lean_is_exclusive(x_359)) {
- lean_ctor_release(x_359, 0);
- lean_ctor_release(x_359, 1);
- x_368 = x_359;
-} else {
- lean_dec_ref(x_359);
- x_368 = lean_box(0);
-}
-x_369 = lean_ctor_get(x_366, 0);
-lean_inc(x_369);
-lean_dec(x_366);
-if (lean_is_scalar(x_368)) {
- x_370 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_370 = x_368;
-}
-lean_ctor_set(x_370, 0, x_369);
-lean_ctor_set(x_370, 1, x_367);
-x_371 = lean_array_push(x_8, x_370);
-x_372 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_372, 0, x_371);
-lean_ctor_set(x_372, 1, x_358);
+lean_object* x_390; 
+x_390 = lean_ctor_get(x_372, 0);
+lean_dec(x_390);
 return x_372;
 }
 else
 {
-lean_object* x_373; lean_object* x_374; lean_object* x_375; 
-lean_dec(x_358);
+lean_object* x_391; lean_object* x_392; 
+x_391 = lean_ctor_get(x_372, 1);
+lean_inc(x_391);
+lean_dec(x_372);
+x_392 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_392, 0, x_379);
+lean_ctor_set(x_392, 1, x_391);
+return x_392;
+}
+}
+}
+else
+{
+uint8_t x_393; 
+lean_free_object(x_368);
+lean_dec(x_371);
 lean_dec(x_8);
-x_373 = lean_ctor_get(x_359, 1);
-lean_inc(x_373);
-if (lean_is_exclusive(x_359)) {
- lean_ctor_release(x_359, 0);
- lean_ctor_release(x_359, 1);
- x_374 = x_359;
-} else {
- lean_dec_ref(x_359);
- x_374 = lean_box(0);
+x_393 = !lean_is_exclusive(x_372);
+if (x_393 == 0)
+{
+lean_object* x_394; 
+x_394 = lean_ctor_get(x_372, 0);
+lean_dec(x_394);
+return x_372;
 }
-if (lean_is_scalar(x_374)) {
- x_375 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_375 = x_374;
-}
-lean_ctor_set(x_375, 0, x_366);
-lean_ctor_set(x_375, 1, x_373);
-return x_375;
+else
+{
+lean_object* x_395; lean_object* x_396; 
+x_395 = lean_ctor_get(x_372, 1);
+lean_inc(x_395);
+lean_dec(x_372);
+x_396 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_396, 0, x_379);
+lean_ctor_set(x_396, 1, x_395);
+return x_396;
 }
 }
 }
 }
 else
 {
-uint8_t x_376; 
+lean_object* x_397; lean_object* x_398; lean_object* x_399; 
+x_397 = lean_ctor_get(x_368, 0);
+x_398 = lean_ctor_get(x_368, 1);
+lean_inc(x_398);
+lean_inc(x_397);
+lean_dec(x_368);
+lean_inc(x_398);
+x_399 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_397, x_3, x_4, x_5, x_6, x_7, x_9, x_398);
+if (lean_obj_tag(x_399) == 0)
+{
+lean_object* x_400; lean_object* x_401; lean_object* x_402; lean_object* x_403; lean_object* x_404; lean_object* x_405; 
+x_400 = lean_ctor_get(x_399, 0);
+lean_inc(x_400);
+x_401 = lean_ctor_get(x_399, 1);
+lean_inc(x_401);
+if (lean_is_exclusive(x_399)) {
+ lean_ctor_release(x_399, 0);
+ lean_ctor_release(x_399, 1);
+ x_402 = x_399;
+} else {
+ lean_dec_ref(x_399);
+ x_402 = lean_box(0);
+}
+if (lean_is_scalar(x_402)) {
+ x_403 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_403 = x_402;
+}
+lean_ctor_set(x_403, 0, x_400);
+lean_ctor_set(x_403, 1, x_401);
+x_404 = lean_array_push(x_8, x_403);
+x_405 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_405, 0, x_404);
+lean_ctor_set(x_405, 1, x_398);
+return x_405;
+}
+else
+{
+lean_object* x_406; 
+x_406 = lean_ctor_get(x_399, 0);
+lean_inc(x_406);
+if (lean_obj_tag(x_406) == 0)
+{
+lean_object* x_407; 
+x_407 = lean_ctor_get(x_406, 0);
+lean_inc(x_407);
+if (lean_obj_tag(x_407) == 0)
+{
+lean_object* x_408; lean_object* x_409; lean_object* x_410; lean_object* x_411; lean_object* x_412; lean_object* x_413; 
+lean_dec(x_406);
+x_408 = lean_ctor_get(x_399, 1);
+lean_inc(x_408);
+if (lean_is_exclusive(x_399)) {
+ lean_ctor_release(x_399, 0);
+ lean_ctor_release(x_399, 1);
+ x_409 = x_399;
+} else {
+ lean_dec_ref(x_399);
+ x_409 = lean_box(0);
+}
+x_410 = lean_ctor_get(x_407, 0);
+lean_inc(x_410);
+lean_dec(x_407);
+if (lean_is_scalar(x_409)) {
+ x_411 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_411 = x_409;
+}
+lean_ctor_set(x_411, 0, x_410);
+lean_ctor_set(x_411, 1, x_408);
+x_412 = lean_array_push(x_8, x_411);
+x_413 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_413, 0, x_412);
+lean_ctor_set(x_413, 1, x_398);
+return x_413;
+}
+else
+{
+lean_object* x_414; lean_object* x_415; lean_object* x_416; 
+lean_dec(x_398);
+lean_dec(x_8);
+x_414 = lean_ctor_get(x_399, 1);
+lean_inc(x_414);
+if (lean_is_exclusive(x_399)) {
+ lean_ctor_release(x_399, 0);
+ lean_ctor_release(x_399, 1);
+ x_415 = x_399;
+} else {
+ lean_dec_ref(x_399);
+ x_415 = lean_box(0);
+}
+if (lean_is_scalar(x_415)) {
+ x_416 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_416 = x_415;
+}
+lean_ctor_set(x_416, 0, x_406);
+lean_ctor_set(x_416, 1, x_414);
+return x_416;
+}
+}
+else
+{
+lean_object* x_417; lean_object* x_418; lean_object* x_419; 
+lean_dec(x_398);
+lean_dec(x_8);
+x_417 = lean_ctor_get(x_399, 1);
+lean_inc(x_417);
+if (lean_is_exclusive(x_399)) {
+ lean_ctor_release(x_399, 0);
+ lean_ctor_release(x_399, 1);
+ x_418 = x_399;
+} else {
+ lean_dec_ref(x_399);
+ x_418 = lean_box(0);
+}
+if (lean_is_scalar(x_418)) {
+ x_419 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_419 = x_418;
+}
+lean_ctor_set(x_419, 0, x_406);
+lean_ctor_set(x_419, 1, x_417);
+return x_419;
+}
+}
+}
+}
+else
+{
+uint8_t x_420; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
@@ -6340,38 +6592,38 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_376 = !lean_is_exclusive(x_333);
-if (x_376 == 0)
+x_420 = !lean_is_exclusive(x_368);
+if (x_420 == 0)
 {
-return x_333;
+return x_368;
 }
 else
 {
-lean_object* x_377; lean_object* x_378; lean_object* x_379; 
-x_377 = lean_ctor_get(x_333, 0);
-x_378 = lean_ctor_get(x_333, 1);
-lean_inc(x_378);
-lean_inc(x_377);
-lean_dec(x_333);
-x_379 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_379, 0, x_377);
-lean_ctor_set(x_379, 1, x_378);
-return x_379;
+lean_object* x_421; lean_object* x_422; lean_object* x_423; 
+x_421 = lean_ctor_get(x_368, 0);
+x_422 = lean_ctor_get(x_368, 1);
+lean_inc(x_422);
+lean_inc(x_421);
+lean_dec(x_368);
+x_423 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_423, 0, x_421);
+lean_ctor_set(x_423, 1, x_422);
+return x_423;
 }
 }
 }
 else
 {
-uint8_t x_380; 
+uint8_t x_424; 
 lean_dec(x_2);
-x_380 = 1;
-x_2 = x_328;
-x_7 = x_380;
+x_424 = 1;
+x_2 = x_363;
+x_7 = x_424;
 goto _start;
 }
 }
 }
-block_206:
+block_232:
 {
 lean_object* x_15; uint8_t x_16; 
 lean_dec(x_14);
@@ -6395,7 +6647,7 @@ lean_object* x_21; lean_object* x_22; lean_object* x_23;
 x_21 = lean_ctor_get(x_19, 0);
 x_22 = lean_ctor_get(x_19, 1);
 lean_inc(x_22);
-x_23 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_21, x_3, x_4, x_5, x_6, x_7, x_9, x_22);
+x_23 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_21, x_3, x_4, x_5, x_6, x_7, x_9, x_22);
 if (lean_obj_tag(x_23) == 0)
 {
 uint8_t x_24; 
@@ -6430,168 +6682,232 @@ x_30 = lean_ctor_get(x_23, 0);
 lean_inc(x_30);
 if (lean_obj_tag(x_30) == 0)
 {
-uint8_t x_31; 
-x_31 = !lean_is_exclusive(x_23);
-if (x_31 == 0)
+lean_object* x_31; 
+x_31 = lean_ctor_get(x_30, 0);
+lean_inc(x_31);
+if (lean_obj_tag(x_31) == 0)
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_23, 0);
-lean_dec(x_32);
-x_33 = lean_ctor_get(x_30, 0);
-lean_inc(x_33);
+uint8_t x_32; 
 lean_dec(x_30);
-lean_ctor_set(x_23, 0, x_33);
-x_34 = lean_array_push(x_8, x_23);
-lean_ctor_set(x_19, 0, x_34);
+x_32 = !lean_is_exclusive(x_23);
+if (x_32 == 0)
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+x_33 = lean_ctor_get(x_23, 0);
+lean_dec(x_33);
+x_34 = lean_ctor_get(x_31, 0);
+lean_inc(x_34);
+lean_dec(x_31);
+lean_ctor_set(x_23, 0, x_34);
+x_35 = lean_array_push(x_8, x_23);
+lean_ctor_set(x_19, 0, x_35);
 return x_19;
 }
 else
 {
-lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; 
-x_35 = lean_ctor_get(x_23, 1);
-lean_inc(x_35);
-lean_dec(x_23);
-x_36 = lean_ctor_get(x_30, 0);
+lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_36 = lean_ctor_get(x_23, 1);
 lean_inc(x_36);
-lean_dec(x_30);
-x_37 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_37, 0, x_36);
-lean_ctor_set(x_37, 1, x_35);
-x_38 = lean_array_push(x_8, x_37);
-lean_ctor_set(x_19, 0, x_38);
+lean_dec(x_23);
+x_37 = lean_ctor_get(x_31, 0);
+lean_inc(x_37);
+lean_dec(x_31);
+x_38 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_38, 0, x_37);
+lean_ctor_set(x_38, 1, x_36);
+x_39 = lean_array_push(x_8, x_38);
+lean_ctor_set(x_19, 0, x_39);
 return x_19;
 }
 }
 else
 {
-uint8_t x_39; 
+uint8_t x_40; 
 lean_free_object(x_19);
 lean_dec(x_22);
 lean_dec(x_8);
-x_39 = !lean_is_exclusive(x_23);
-if (x_39 == 0)
+x_40 = !lean_is_exclusive(x_23);
+if (x_40 == 0)
 {
-lean_object* x_40; 
-x_40 = lean_ctor_get(x_23, 0);
-lean_dec(x_40);
+lean_object* x_41; 
+x_41 = lean_ctor_get(x_23, 0);
+lean_dec(x_41);
 return x_23;
 }
 else
 {
-lean_object* x_41; lean_object* x_42; 
-x_41 = lean_ctor_get(x_23, 1);
-lean_inc(x_41);
+lean_object* x_42; lean_object* x_43; 
+x_42 = lean_ctor_get(x_23, 1);
+lean_inc(x_42);
 lean_dec(x_23);
-x_42 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_42, 0, x_30);
-lean_ctor_set(x_42, 1, x_41);
-return x_42;
-}
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_30);
+lean_ctor_set(x_43, 1, x_42);
+return x_43;
 }
 }
 }
 else
 {
-lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_43 = lean_ctor_get(x_19, 0);
-x_44 = lean_ctor_get(x_19, 1);
-lean_inc(x_44);
-lean_inc(x_43);
-lean_dec(x_19);
-lean_inc(x_44);
-x_45 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_43, x_3, x_4, x_5, x_6, x_7, x_9, x_44);
-if (lean_obj_tag(x_45) == 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; 
-x_46 = lean_ctor_get(x_45, 0);
-lean_inc(x_46);
-x_47 = lean_ctor_get(x_45, 1);
-lean_inc(x_47);
-if (lean_is_exclusive(x_45)) {
- lean_ctor_release(x_45, 0);
- lean_ctor_release(x_45, 1);
- x_48 = x_45;
-} else {
- lean_dec_ref(x_45);
- x_48 = lean_box(0);
-}
-if (lean_is_scalar(x_48)) {
- x_49 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_49 = x_48;
-}
-lean_ctor_set(x_49, 0, x_46);
-lean_ctor_set(x_49, 1, x_47);
-x_50 = lean_array_push(x_8, x_49);
-x_51 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_44);
-return x_51;
-}
-else
-{
-lean_object* x_52; 
-x_52 = lean_ctor_get(x_45, 0);
-lean_inc(x_52);
-if (lean_obj_tag(x_52) == 0)
-{
-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_53 = lean_ctor_get(x_45, 1);
-lean_inc(x_53);
-if (lean_is_exclusive(x_45)) {
- lean_ctor_release(x_45, 0);
- lean_ctor_release(x_45, 1);
- x_54 = x_45;
-} else {
- lean_dec_ref(x_45);
- x_54 = lean_box(0);
-}
-x_55 = lean_ctor_get(x_52, 0);
-lean_inc(x_55);
-lean_dec(x_52);
-if (lean_is_scalar(x_54)) {
- x_56 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_56 = x_54;
-}
-lean_ctor_set(x_56, 0, x_55);
-lean_ctor_set(x_56, 1, x_53);
-x_57 = lean_array_push(x_8, x_56);
-x_58 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_58, 0, x_57);
-lean_ctor_set(x_58, 1, x_44);
-return x_58;
-}
-else
-{
-lean_object* x_59; lean_object* x_60; lean_object* x_61; 
-lean_dec(x_44);
+uint8_t x_44; 
+lean_free_object(x_19);
+lean_dec(x_22);
 lean_dec(x_8);
-x_59 = lean_ctor_get(x_45, 1);
-lean_inc(x_59);
-if (lean_is_exclusive(x_45)) {
- lean_ctor_release(x_45, 0);
- lean_ctor_release(x_45, 1);
- x_60 = x_45;
+x_44 = !lean_is_exclusive(x_23);
+if (x_44 == 0)
+{
+lean_object* x_45; 
+x_45 = lean_ctor_get(x_23, 0);
+lean_dec(x_45);
+return x_23;
+}
+else
+{
+lean_object* x_46; lean_object* x_47; 
+x_46 = lean_ctor_get(x_23, 1);
+lean_inc(x_46);
+lean_dec(x_23);
+x_47 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_47, 0, x_30);
+lean_ctor_set(x_47, 1, x_46);
+return x_47;
+}
+}
+}
+}
+else
+{
+lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_48 = lean_ctor_get(x_19, 0);
+x_49 = lean_ctor_get(x_19, 1);
+lean_inc(x_49);
+lean_inc(x_48);
+lean_dec(x_19);
+lean_inc(x_49);
+x_50 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_48, x_3, x_4, x_5, x_6, x_7, x_9, x_49);
+if (lean_obj_tag(x_50) == 0)
+{
+lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_51 = lean_ctor_get(x_50, 0);
+lean_inc(x_51);
+x_52 = lean_ctor_get(x_50, 1);
+lean_inc(x_52);
+if (lean_is_exclusive(x_50)) {
+ lean_ctor_release(x_50, 0);
+ lean_ctor_release(x_50, 1);
+ x_53 = x_50;
 } else {
- lean_dec_ref(x_45);
+ lean_dec_ref(x_50);
+ x_53 = lean_box(0);
+}
+if (lean_is_scalar(x_53)) {
+ x_54 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_54 = x_53;
+}
+lean_ctor_set(x_54, 0, x_51);
+lean_ctor_set(x_54, 1, x_52);
+x_55 = lean_array_push(x_8, x_54);
+x_56 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_56, 0, x_55);
+lean_ctor_set(x_56, 1, x_49);
+return x_56;
+}
+else
+{
+lean_object* x_57; 
+x_57 = lean_ctor_get(x_50, 0);
+lean_inc(x_57);
+if (lean_obj_tag(x_57) == 0)
+{
+lean_object* x_58; 
+x_58 = lean_ctor_get(x_57, 0);
+lean_inc(x_58);
+if (lean_obj_tag(x_58) == 0)
+{
+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_dec(x_57);
+x_59 = lean_ctor_get(x_50, 1);
+lean_inc(x_59);
+if (lean_is_exclusive(x_50)) {
+ lean_ctor_release(x_50, 0);
+ lean_ctor_release(x_50, 1);
+ x_60 = x_50;
+} else {
+ lean_dec_ref(x_50);
  x_60 = lean_box(0);
 }
+x_61 = lean_ctor_get(x_58, 0);
+lean_inc(x_61);
+lean_dec(x_58);
 if (lean_is_scalar(x_60)) {
- x_61 = lean_alloc_ctor(1, 2, 0);
+ x_62 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_61 = x_60;
+ x_62 = x_60;
 }
-lean_ctor_set(x_61, 0, x_52);
-lean_ctor_set(x_61, 1, x_59);
-return x_61;
+lean_ctor_set(x_62, 0, x_61);
+lean_ctor_set(x_62, 1, x_59);
+x_63 = lean_array_push(x_8, x_62);
+x_64 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_64, 0, x_63);
+lean_ctor_set(x_64, 1, x_49);
+return x_64;
+}
+else
+{
+lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+lean_dec(x_49);
+lean_dec(x_8);
+x_65 = lean_ctor_get(x_50, 1);
+lean_inc(x_65);
+if (lean_is_exclusive(x_50)) {
+ lean_ctor_release(x_50, 0);
+ lean_ctor_release(x_50, 1);
+ x_66 = x_50;
+} else {
+ lean_dec_ref(x_50);
+ x_66 = lean_box(0);
+}
+if (lean_is_scalar(x_66)) {
+ x_67 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_67 = x_66;
+}
+lean_ctor_set(x_67, 0, x_57);
+lean_ctor_set(x_67, 1, x_65);
+return x_67;
+}
+}
+else
+{
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+lean_dec(x_49);
+lean_dec(x_8);
+x_68 = lean_ctor_get(x_50, 1);
+lean_inc(x_68);
+if (lean_is_exclusive(x_50)) {
+ lean_ctor_release(x_50, 0);
+ lean_ctor_release(x_50, 1);
+ x_69 = x_50;
+} else {
+ lean_dec_ref(x_50);
+ x_69 = lean_box(0);
+}
+if (lean_is_scalar(x_69)) {
+ x_70 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_70 = x_69;
+}
+lean_ctor_set(x_70, 0, x_57);
+lean_ctor_set(x_70, 1, x_68);
+return x_70;
 }
 }
 }
 }
 else
 {
-uint8_t x_62; 
+uint8_t x_71; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
@@ -6599,249 +6915,313 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_62 = !lean_is_exclusive(x_19);
-if (x_62 == 0)
+x_71 = !lean_is_exclusive(x_19);
+if (x_71 == 0)
 {
 return x_19;
 }
 else
 {
-lean_object* x_63; lean_object* x_64; lean_object* x_65; 
-x_63 = lean_ctor_get(x_19, 0);
-x_64 = lean_ctor_get(x_19, 1);
-lean_inc(x_64);
-lean_inc(x_63);
+lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_72 = lean_ctor_get(x_19, 0);
+x_73 = lean_ctor_get(x_19, 1);
+lean_inc(x_73);
+lean_inc(x_72);
 lean_dec(x_19);
-x_65 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_65, 0, x_63);
-lean_ctor_set(x_65, 1, x_64);
-return x_65;
+x_74 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_74, 0, x_72);
+lean_ctor_set(x_74, 1, x_73);
+return x_74;
 }
 }
 }
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; uint8_t x_69; 
-x_66 = l_Lean_Syntax_getArgs(x_2);
-x_67 = lean_array_get_size(x_66);
-lean_dec(x_66);
-x_68 = lean_unsigned_to_nat(2u);
-x_69 = lean_nat_dec_eq(x_67, x_68);
-lean_dec(x_67);
-if (x_69 == 0)
-{
-lean_object* x_70; uint8_t x_71; lean_object* x_72; 
-x_70 = lean_box(0);
-x_71 = 1;
-lean_inc(x_9);
-x_72 = l_Lean_Elab_Term_elabTerm(x_2, x_70, x_71, x_71, x_9, x_10);
-if (lean_obj_tag(x_72) == 0)
-{
-uint8_t x_73; 
-x_73 = !lean_is_exclusive(x_72);
-if (x_73 == 0)
-{
-lean_object* x_74; lean_object* x_75; lean_object* x_76; 
-x_74 = lean_ctor_get(x_72, 0);
-x_75 = lean_ctor_get(x_72, 1);
-lean_inc(x_75);
-x_76 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_74, x_3, x_4, x_5, x_6, x_7, x_9, x_75);
-if (lean_obj_tag(x_76) == 0)
-{
-uint8_t x_77; 
-x_77 = !lean_is_exclusive(x_76);
-if (x_77 == 0)
-{
-lean_object* x_78; 
-x_78 = lean_array_push(x_8, x_76);
-lean_ctor_set(x_72, 0, x_78);
-return x_72;
-}
-else
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; 
-x_79 = lean_ctor_get(x_76, 0);
-x_80 = lean_ctor_get(x_76, 1);
-lean_inc(x_80);
-lean_inc(x_79);
+lean_object* x_75; lean_object* x_76; lean_object* x_77; uint8_t x_78; 
+x_75 = l_Lean_Syntax_getArgs(x_2);
+x_76 = lean_array_get_size(x_75);
+lean_dec(x_75);
+x_77 = lean_unsigned_to_nat(2u);
+x_78 = lean_nat_dec_eq(x_76, x_77);
 lean_dec(x_76);
-x_81 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_81, 0, x_79);
-lean_ctor_set(x_81, 1, x_80);
-x_82 = lean_array_push(x_8, x_81);
-lean_ctor_set(x_72, 0, x_82);
-return x_72;
-}
-}
-else
+if (x_78 == 0)
 {
-lean_object* x_83; 
-x_83 = lean_ctor_get(x_76, 0);
-lean_inc(x_83);
-if (lean_obj_tag(x_83) == 0)
+lean_object* x_79; uint8_t x_80; lean_object* x_81; 
+x_79 = lean_box(0);
+x_80 = 1;
+lean_inc(x_9);
+x_81 = l_Lean_Elab_Term_elabTerm(x_2, x_79, x_80, x_80, x_9, x_10);
+if (lean_obj_tag(x_81) == 0)
 {
-uint8_t x_84; 
-x_84 = !lean_is_exclusive(x_76);
-if (x_84 == 0)
+uint8_t x_82; 
+x_82 = !lean_is_exclusive(x_81);
+if (x_82 == 0)
 {
-lean_object* x_85; lean_object* x_86; lean_object* x_87; 
-x_85 = lean_ctor_get(x_76, 0);
-lean_dec(x_85);
-x_86 = lean_ctor_get(x_83, 0);
-lean_inc(x_86);
-lean_dec(x_83);
-lean_ctor_set(x_76, 0, x_86);
-x_87 = lean_array_push(x_8, x_76);
-lean_ctor_set(x_72, 0, x_87);
-return x_72;
+lean_object* x_83; lean_object* x_84; lean_object* x_85; 
+x_83 = lean_ctor_get(x_81, 0);
+x_84 = lean_ctor_get(x_81, 1);
+lean_inc(x_84);
+x_85 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_83, x_3, x_4, x_5, x_6, x_7, x_9, x_84);
+if (lean_obj_tag(x_85) == 0)
+{
+uint8_t x_86; 
+x_86 = !lean_is_exclusive(x_85);
+if (x_86 == 0)
+{
+lean_object* x_87; 
+x_87 = lean_array_push(x_8, x_85);
+lean_ctor_set(x_81, 0, x_87);
+return x_81;
 }
 else
 {
 lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; 
-x_88 = lean_ctor_get(x_76, 1);
-lean_inc(x_88);
-lean_dec(x_76);
-x_89 = lean_ctor_get(x_83, 0);
+x_88 = lean_ctor_get(x_85, 0);
+x_89 = lean_ctor_get(x_85, 1);
 lean_inc(x_89);
-lean_dec(x_83);
-x_90 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_90, 0, x_89);
-lean_ctor_set(x_90, 1, x_88);
+lean_inc(x_88);
+lean_dec(x_85);
+x_90 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_90, 0, x_88);
+lean_ctor_set(x_90, 1, x_89);
 x_91 = lean_array_push(x_8, x_90);
-lean_ctor_set(x_72, 0, x_91);
-return x_72;
+lean_ctor_set(x_81, 0, x_91);
+return x_81;
 }
 }
 else
 {
-uint8_t x_92; 
-lean_free_object(x_72);
-lean_dec(x_75);
-lean_dec(x_8);
-x_92 = !lean_is_exclusive(x_76);
-if (x_92 == 0)
+lean_object* x_92; 
+x_92 = lean_ctor_get(x_85, 0);
+lean_inc(x_92);
+if (lean_obj_tag(x_92) == 0)
 {
 lean_object* x_93; 
-x_93 = lean_ctor_get(x_76, 0);
-lean_dec(x_93);
-return x_76;
-}
-else
+x_93 = lean_ctor_get(x_92, 0);
+lean_inc(x_93);
+if (lean_obj_tag(x_93) == 0)
 {
-lean_object* x_94; lean_object* x_95; 
-x_94 = lean_ctor_get(x_76, 1);
-lean_inc(x_94);
-lean_dec(x_76);
-x_95 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_95, 0, x_83);
-lean_ctor_set(x_95, 1, x_94);
-return x_95;
-}
-}
-}
-}
-else
+uint8_t x_94; 
+lean_dec(x_92);
+x_94 = !lean_is_exclusive(x_85);
+if (x_94 == 0)
 {
-lean_object* x_96; lean_object* x_97; lean_object* x_98; 
-x_96 = lean_ctor_get(x_72, 0);
-x_97 = lean_ctor_get(x_72, 1);
-lean_inc(x_97);
+lean_object* x_95; lean_object* x_96; lean_object* x_97; 
+x_95 = lean_ctor_get(x_85, 0);
+lean_dec(x_95);
+x_96 = lean_ctor_get(x_93, 0);
 lean_inc(x_96);
-lean_dec(x_72);
-lean_inc(x_97);
-x_98 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_96, x_3, x_4, x_5, x_6, x_7, x_9, x_97);
-if (lean_obj_tag(x_98) == 0)
+lean_dec(x_93);
+lean_ctor_set(x_85, 0, x_96);
+x_97 = lean_array_push(x_8, x_85);
+lean_ctor_set(x_81, 0, x_97);
+return x_81;
+}
+else
 {
-lean_object* x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; 
-x_99 = lean_ctor_get(x_98, 0);
+lean_object* x_98; lean_object* x_99; lean_object* x_100; lean_object* x_101; 
+x_98 = lean_ctor_get(x_85, 1);
+lean_inc(x_98);
+lean_dec(x_85);
+x_99 = lean_ctor_get(x_93, 0);
 lean_inc(x_99);
-x_100 = lean_ctor_get(x_98, 1);
-lean_inc(x_100);
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- x_101 = x_98;
-} else {
- lean_dec_ref(x_98);
- x_101 = lean_box(0);
+lean_dec(x_93);
+x_100 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_100, 0, x_99);
+lean_ctor_set(x_100, 1, x_98);
+x_101 = lean_array_push(x_8, x_100);
+lean_ctor_set(x_81, 0, x_101);
+return x_81;
 }
-if (lean_is_scalar(x_101)) {
- x_102 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_102 = x_101;
-}
-lean_ctor_set(x_102, 0, x_99);
-lean_ctor_set(x_102, 1, x_100);
-x_103 = lean_array_push(x_8, x_102);
-x_104 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_104, 0, x_103);
-lean_ctor_set(x_104, 1, x_97);
-return x_104;
 }
 else
 {
-lean_object* x_105; 
-x_105 = lean_ctor_get(x_98, 0);
-lean_inc(x_105);
-if (lean_obj_tag(x_105) == 0)
-{
-lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; 
-x_106 = lean_ctor_get(x_98, 1);
-lean_inc(x_106);
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- x_107 = x_98;
-} else {
- lean_dec_ref(x_98);
- x_107 = lean_box(0);
-}
-x_108 = lean_ctor_get(x_105, 0);
-lean_inc(x_108);
-lean_dec(x_105);
-if (lean_is_scalar(x_107)) {
- x_109 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_109 = x_107;
-}
-lean_ctor_set(x_109, 0, x_108);
-lean_ctor_set(x_109, 1, x_106);
-x_110 = lean_array_push(x_8, x_109);
-x_111 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_111, 0, x_110);
-lean_ctor_set(x_111, 1, x_97);
-return x_111;
-}
-else
-{
-lean_object* x_112; lean_object* x_113; lean_object* x_114; 
-lean_dec(x_97);
+uint8_t x_102; 
+lean_free_object(x_81);
+lean_dec(x_84);
 lean_dec(x_8);
-x_112 = lean_ctor_get(x_98, 1);
-lean_inc(x_112);
-if (lean_is_exclusive(x_98)) {
- lean_ctor_release(x_98, 0);
- lean_ctor_release(x_98, 1);
- x_113 = x_98;
-} else {
- lean_dec_ref(x_98);
- x_113 = lean_box(0);
+x_102 = !lean_is_exclusive(x_85);
+if (x_102 == 0)
+{
+lean_object* x_103; 
+x_103 = lean_ctor_get(x_85, 0);
+lean_dec(x_103);
+return x_85;
 }
-if (lean_is_scalar(x_113)) {
- x_114 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_114 = x_113;
+else
+{
+lean_object* x_104; lean_object* x_105; 
+x_104 = lean_ctor_get(x_85, 1);
+lean_inc(x_104);
+lean_dec(x_85);
+x_105 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_105, 0, x_92);
+lean_ctor_set(x_105, 1, x_104);
+return x_105;
 }
-lean_ctor_set(x_114, 0, x_105);
-lean_ctor_set(x_114, 1, x_112);
-return x_114;
+}
+}
+else
+{
+uint8_t x_106; 
+lean_free_object(x_81);
+lean_dec(x_84);
+lean_dec(x_8);
+x_106 = !lean_is_exclusive(x_85);
+if (x_106 == 0)
+{
+lean_object* x_107; 
+x_107 = lean_ctor_get(x_85, 0);
+lean_dec(x_107);
+return x_85;
+}
+else
+{
+lean_object* x_108; lean_object* x_109; 
+x_108 = lean_ctor_get(x_85, 1);
+lean_inc(x_108);
+lean_dec(x_85);
+x_109 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_109, 0, x_92);
+lean_ctor_set(x_109, 1, x_108);
+return x_109;
 }
 }
 }
 }
 else
 {
-uint8_t x_115; 
+lean_object* x_110; lean_object* x_111; lean_object* x_112; 
+x_110 = lean_ctor_get(x_81, 0);
+x_111 = lean_ctor_get(x_81, 1);
+lean_inc(x_111);
+lean_inc(x_110);
+lean_dec(x_81);
+lean_inc(x_111);
+x_112 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_110, x_3, x_4, x_5, x_6, x_7, x_9, x_111);
+if (lean_obj_tag(x_112) == 0)
+{
+lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; 
+x_113 = lean_ctor_get(x_112, 0);
+lean_inc(x_113);
+x_114 = lean_ctor_get(x_112, 1);
+lean_inc(x_114);
+if (lean_is_exclusive(x_112)) {
+ lean_ctor_release(x_112, 0);
+ lean_ctor_release(x_112, 1);
+ x_115 = x_112;
+} else {
+ lean_dec_ref(x_112);
+ x_115 = lean_box(0);
+}
+if (lean_is_scalar(x_115)) {
+ x_116 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_116 = x_115;
+}
+lean_ctor_set(x_116, 0, x_113);
+lean_ctor_set(x_116, 1, x_114);
+x_117 = lean_array_push(x_8, x_116);
+x_118 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_118, 0, x_117);
+lean_ctor_set(x_118, 1, x_111);
+return x_118;
+}
+else
+{
+lean_object* x_119; 
+x_119 = lean_ctor_get(x_112, 0);
+lean_inc(x_119);
+if (lean_obj_tag(x_119) == 0)
+{
+lean_object* x_120; 
+x_120 = lean_ctor_get(x_119, 0);
+lean_inc(x_120);
+if (lean_obj_tag(x_120) == 0)
+{
+lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
+lean_dec(x_119);
+x_121 = lean_ctor_get(x_112, 1);
+lean_inc(x_121);
+if (lean_is_exclusive(x_112)) {
+ lean_ctor_release(x_112, 0);
+ lean_ctor_release(x_112, 1);
+ x_122 = x_112;
+} else {
+ lean_dec_ref(x_112);
+ x_122 = lean_box(0);
+}
+x_123 = lean_ctor_get(x_120, 0);
+lean_inc(x_123);
+lean_dec(x_120);
+if (lean_is_scalar(x_122)) {
+ x_124 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_124 = x_122;
+}
+lean_ctor_set(x_124, 0, x_123);
+lean_ctor_set(x_124, 1, x_121);
+x_125 = lean_array_push(x_8, x_124);
+x_126 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_126, 0, x_125);
+lean_ctor_set(x_126, 1, x_111);
+return x_126;
+}
+else
+{
+lean_object* x_127; lean_object* x_128; lean_object* x_129; 
+lean_dec(x_111);
+lean_dec(x_8);
+x_127 = lean_ctor_get(x_112, 1);
+lean_inc(x_127);
+if (lean_is_exclusive(x_112)) {
+ lean_ctor_release(x_112, 0);
+ lean_ctor_release(x_112, 1);
+ x_128 = x_112;
+} else {
+ lean_dec_ref(x_112);
+ x_128 = lean_box(0);
+}
+if (lean_is_scalar(x_128)) {
+ x_129 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_129 = x_128;
+}
+lean_ctor_set(x_129, 0, x_119);
+lean_ctor_set(x_129, 1, x_127);
+return x_129;
+}
+}
+else
+{
+lean_object* x_130; lean_object* x_131; lean_object* x_132; 
+lean_dec(x_111);
+lean_dec(x_8);
+x_130 = lean_ctor_get(x_112, 1);
+lean_inc(x_130);
+if (lean_is_exclusive(x_112)) {
+ lean_ctor_release(x_112, 0);
+ lean_ctor_release(x_112, 1);
+ x_131 = x_112;
+} else {
+ lean_dec_ref(x_112);
+ x_131 = lean_box(0);
+}
+if (lean_is_scalar(x_131)) {
+ x_132 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_132 = x_131;
+}
+lean_ctor_set(x_132, 0, x_119);
+lean_ctor_set(x_132, 1, x_130);
+return x_132;
+}
+}
+}
+}
+else
+{
+uint8_t x_133; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
@@ -6849,404 +7229,313 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_115 = !lean_is_exclusive(x_72);
-if (x_115 == 0)
+x_133 = !lean_is_exclusive(x_81);
+if (x_133 == 0)
 {
-return x_72;
+return x_81;
 }
 else
 {
-lean_object* x_116; lean_object* x_117; lean_object* x_118; 
-x_116 = lean_ctor_get(x_72, 0);
-x_117 = lean_ctor_get(x_72, 1);
-lean_inc(x_117);
-lean_inc(x_116);
-lean_dec(x_72);
-x_118 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_118, 0, x_116);
-lean_ctor_set(x_118, 1, x_117);
-return x_118;
+lean_object* x_134; lean_object* x_135; lean_object* x_136; 
+x_134 = lean_ctor_get(x_81, 0);
+x_135 = lean_ctor_get(x_81, 1);
+lean_inc(x_135);
+lean_inc(x_134);
+lean_dec(x_81);
+x_136 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_136, 0, x_134);
+lean_ctor_set(x_136, 1, x_135);
+return x_136;
 }
 }
 }
 else
 {
-lean_object* x_119; lean_object* x_120; lean_object* x_121; uint8_t x_122; 
-x_119 = lean_unsigned_to_nat(0u);
-x_120 = l_Lean_Syntax_getArg(x_2, x_119);
-x_121 = l_Lean_Syntax_getKind___closed__4;
-lean_inc(x_120);
-x_122 = l_Lean_Syntax_isOfKind(x_120, x_121);
-if (x_122 == 0)
+lean_object* x_137; lean_object* x_138; lean_object* x_139; uint8_t x_140; 
+x_137 = lean_unsigned_to_nat(0u);
+x_138 = l_Lean_Syntax_getArg(x_2, x_137);
+x_139 = l_Lean_Syntax_getKind___closed__4;
+lean_inc(x_138);
+x_140 = l_Lean_Syntax_isOfKind(x_138, x_139);
+if (x_140 == 0)
 {
-lean_object* x_123; uint8_t x_124; lean_object* x_125; 
-lean_dec(x_120);
-x_123 = lean_box(0);
-x_124 = 1;
-lean_inc(x_9);
-x_125 = l_Lean_Elab_Term_elabTerm(x_2, x_123, x_124, x_124, x_9, x_10);
-if (lean_obj_tag(x_125) == 0)
-{
-uint8_t x_126; 
-x_126 = !lean_is_exclusive(x_125);
-if (x_126 == 0)
-{
-lean_object* x_127; lean_object* x_128; lean_object* x_129; 
-x_127 = lean_ctor_get(x_125, 0);
-x_128 = lean_ctor_get(x_125, 1);
-lean_inc(x_128);
-x_129 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_127, x_3, x_4, x_5, x_6, x_7, x_9, x_128);
-if (lean_obj_tag(x_129) == 0)
-{
-uint8_t x_130; 
-x_130 = !lean_is_exclusive(x_129);
-if (x_130 == 0)
-{
-lean_object* x_131; 
-x_131 = lean_array_push(x_8, x_129);
-lean_ctor_set(x_125, 0, x_131);
-return x_125;
-}
-else
-{
-lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; 
-x_132 = lean_ctor_get(x_129, 0);
-x_133 = lean_ctor_get(x_129, 1);
-lean_inc(x_133);
-lean_inc(x_132);
-lean_dec(x_129);
-x_134 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_134, 0, x_132);
-lean_ctor_set(x_134, 1, x_133);
-x_135 = lean_array_push(x_8, x_134);
-lean_ctor_set(x_125, 0, x_135);
-return x_125;
-}
-}
-else
-{
-lean_object* x_136; 
-x_136 = lean_ctor_get(x_129, 0);
-lean_inc(x_136);
-if (lean_obj_tag(x_136) == 0)
-{
-uint8_t x_137; 
-x_137 = !lean_is_exclusive(x_129);
-if (x_137 == 0)
-{
-lean_object* x_138; lean_object* x_139; lean_object* x_140; 
-x_138 = lean_ctor_get(x_129, 0);
+lean_object* x_141; uint8_t x_142; lean_object* x_143; 
 lean_dec(x_138);
-x_139 = lean_ctor_get(x_136, 0);
-lean_inc(x_139);
-lean_dec(x_136);
-lean_ctor_set(x_129, 0, x_139);
-x_140 = lean_array_push(x_8, x_129);
-lean_ctor_set(x_125, 0, x_140);
-return x_125;
+x_141 = lean_box(0);
+x_142 = 1;
+lean_inc(x_9);
+x_143 = l_Lean_Elab_Term_elabTerm(x_2, x_141, x_142, x_142, x_9, x_10);
+if (lean_obj_tag(x_143) == 0)
+{
+uint8_t x_144; 
+x_144 = !lean_is_exclusive(x_143);
+if (x_144 == 0)
+{
+lean_object* x_145; lean_object* x_146; lean_object* x_147; 
+x_145 = lean_ctor_get(x_143, 0);
+x_146 = lean_ctor_get(x_143, 1);
+lean_inc(x_146);
+x_147 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_145, x_3, x_4, x_5, x_6, x_7, x_9, x_146);
+if (lean_obj_tag(x_147) == 0)
+{
+uint8_t x_148; 
+x_148 = !lean_is_exclusive(x_147);
+if (x_148 == 0)
+{
+lean_object* x_149; 
+x_149 = lean_array_push(x_8, x_147);
+lean_ctor_set(x_143, 0, x_149);
+return x_143;
 }
 else
 {
-lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
-x_141 = lean_ctor_get(x_129, 1);
-lean_inc(x_141);
-lean_dec(x_129);
-x_142 = lean_ctor_get(x_136, 0);
-lean_inc(x_142);
-lean_dec(x_136);
-x_143 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_143, 0, x_142);
-lean_ctor_set(x_143, 1, x_141);
-x_144 = lean_array_push(x_8, x_143);
-lean_ctor_set(x_125, 0, x_144);
-return x_125;
-}
-}
-else
-{
-uint8_t x_145; 
-lean_free_object(x_125);
-lean_dec(x_128);
-lean_dec(x_8);
-x_145 = !lean_is_exclusive(x_129);
-if (x_145 == 0)
-{
-lean_object* x_146; 
-x_146 = lean_ctor_get(x_129, 0);
-lean_dec(x_146);
-return x_129;
-}
-else
-{
-lean_object* x_147; lean_object* x_148; 
-x_147 = lean_ctor_get(x_129, 1);
-lean_inc(x_147);
-lean_dec(x_129);
-x_148 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_148, 0, x_136);
-lean_ctor_set(x_148, 1, x_147);
-return x_148;
-}
-}
-}
-}
-else
-{
-lean_object* x_149; lean_object* x_150; lean_object* x_151; 
-x_149 = lean_ctor_get(x_125, 0);
-x_150 = lean_ctor_get(x_125, 1);
+lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; 
+x_150 = lean_ctor_get(x_147, 0);
+x_151 = lean_ctor_get(x_147, 1);
+lean_inc(x_151);
 lean_inc(x_150);
-lean_inc(x_149);
-lean_dec(x_125);
-lean_inc(x_150);
-x_151 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_149, x_3, x_4, x_5, x_6, x_7, x_9, x_150);
-if (lean_obj_tag(x_151) == 0)
-{
-lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; 
-x_152 = lean_ctor_get(x_151, 0);
-lean_inc(x_152);
-x_153 = lean_ctor_get(x_151, 1);
-lean_inc(x_153);
-if (lean_is_exclusive(x_151)) {
- lean_ctor_release(x_151, 0);
- lean_ctor_release(x_151, 1);
- x_154 = x_151;
-} else {
- lean_dec_ref(x_151);
- x_154 = lean_box(0);
+lean_dec(x_147);
+x_152 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_152, 0, x_150);
+lean_ctor_set(x_152, 1, x_151);
+x_153 = lean_array_push(x_8, x_152);
+lean_ctor_set(x_143, 0, x_153);
+return x_143;
 }
-if (lean_is_scalar(x_154)) {
- x_155 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_155 = x_154;
-}
-lean_ctor_set(x_155, 0, x_152);
-lean_ctor_set(x_155, 1, x_153);
-x_156 = lean_array_push(x_8, x_155);
-x_157 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_157, 0, x_156);
-lean_ctor_set(x_157, 1, x_150);
-return x_157;
 }
 else
 {
-lean_object* x_158; 
-x_158 = lean_ctor_get(x_151, 0);
+lean_object* x_154; 
+x_154 = lean_ctor_get(x_147, 0);
+lean_inc(x_154);
+if (lean_obj_tag(x_154) == 0)
+{
+lean_object* x_155; 
+x_155 = lean_ctor_get(x_154, 0);
+lean_inc(x_155);
+if (lean_obj_tag(x_155) == 0)
+{
+uint8_t x_156; 
+lean_dec(x_154);
+x_156 = !lean_is_exclusive(x_147);
+if (x_156 == 0)
+{
+lean_object* x_157; lean_object* x_158; lean_object* x_159; 
+x_157 = lean_ctor_get(x_147, 0);
+lean_dec(x_157);
+x_158 = lean_ctor_get(x_155, 0);
 lean_inc(x_158);
-if (lean_obj_tag(x_158) == 0)
-{
-lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; 
-x_159 = lean_ctor_get(x_151, 1);
-lean_inc(x_159);
-if (lean_is_exclusive(x_151)) {
- lean_ctor_release(x_151, 0);
- lean_ctor_release(x_151, 1);
- x_160 = x_151;
-} else {
- lean_dec_ref(x_151);
- x_160 = lean_box(0);
-}
-x_161 = lean_ctor_get(x_158, 0);
-lean_inc(x_161);
-lean_dec(x_158);
-if (lean_is_scalar(x_160)) {
- x_162 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_162 = x_160;
-}
-lean_ctor_set(x_162, 0, x_161);
-lean_ctor_set(x_162, 1, x_159);
-x_163 = lean_array_push(x_8, x_162);
-x_164 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_164, 0, x_163);
-lean_ctor_set(x_164, 1, x_150);
-return x_164;
+lean_dec(x_155);
+lean_ctor_set(x_147, 0, x_158);
+x_159 = lean_array_push(x_8, x_147);
+lean_ctor_set(x_143, 0, x_159);
+return x_143;
 }
 else
 {
-lean_object* x_165; lean_object* x_166; lean_object* x_167; 
-lean_dec(x_150);
+lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; 
+x_160 = lean_ctor_get(x_147, 1);
+lean_inc(x_160);
+lean_dec(x_147);
+x_161 = lean_ctor_get(x_155, 0);
+lean_inc(x_161);
+lean_dec(x_155);
+x_162 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_162, 0, x_161);
+lean_ctor_set(x_162, 1, x_160);
+x_163 = lean_array_push(x_8, x_162);
+lean_ctor_set(x_143, 0, x_163);
+return x_143;
+}
+}
+else
+{
+uint8_t x_164; 
+lean_free_object(x_143);
+lean_dec(x_146);
 lean_dec(x_8);
-x_165 = lean_ctor_get(x_151, 1);
-lean_inc(x_165);
-if (lean_is_exclusive(x_151)) {
- lean_ctor_release(x_151, 0);
- lean_ctor_release(x_151, 1);
- x_166 = x_151;
-} else {
- lean_dec_ref(x_151);
- x_166 = lean_box(0);
+x_164 = !lean_is_exclusive(x_147);
+if (x_164 == 0)
+{
+lean_object* x_165; 
+x_165 = lean_ctor_get(x_147, 0);
+lean_dec(x_165);
+return x_147;
 }
-if (lean_is_scalar(x_166)) {
- x_167 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_167 = x_166;
-}
-lean_ctor_set(x_167, 0, x_158);
-lean_ctor_set(x_167, 1, x_165);
+else
+{
+lean_object* x_166; lean_object* x_167; 
+x_166 = lean_ctor_get(x_147, 1);
+lean_inc(x_166);
+lean_dec(x_147);
+x_167 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_167, 0, x_154);
+lean_ctor_set(x_167, 1, x_166);
 return x_167;
 }
 }
 }
-}
 else
 {
 uint8_t x_168; 
-lean_dec(x_9);
+lean_free_object(x_143);
+lean_dec(x_146);
 lean_dec(x_8);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_168 = !lean_is_exclusive(x_125);
+x_168 = !lean_is_exclusive(x_147);
 if (x_168 == 0)
 {
-return x_125;
+lean_object* x_169; 
+x_169 = lean_ctor_get(x_147, 0);
+lean_dec(x_169);
+return x_147;
 }
 else
 {
-lean_object* x_169; lean_object* x_170; lean_object* x_171; 
-x_169 = lean_ctor_get(x_125, 0);
-x_170 = lean_ctor_get(x_125, 1);
+lean_object* x_170; lean_object* x_171; 
+x_170 = lean_ctor_get(x_147, 1);
 lean_inc(x_170);
-lean_inc(x_169);
-lean_dec(x_125);
+lean_dec(x_147);
 x_171 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_171, 0, x_169);
+lean_ctor_set(x_171, 0, x_154);
 lean_ctor_set(x_171, 1, x_170);
 return x_171;
 }
 }
 }
+}
 else
 {
-if (lean_obj_tag(x_120) == 3)
-{
-lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; uint8_t x_177; 
-x_172 = lean_ctor_get(x_120, 2);
-lean_inc(x_172);
-x_173 = lean_ctor_get(x_120, 3);
+lean_object* x_172; lean_object* x_173; lean_object* x_174; 
+x_172 = lean_ctor_get(x_143, 0);
+x_173 = lean_ctor_get(x_143, 1);
 lean_inc(x_173);
-lean_dec(x_120);
-x_174 = lean_unsigned_to_nat(1u);
-x_175 = l_Lean_Syntax_getArg(x_2, x_174);
-x_176 = l_Lean_Syntax_getArgs(x_175);
-lean_dec(x_175);
-x_177 = l_Array_isEmpty___rarg(x_176);
-if (x_177 == 0)
+lean_inc(x_172);
+lean_dec(x_143);
+lean_inc(x_173);
+x_174 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_172, x_3, x_4, x_5, x_6, x_7, x_9, x_173);
+if (lean_obj_tag(x_174) == 0)
 {
-lean_object* x_178; lean_object* x_179; lean_object* x_180; 
-x_178 = l_Lean_stxInh;
-x_179 = lean_array_get(x_178, x_176, x_119);
-lean_dec(x_176);
-x_180 = l_Lean_Elab_Term_elabExplicitUniv(x_179, x_9, x_10);
-lean_dec(x_179);
-if (lean_obj_tag(x_180) == 0)
-{
-lean_object* x_181; lean_object* x_182; lean_object* x_183; 
-x_181 = lean_ctor_get(x_180, 0);
-lean_inc(x_181);
-x_182 = lean_ctor_get(x_180, 1);
-lean_inc(x_182);
-lean_dec(x_180);
-lean_inc(x_9);
-x_183 = l_Lean_Elab_Term_resolveName(x_2, x_172, x_173, x_181, x_9, x_182);
-if (lean_obj_tag(x_183) == 0)
-{
-lean_object* x_184; lean_object* x_185; lean_object* x_186; 
-x_184 = lean_ctor_get(x_183, 0);
-lean_inc(x_184);
-x_185 = lean_ctor_get(x_183, 1);
-lean_inc(x_185);
-lean_dec(x_183);
-x_186 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__2(x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_184, x_9, x_185);
-return x_186;
+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_175 = lean_ctor_get(x_174, 0);
+lean_inc(x_175);
+x_176 = lean_ctor_get(x_174, 1);
+lean_inc(x_176);
+if (lean_is_exclusive(x_174)) {
+ lean_ctor_release(x_174, 0);
+ lean_ctor_release(x_174, 1);
+ x_177 = x_174;
+} else {
+ lean_dec_ref(x_174);
+ x_177 = lean_box(0);
 }
-else
-{
-uint8_t x_187; 
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_1);
-x_187 = !lean_is_exclusive(x_183);
-if (x_187 == 0)
-{
-return x_183;
+if (lean_is_scalar(x_177)) {
+ x_178 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_178 = x_177;
 }
-else
-{
-lean_object* x_188; lean_object* x_189; lean_object* x_190; 
-x_188 = lean_ctor_get(x_183, 0);
-x_189 = lean_ctor_get(x_183, 1);
-lean_inc(x_189);
-lean_inc(x_188);
-lean_dec(x_183);
-x_190 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_190, 0, x_188);
-lean_ctor_set(x_190, 1, x_189);
-return x_190;
-}
-}
-}
-else
-{
-uint8_t x_191; 
-lean_dec(x_173);
-lean_dec(x_172);
-lean_dec(x_9);
-lean_dec(x_8);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-lean_dec(x_1);
-x_191 = !lean_is_exclusive(x_180);
-if (x_191 == 0)
-{
+lean_ctor_set(x_178, 0, x_175);
+lean_ctor_set(x_178, 1, x_176);
+x_179 = lean_array_push(x_8, x_178);
+x_180 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_180, 0, x_179);
+lean_ctor_set(x_180, 1, x_173);
 return x_180;
 }
 else
 {
+lean_object* x_181; 
+x_181 = lean_ctor_get(x_174, 0);
+lean_inc(x_181);
+if (lean_obj_tag(x_181) == 0)
+{
+lean_object* x_182; 
+x_182 = lean_ctor_get(x_181, 0);
+lean_inc(x_182);
+if (lean_obj_tag(x_182) == 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_dec(x_181);
+x_183 = lean_ctor_get(x_174, 1);
+lean_inc(x_183);
+if (lean_is_exclusive(x_174)) {
+ lean_ctor_release(x_174, 0);
+ lean_ctor_release(x_174, 1);
+ x_184 = x_174;
+} else {
+ lean_dec_ref(x_174);
+ x_184 = lean_box(0);
+}
+x_185 = lean_ctor_get(x_182, 0);
+lean_inc(x_185);
+lean_dec(x_182);
+if (lean_is_scalar(x_184)) {
+ x_186 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_186 = x_184;
+}
+lean_ctor_set(x_186, 0, x_185);
+lean_ctor_set(x_186, 1, x_183);
+x_187 = lean_array_push(x_8, x_186);
+x_188 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_188, 0, x_187);
+lean_ctor_set(x_188, 1, x_173);
+return x_188;
+}
+else
+{
+lean_object* x_189; lean_object* x_190; lean_object* x_191; 
+lean_dec(x_173);
+lean_dec(x_8);
+x_189 = lean_ctor_get(x_174, 1);
+lean_inc(x_189);
+if (lean_is_exclusive(x_174)) {
+ lean_ctor_release(x_174, 0);
+ lean_ctor_release(x_174, 1);
+ x_190 = x_174;
+} else {
+ lean_dec_ref(x_174);
+ x_190 = lean_box(0);
+}
+if (lean_is_scalar(x_190)) {
+ x_191 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_191 = x_190;
+}
+lean_ctor_set(x_191, 0, x_181);
+lean_ctor_set(x_191, 1, x_189);
+return x_191;
+}
+}
+else
+{
 lean_object* x_192; lean_object* x_193; lean_object* x_194; 
-x_192 = lean_ctor_get(x_180, 0);
-x_193 = lean_ctor_get(x_180, 1);
-lean_inc(x_193);
+lean_dec(x_173);
+lean_dec(x_8);
+x_192 = lean_ctor_get(x_174, 1);
 lean_inc(x_192);
-lean_dec(x_180);
-x_194 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_194, 0, x_192);
-lean_ctor_set(x_194, 1, x_193);
+if (lean_is_exclusive(x_174)) {
+ lean_ctor_release(x_174, 0);
+ lean_ctor_release(x_174, 1);
+ x_193 = x_174;
+} else {
+ lean_dec_ref(x_174);
+ x_193 = lean_box(0);
+}
+if (lean_is_scalar(x_193)) {
+ x_194 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_194 = x_193;
+}
+lean_ctor_set(x_194, 0, x_181);
+lean_ctor_set(x_194, 1, x_192);
 return x_194;
 }
 }
 }
-else
-{
-lean_object* x_195; lean_object* x_196; 
-lean_dec(x_176);
-x_195 = lean_box(0);
-lean_inc(x_9);
-x_196 = l_Lean_Elab_Term_resolveName(x_2, x_172, x_173, x_195, x_9, x_10);
-if (lean_obj_tag(x_196) == 0)
-{
-lean_object* x_197; lean_object* x_198; lean_object* x_199; 
-x_197 = lean_ctor_get(x_196, 0);
-lean_inc(x_197);
-x_198 = lean_ctor_get(x_196, 1);
-lean_inc(x_198);
-lean_dec(x_196);
-x_199 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__3(x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_197, x_9, x_198);
-return x_199;
 }
 else
 {
-uint8_t x_200; 
+uint8_t x_195; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
@@ -7254,30 +7543,106 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_200 = !lean_is_exclusive(x_196);
-if (x_200 == 0)
+x_195 = !lean_is_exclusive(x_143);
+if (x_195 == 0)
 {
-return x_196;
+return x_143;
 }
 else
 {
-lean_object* x_201; lean_object* x_202; lean_object* x_203; 
-x_201 = lean_ctor_get(x_196, 0);
-x_202 = lean_ctor_get(x_196, 1);
-lean_inc(x_202);
-lean_inc(x_201);
-lean_dec(x_196);
-x_203 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_203, 0, x_201);
-lean_ctor_set(x_203, 1, x_202);
-return x_203;
-}
+lean_object* x_196; lean_object* x_197; lean_object* x_198; 
+x_196 = lean_ctor_get(x_143, 0);
+x_197 = lean_ctor_get(x_143, 1);
+lean_inc(x_197);
+lean_inc(x_196);
+lean_dec(x_143);
+x_198 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_198, 0, x_196);
+lean_ctor_set(x_198, 1, x_197);
+return x_198;
 }
 }
 }
 else
 {
-lean_object* x_204; lean_object* x_205; 
+if (lean_obj_tag(x_138) == 3)
+{
+lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; uint8_t x_204; 
+x_199 = lean_ctor_get(x_138, 2);
+lean_inc(x_199);
+x_200 = lean_ctor_get(x_138, 3);
+lean_inc(x_200);
+lean_dec(x_138);
+x_201 = lean_unsigned_to_nat(1u);
+x_202 = l_Lean_Syntax_getArg(x_2, x_201);
+x_203 = l_Lean_Syntax_getArgs(x_202);
+lean_dec(x_202);
+x_204 = l_Array_isEmpty___rarg(x_203);
+if (x_204 == 0)
+{
+lean_object* x_205; lean_object* x_206; lean_object* x_207; 
+x_205 = l_Lean_stxInh;
+x_206 = lean_array_get(x_205, x_203, x_137);
+lean_dec(x_203);
+x_207 = l_Lean_Elab_Term_elabExplicitUniv(x_206, x_9, x_10);
+lean_dec(x_206);
+if (lean_obj_tag(x_207) == 0)
+{
+lean_object* x_208; lean_object* x_209; lean_object* x_210; 
+x_208 = lean_ctor_get(x_207, 0);
+lean_inc(x_208);
+x_209 = lean_ctor_get(x_207, 1);
+lean_inc(x_209);
+lean_dec(x_207);
+lean_inc(x_9);
+x_210 = l_Lean_Elab_Term_resolveName(x_2, x_199, x_200, x_208, x_9, x_209);
+if (lean_obj_tag(x_210) == 0)
+{
+lean_object* x_211; lean_object* x_212; lean_object* x_213; 
+x_211 = lean_ctor_get(x_210, 0);
+lean_inc(x_211);
+x_212 = lean_ctor_get(x_210, 1);
+lean_inc(x_212);
+lean_dec(x_210);
+x_213 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__2(x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_211, x_9, x_212);
+return x_213;
+}
+else
+{
+uint8_t x_214; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_214 = !lean_is_exclusive(x_210);
+if (x_214 == 0)
+{
+return x_210;
+}
+else
+{
+lean_object* x_215; lean_object* x_216; lean_object* x_217; 
+x_215 = lean_ctor_get(x_210, 0);
+x_216 = lean_ctor_get(x_210, 1);
+lean_inc(x_216);
+lean_inc(x_215);
+lean_dec(x_210);
+x_217 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_217, 0, x_215);
+lean_ctor_set(x_217, 1, x_216);
+return x_217;
+}
+}
+}
+else
+{
+uint8_t x_218; 
+lean_dec(x_200);
+lean_dec(x_199);
+lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_5);
@@ -7285,353 +7650,497 @@ lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 lean_dec(x_1);
-x_204 = l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___closed__1;
-x_205 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_120, x_204, x_9, x_10);
-return x_205;
-}
-}
-}
-}
-}
-block_318:
+x_218 = !lean_is_exclusive(x_207);
+if (x_218 == 0)
 {
-lean_object* x_208; uint8_t x_209; 
+return x_207;
+}
+else
+{
+lean_object* x_219; lean_object* x_220; lean_object* x_221; 
+x_219 = lean_ctor_get(x_207, 0);
+x_220 = lean_ctor_get(x_207, 1);
+lean_inc(x_220);
+lean_inc(x_219);
 lean_dec(x_207);
-x_208 = l_Lean_Parser_Term_proj___elambda__1___closed__2;
-lean_inc(x_2);
-x_209 = l_Lean_Syntax_isOfKind(x_2, x_208);
-if (x_209 == 0)
-{
-lean_object* x_210; uint8_t x_211; 
-x_210 = l_Lean_Parser_Term_arrayRef___elambda__1___closed__2;
-lean_inc(x_2);
-x_211 = l_Lean_Syntax_isOfKind(x_2, x_210);
-if (x_211 == 0)
-{
-lean_object* x_212; 
-x_212 = lean_box(0);
-x_14 = x_212;
-goto block_206;
-}
-else
-{
-lean_object* x_213; lean_object* x_214; lean_object* x_215; uint8_t x_216; 
-x_213 = l_Lean_Syntax_getArgs(x_2);
-x_214 = lean_array_get_size(x_213);
-lean_dec(x_213);
-x_215 = lean_unsigned_to_nat(4u);
-x_216 = lean_nat_dec_eq(x_214, x_215);
-lean_dec(x_214);
-if (x_216 == 0)
-{
-lean_object* x_217; 
-x_217 = lean_box(0);
-x_14 = x_217;
-goto block_206;
-}
-else
-{
-lean_object* x_218; lean_object* x_219; lean_object* x_220; lean_object* x_221; lean_object* x_222; lean_object* x_223; 
-x_218 = lean_unsigned_to_nat(0u);
-x_219 = l_Lean_Syntax_getArg(x_2, x_218);
-x_220 = lean_unsigned_to_nat(2u);
-x_221 = l_Lean_Syntax_getArg(x_2, x_220);
-lean_dec(x_2);
-x_222 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_222, 0, x_221);
-x_223 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_223, 0, x_222);
-lean_ctor_set(x_223, 1, x_3);
-x_2 = x_219;
-x_3 = x_223;
-goto _start;
+x_221 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_221, 0, x_219);
+lean_ctor_set(x_221, 1, x_220);
+return x_221;
 }
 }
 }
 else
 {
-lean_object* x_225; lean_object* x_226; lean_object* x_227; uint8_t x_228; 
-x_225 = l_Lean_Syntax_getArgs(x_2);
-x_226 = lean_array_get_size(x_225);
-lean_dec(x_225);
-x_227 = lean_unsigned_to_nat(3u);
-x_228 = lean_nat_dec_eq(x_226, x_227);
-if (x_228 == 0)
+lean_object* x_222; lean_object* x_223; 
+lean_dec(x_203);
+x_222 = lean_box(0);
+lean_inc(x_9);
+x_223 = l_Lean_Elab_Term_resolveName(x_2, x_199, x_200, x_222, x_9, x_10);
+if (lean_obj_tag(x_223) == 0)
 {
-lean_object* x_229; uint8_t x_230; 
-x_229 = l_Lean_Parser_Term_arrayRef___elambda__1___closed__2;
-lean_inc(x_2);
-x_230 = l_Lean_Syntax_isOfKind(x_2, x_229);
-if (x_230 == 0)
+lean_object* x_224; lean_object* x_225; lean_object* x_226; 
+x_224 = lean_ctor_get(x_223, 0);
+lean_inc(x_224);
+x_225 = lean_ctor_get(x_223, 1);
+lean_inc(x_225);
+lean_dec(x_223);
+x_226 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__3(x_1, x_3, x_4, x_5, x_6, x_7, x_8, x_224, x_9, x_225);
+return x_226;
+}
+else
+{
+uint8_t x_227; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+x_227 = !lean_is_exclusive(x_223);
+if (x_227 == 0)
+{
+return x_223;
+}
+else
+{
+lean_object* x_228; lean_object* x_229; lean_object* x_230; 
+x_228 = lean_ctor_get(x_223, 0);
+x_229 = lean_ctor_get(x_223, 1);
+lean_inc(x_229);
+lean_inc(x_228);
+lean_dec(x_223);
+x_230 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_230, 0, x_228);
+lean_ctor_set(x_230, 1, x_229);
+return x_230;
+}
+}
+}
+}
+else
 {
 lean_object* x_231; 
-lean_dec(x_226);
-x_231 = lean_box(0);
-x_14 = x_231;
-goto block_206;
-}
-else
-{
-lean_object* x_232; uint8_t x_233; 
-x_232 = lean_unsigned_to_nat(4u);
-x_233 = lean_nat_dec_eq(x_226, x_232);
-lean_dec(x_226);
-if (x_233 == 0)
-{
-lean_object* x_234; 
-x_234 = lean_box(0);
-x_14 = x_234;
-goto block_206;
-}
-else
-{
-lean_object* x_235; lean_object* x_236; lean_object* x_237; lean_object* x_238; lean_object* x_239; lean_object* x_240; 
-x_235 = lean_unsigned_to_nat(0u);
-x_236 = l_Lean_Syntax_getArg(x_2, x_235);
-x_237 = lean_unsigned_to_nat(2u);
-x_238 = l_Lean_Syntax_getArg(x_2, x_237);
+lean_dec(x_138);
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
 lean_dec(x_2);
-x_239 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_239, 0, x_238);
-x_240 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_240, 0, x_239);
-lean_ctor_set(x_240, 1, x_3);
-x_2 = x_236;
-x_3 = x_240;
+lean_dec(x_1);
+x_231 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_10);
+return x_231;
+}
+}
+}
+}
+}
+block_353:
+{
+lean_object* x_234; uint8_t x_235; 
+lean_dec(x_233);
+x_234 = l_Lean_Parser_Term_proj___elambda__1___closed__2;
+lean_inc(x_2);
+x_235 = l_Lean_Syntax_isOfKind(x_2, x_234);
+if (x_235 == 0)
+{
+lean_object* x_236; uint8_t x_237; 
+x_236 = l_Lean_Parser_Term_arrayRef___elambda__1___closed__2;
+lean_inc(x_2);
+x_237 = l_Lean_Syntax_isOfKind(x_2, x_236);
+if (x_237 == 0)
+{
+lean_object* x_238; 
+x_238 = lean_box(0);
+x_14 = x_238;
+goto block_232;
+}
+else
+{
+lean_object* x_239; lean_object* x_240; lean_object* x_241; uint8_t x_242; 
+x_239 = l_Lean_Syntax_getArgs(x_2);
+x_240 = lean_array_get_size(x_239);
+lean_dec(x_239);
+x_241 = lean_unsigned_to_nat(4u);
+x_242 = lean_nat_dec_eq(x_240, x_241);
+lean_dec(x_240);
+if (x_242 == 0)
+{
+lean_object* x_243; 
+x_243 = lean_box(0);
+x_14 = x_243;
+goto block_232;
+}
+else
+{
+lean_object* x_244; lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; 
+x_244 = lean_unsigned_to_nat(0u);
+x_245 = l_Lean_Syntax_getArg(x_2, x_244);
+x_246 = lean_unsigned_to_nat(2u);
+x_247 = l_Lean_Syntax_getArg(x_2, x_246);
+lean_dec(x_2);
+x_248 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_248, 0, x_247);
+x_249 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_249, 0, x_248);
+lean_ctor_set(x_249, 1, x_3);
+x_2 = x_245;
+x_3 = x_249;
 goto _start;
 }
 }
 }
 else
 {
-lean_object* x_242; lean_object* x_243; lean_object* x_244; uint8_t x_245; 
-lean_dec(x_226);
-x_242 = lean_unsigned_to_nat(2u);
-x_243 = l_Lean_Syntax_getArg(x_2, x_242);
-x_244 = l_Lean_fieldIdxKind___closed__2;
-lean_inc(x_243);
-x_245 = l_Lean_Syntax_isOfKind(x_243, x_244);
-if (x_245 == 0)
+lean_object* x_251; lean_object* x_252; lean_object* x_253; uint8_t x_254; 
+x_251 = l_Lean_Syntax_getArgs(x_2);
+x_252 = lean_array_get_size(x_251);
+lean_dec(x_251);
+x_253 = lean_unsigned_to_nat(3u);
+x_254 = lean_nat_dec_eq(x_252, x_253);
+if (x_254 == 0)
 {
-lean_object* x_246; uint8_t x_247; 
-x_246 = l_Lean_Syntax_getKind___closed__4;
-lean_inc(x_243);
-x_247 = l_Lean_Syntax_isOfKind(x_243, x_246);
-if (x_247 == 0)
+lean_object* x_255; uint8_t x_256; 
+x_255 = l_Lean_Parser_Term_arrayRef___elambda__1___closed__2;
+lean_inc(x_2);
+x_256 = l_Lean_Syntax_isOfKind(x_2, x_255);
+if (x_256 == 0)
 {
-lean_object* x_248; uint8_t x_249; lean_object* x_250; 
-lean_dec(x_243);
-x_248 = lean_box(0);
-x_249 = 1;
+lean_object* x_257; 
+lean_dec(x_252);
+x_257 = lean_box(0);
+x_14 = x_257;
+goto block_232;
+}
+else
+{
+lean_object* x_258; uint8_t x_259; 
+x_258 = lean_unsigned_to_nat(4u);
+x_259 = lean_nat_dec_eq(x_252, x_258);
+lean_dec(x_252);
+if (x_259 == 0)
+{
+lean_object* x_260; 
+x_260 = lean_box(0);
+x_14 = x_260;
+goto block_232;
+}
+else
+{
+lean_object* x_261; lean_object* x_262; lean_object* x_263; lean_object* x_264; lean_object* x_265; lean_object* x_266; 
+x_261 = lean_unsigned_to_nat(0u);
+x_262 = l_Lean_Syntax_getArg(x_2, x_261);
+x_263 = lean_unsigned_to_nat(2u);
+x_264 = l_Lean_Syntax_getArg(x_2, x_263);
+lean_dec(x_2);
+x_265 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_265, 0, x_264);
+x_266 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_266, 0, x_265);
+lean_ctor_set(x_266, 1, x_3);
+x_2 = x_262;
+x_3 = x_266;
+goto _start;
+}
+}
+}
+else
+{
+lean_object* x_268; lean_object* x_269; lean_object* x_270; uint8_t x_271; 
+lean_dec(x_252);
+x_268 = lean_unsigned_to_nat(2u);
+x_269 = l_Lean_Syntax_getArg(x_2, x_268);
+x_270 = l_Lean_fieldIdxKind___closed__2;
+lean_inc(x_269);
+x_271 = l_Lean_Syntax_isOfKind(x_269, x_270);
+if (x_271 == 0)
+{
+lean_object* x_272; uint8_t x_273; 
+x_272 = l_Lean_Syntax_getKind___closed__4;
+lean_inc(x_269);
+x_273 = l_Lean_Syntax_isOfKind(x_269, x_272);
+if (x_273 == 0)
+{
+lean_object* x_274; uint8_t x_275; lean_object* x_276; 
+lean_dec(x_269);
+x_274 = lean_box(0);
+x_275 = 1;
 lean_inc(x_9);
-x_250 = l_Lean_Elab_Term_elabTerm(x_2, x_248, x_249, x_249, x_9, x_10);
-if (lean_obj_tag(x_250) == 0)
-{
-uint8_t x_251; 
-x_251 = !lean_is_exclusive(x_250);
-if (x_251 == 0)
-{
-lean_object* x_252; lean_object* x_253; lean_object* x_254; 
-x_252 = lean_ctor_get(x_250, 0);
-x_253 = lean_ctor_get(x_250, 1);
-lean_inc(x_253);
-x_254 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_252, x_3, x_4, x_5, x_6, x_7, x_9, x_253);
-if (lean_obj_tag(x_254) == 0)
-{
-uint8_t x_255; 
-x_255 = !lean_is_exclusive(x_254);
-if (x_255 == 0)
-{
-lean_object* x_256; 
-x_256 = lean_array_push(x_8, x_254);
-lean_ctor_set(x_250, 0, x_256);
-return x_250;
-}
-else
-{
-lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; 
-x_257 = lean_ctor_get(x_254, 0);
-x_258 = lean_ctor_get(x_254, 1);
-lean_inc(x_258);
-lean_inc(x_257);
-lean_dec(x_254);
-x_259 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_259, 0, x_257);
-lean_ctor_set(x_259, 1, x_258);
-x_260 = lean_array_push(x_8, x_259);
-lean_ctor_set(x_250, 0, x_260);
-return x_250;
-}
-}
-else
-{
-lean_object* x_261; 
-x_261 = lean_ctor_get(x_254, 0);
-lean_inc(x_261);
-if (lean_obj_tag(x_261) == 0)
-{
-uint8_t x_262; 
-x_262 = !lean_is_exclusive(x_254);
-if (x_262 == 0)
-{
-lean_object* x_263; lean_object* x_264; lean_object* x_265; 
-x_263 = lean_ctor_get(x_254, 0);
-lean_dec(x_263);
-x_264 = lean_ctor_get(x_261, 0);
-lean_inc(x_264);
-lean_dec(x_261);
-lean_ctor_set(x_254, 0, x_264);
-x_265 = lean_array_push(x_8, x_254);
-lean_ctor_set(x_250, 0, x_265);
-return x_250;
-}
-else
-{
-lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; 
-x_266 = lean_ctor_get(x_254, 1);
-lean_inc(x_266);
-lean_dec(x_254);
-x_267 = lean_ctor_get(x_261, 0);
-lean_inc(x_267);
-lean_dec(x_261);
-x_268 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_268, 0, x_267);
-lean_ctor_set(x_268, 1, x_266);
-x_269 = lean_array_push(x_8, x_268);
-lean_ctor_set(x_250, 0, x_269);
-return x_250;
-}
-}
-else
-{
-uint8_t x_270; 
-lean_free_object(x_250);
-lean_dec(x_253);
-lean_dec(x_8);
-x_270 = !lean_is_exclusive(x_254);
-if (x_270 == 0)
-{
-lean_object* x_271; 
-x_271 = lean_ctor_get(x_254, 0);
-lean_dec(x_271);
-return x_254;
-}
-else
-{
-lean_object* x_272; lean_object* x_273; 
-x_272 = lean_ctor_get(x_254, 1);
-lean_inc(x_272);
-lean_dec(x_254);
-x_273 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_273, 0, x_261);
-lean_ctor_set(x_273, 1, x_272);
-return x_273;
-}
-}
-}
-}
-else
-{
-lean_object* x_274; lean_object* x_275; lean_object* x_276; 
-x_274 = lean_ctor_get(x_250, 0);
-x_275 = lean_ctor_get(x_250, 1);
-lean_inc(x_275);
-lean_inc(x_274);
-lean_dec(x_250);
-lean_inc(x_275);
-x_276 = l___private_Init_Lean_Elab_TermApp_12__elabAppLVals(x_1, x_274, x_3, x_4, x_5, x_6, x_7, x_9, x_275);
+x_276 = l_Lean_Elab_Term_elabTerm(x_2, x_274, x_275, x_275, x_9, x_10);
 if (lean_obj_tag(x_276) == 0)
 {
-lean_object* x_277; lean_object* x_278; lean_object* x_279; lean_object* x_280; lean_object* x_281; lean_object* x_282; 
-x_277 = lean_ctor_get(x_276, 0);
-lean_inc(x_277);
-x_278 = lean_ctor_get(x_276, 1);
-lean_inc(x_278);
-if (lean_is_exclusive(x_276)) {
- lean_ctor_release(x_276, 0);
- lean_ctor_release(x_276, 1);
- x_279 = x_276;
-} else {
- lean_dec_ref(x_276);
- x_279 = lean_box(0);
-}
-if (lean_is_scalar(x_279)) {
- x_280 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_280 = x_279;
-}
-lean_ctor_set(x_280, 0, x_277);
-lean_ctor_set(x_280, 1, x_278);
-x_281 = lean_array_push(x_8, x_280);
-x_282 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_282, 0, x_281);
-lean_ctor_set(x_282, 1, x_275);
-return x_282;
+uint8_t x_277; 
+x_277 = !lean_is_exclusive(x_276);
+if (x_277 == 0)
+{
+lean_object* x_278; lean_object* x_279; lean_object* x_280; 
+x_278 = lean_ctor_get(x_276, 0);
+x_279 = lean_ctor_get(x_276, 1);
+lean_inc(x_279);
+x_280 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_278, x_3, x_4, x_5, x_6, x_7, x_9, x_279);
+if (lean_obj_tag(x_280) == 0)
+{
+uint8_t x_281; 
+x_281 = !lean_is_exclusive(x_280);
+if (x_281 == 0)
+{
+lean_object* x_282; 
+x_282 = lean_array_push(x_8, x_280);
+lean_ctor_set(x_276, 0, x_282);
+return x_276;
 }
 else
 {
-lean_object* x_283; 
-x_283 = lean_ctor_get(x_276, 0);
-lean_inc(x_283);
-if (lean_obj_tag(x_283) == 0)
-{
-lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; lean_object* x_289; 
-x_284 = lean_ctor_get(x_276, 1);
+lean_object* x_283; lean_object* x_284; lean_object* x_285; lean_object* x_286; 
+x_283 = lean_ctor_get(x_280, 0);
+x_284 = lean_ctor_get(x_280, 1);
 lean_inc(x_284);
-if (lean_is_exclusive(x_276)) {
- lean_ctor_release(x_276, 0);
- lean_ctor_release(x_276, 1);
- x_285 = x_276;
-} else {
- lean_dec_ref(x_276);
- x_285 = lean_box(0);
+lean_inc(x_283);
+lean_dec(x_280);
+x_285 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_285, 0, x_283);
+lean_ctor_set(x_285, 1, x_284);
+x_286 = lean_array_push(x_8, x_285);
+lean_ctor_set(x_276, 0, x_286);
+return x_276;
 }
-x_286 = lean_ctor_get(x_283, 0);
-lean_inc(x_286);
-lean_dec(x_283);
-if (lean_is_scalar(x_285)) {
- x_287 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_287 = x_285;
-}
-lean_ctor_set(x_287, 0, x_286);
-lean_ctor_set(x_287, 1, x_284);
-x_288 = lean_array_push(x_8, x_287);
-x_289 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_289, 0, x_288);
-lean_ctor_set(x_289, 1, x_275);
-return x_289;
 }
 else
 {
+lean_object* x_287; 
+x_287 = lean_ctor_get(x_280, 0);
+lean_inc(x_287);
+if (lean_obj_tag(x_287) == 0)
+{
+lean_object* x_288; 
+x_288 = lean_ctor_get(x_287, 0);
+lean_inc(x_288);
+if (lean_obj_tag(x_288) == 0)
+{
+uint8_t x_289; 
+lean_dec(x_287);
+x_289 = !lean_is_exclusive(x_280);
+if (x_289 == 0)
+{
 lean_object* x_290; lean_object* x_291; lean_object* x_292; 
-lean_dec(x_275);
+x_290 = lean_ctor_get(x_280, 0);
+lean_dec(x_290);
+x_291 = lean_ctor_get(x_288, 0);
+lean_inc(x_291);
+lean_dec(x_288);
+lean_ctor_set(x_280, 0, x_291);
+x_292 = lean_array_push(x_8, x_280);
+lean_ctor_set(x_276, 0, x_292);
+return x_276;
+}
+else
+{
+lean_object* x_293; lean_object* x_294; lean_object* x_295; lean_object* x_296; 
+x_293 = lean_ctor_get(x_280, 1);
+lean_inc(x_293);
+lean_dec(x_280);
+x_294 = lean_ctor_get(x_288, 0);
+lean_inc(x_294);
+lean_dec(x_288);
+x_295 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_295, 0, x_294);
+lean_ctor_set(x_295, 1, x_293);
+x_296 = lean_array_push(x_8, x_295);
+lean_ctor_set(x_276, 0, x_296);
+return x_276;
+}
+}
+else
+{
+uint8_t x_297; 
+lean_free_object(x_276);
+lean_dec(x_279);
 lean_dec(x_8);
-x_290 = lean_ctor_get(x_276, 1);
-lean_inc(x_290);
-if (lean_is_exclusive(x_276)) {
- lean_ctor_release(x_276, 0);
- lean_ctor_release(x_276, 1);
- x_291 = x_276;
-} else {
- lean_dec_ref(x_276);
- x_291 = lean_box(0);
+x_297 = !lean_is_exclusive(x_280);
+if (x_297 == 0)
+{
+lean_object* x_298; 
+x_298 = lean_ctor_get(x_280, 0);
+lean_dec(x_298);
+return x_280;
 }
-if (lean_is_scalar(x_291)) {
- x_292 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_292 = x_291;
+else
+{
+lean_object* x_299; lean_object* x_300; 
+x_299 = lean_ctor_get(x_280, 1);
+lean_inc(x_299);
+lean_dec(x_280);
+x_300 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_300, 0, x_287);
+lean_ctor_set(x_300, 1, x_299);
+return x_300;
 }
-lean_ctor_set(x_292, 0, x_283);
-lean_ctor_set(x_292, 1, x_290);
-return x_292;
+}
+}
+else
+{
+uint8_t x_301; 
+lean_free_object(x_276);
+lean_dec(x_279);
+lean_dec(x_8);
+x_301 = !lean_is_exclusive(x_280);
+if (x_301 == 0)
+{
+lean_object* x_302; 
+x_302 = lean_ctor_get(x_280, 0);
+lean_dec(x_302);
+return x_280;
+}
+else
+{
+lean_object* x_303; lean_object* x_304; 
+x_303 = lean_ctor_get(x_280, 1);
+lean_inc(x_303);
+lean_dec(x_280);
+x_304 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_304, 0, x_287);
+lean_ctor_set(x_304, 1, x_303);
+return x_304;
 }
 }
 }
 }
 else
 {
-uint8_t x_293; 
+lean_object* x_305; lean_object* x_306; lean_object* x_307; 
+x_305 = lean_ctor_get(x_276, 0);
+x_306 = lean_ctor_get(x_276, 1);
+lean_inc(x_306);
+lean_inc(x_305);
+lean_dec(x_276);
+lean_inc(x_306);
+x_307 = l___private_Init_Lean_Elab_TermApp_13__elabAppLVals(x_1, x_305, x_3, x_4, x_5, x_6, x_7, x_9, x_306);
+if (lean_obj_tag(x_307) == 0)
+{
+lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; lean_object* x_313; 
+x_308 = lean_ctor_get(x_307, 0);
+lean_inc(x_308);
+x_309 = lean_ctor_get(x_307, 1);
+lean_inc(x_309);
+if (lean_is_exclusive(x_307)) {
+ lean_ctor_release(x_307, 0);
+ lean_ctor_release(x_307, 1);
+ x_310 = x_307;
+} else {
+ lean_dec_ref(x_307);
+ x_310 = lean_box(0);
+}
+if (lean_is_scalar(x_310)) {
+ x_311 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_311 = x_310;
+}
+lean_ctor_set(x_311, 0, x_308);
+lean_ctor_set(x_311, 1, x_309);
+x_312 = lean_array_push(x_8, x_311);
+x_313 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_313, 0, x_312);
+lean_ctor_set(x_313, 1, x_306);
+return x_313;
+}
+else
+{
+lean_object* x_314; 
+x_314 = lean_ctor_get(x_307, 0);
+lean_inc(x_314);
+if (lean_obj_tag(x_314) == 0)
+{
+lean_object* x_315; 
+x_315 = lean_ctor_get(x_314, 0);
+lean_inc(x_315);
+if (lean_obj_tag(x_315) == 0)
+{
+lean_object* x_316; lean_object* x_317; lean_object* x_318; lean_object* x_319; lean_object* x_320; lean_object* x_321; 
+lean_dec(x_314);
+x_316 = lean_ctor_get(x_307, 1);
+lean_inc(x_316);
+if (lean_is_exclusive(x_307)) {
+ lean_ctor_release(x_307, 0);
+ lean_ctor_release(x_307, 1);
+ x_317 = x_307;
+} else {
+ lean_dec_ref(x_307);
+ x_317 = lean_box(0);
+}
+x_318 = lean_ctor_get(x_315, 0);
+lean_inc(x_318);
+lean_dec(x_315);
+if (lean_is_scalar(x_317)) {
+ x_319 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_319 = x_317;
+}
+lean_ctor_set(x_319, 0, x_318);
+lean_ctor_set(x_319, 1, x_316);
+x_320 = lean_array_push(x_8, x_319);
+x_321 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_321, 0, x_320);
+lean_ctor_set(x_321, 1, x_306);
+return x_321;
+}
+else
+{
+lean_object* x_322; lean_object* x_323; lean_object* x_324; 
+lean_dec(x_306);
+lean_dec(x_8);
+x_322 = lean_ctor_get(x_307, 1);
+lean_inc(x_322);
+if (lean_is_exclusive(x_307)) {
+ lean_ctor_release(x_307, 0);
+ lean_ctor_release(x_307, 1);
+ x_323 = x_307;
+} else {
+ lean_dec_ref(x_307);
+ x_323 = lean_box(0);
+}
+if (lean_is_scalar(x_323)) {
+ x_324 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_324 = x_323;
+}
+lean_ctor_set(x_324, 0, x_314);
+lean_ctor_set(x_324, 1, x_322);
+return x_324;
+}
+}
+else
+{
+lean_object* x_325; lean_object* x_326; lean_object* x_327; 
+lean_dec(x_306);
+lean_dec(x_8);
+x_325 = lean_ctor_get(x_307, 1);
+lean_inc(x_325);
+if (lean_is_exclusive(x_307)) {
+ lean_ctor_release(x_307, 0);
+ lean_ctor_release(x_307, 1);
+ x_326 = x_307;
+} else {
+ lean_dec_ref(x_307);
+ x_326 = lean_box(0);
+}
+if (lean_is_scalar(x_326)) {
+ x_327 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_327 = x_326;
+}
+lean_ctor_set(x_327, 0, x_314);
+lean_ctor_set(x_327, 1, x_325);
+return x_327;
+}
+}
+}
+}
+else
+{
+uint8_t x_328; 
 lean_dec(x_9);
 lean_dec(x_8);
 lean_dec(x_6);
@@ -7639,79 +8148,79 @@ lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_1);
-x_293 = !lean_is_exclusive(x_250);
-if (x_293 == 0)
+x_328 = !lean_is_exclusive(x_276);
+if (x_328 == 0)
 {
-return x_250;
+return x_276;
 }
 else
 {
-lean_object* x_294; lean_object* x_295; lean_object* x_296; 
-x_294 = lean_ctor_get(x_250, 0);
-x_295 = lean_ctor_get(x_250, 1);
-lean_inc(x_295);
-lean_inc(x_294);
-lean_dec(x_250);
-x_296 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_296, 0, x_294);
-lean_ctor_set(x_296, 1, x_295);
-return x_296;
+lean_object* x_329; lean_object* x_330; lean_object* x_331; 
+x_329 = lean_ctor_get(x_276, 0);
+x_330 = lean_ctor_get(x_276, 1);
+lean_inc(x_330);
+lean_inc(x_329);
+lean_dec(x_276);
+x_331 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_331, 0, x_329);
+lean_ctor_set(x_331, 1, x_330);
+return x_331;
 }
 }
 }
 else
 {
-lean_object* x_297; lean_object* x_298; lean_object* x_299; lean_object* x_300; lean_object* x_301; lean_object* x_302; 
-x_297 = l_Lean_Syntax_getId(x_243);
-lean_dec(x_243);
-x_298 = l_Lean_Name_components(x_297);
-x_299 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__4(x_298);
-x_300 = lean_unsigned_to_nat(0u);
-x_301 = l_Lean_Syntax_getArg(x_2, x_300);
+lean_object* x_332; lean_object* x_333; lean_object* x_334; lean_object* x_335; lean_object* x_336; lean_object* x_337; 
+x_332 = l_Lean_Syntax_getId(x_269);
+lean_dec(x_269);
+x_333 = l_Lean_Name_components(x_332);
+x_334 = l_List_map___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__4(x_333);
+x_335 = lean_unsigned_to_nat(0u);
+x_336 = l_Lean_Syntax_getArg(x_2, x_335);
 lean_dec(x_2);
-x_302 = l_List_append___rarg(x_299, x_3);
-x_2 = x_301;
-x_3 = x_302;
+x_337 = l_List_append___rarg(x_334, x_3);
+x_2 = x_336;
+x_3 = x_337;
 goto _start;
 }
 }
 else
 {
-lean_object* x_304; lean_object* x_305; lean_object* x_306; lean_object* x_307; 
-x_304 = l_Lean_fieldIdxKind;
-x_305 = l_Lean_Syntax_isNatLitAux(x_304, x_243);
-lean_dec(x_243);
-x_306 = lean_unsigned_to_nat(0u);
-x_307 = l_Lean_Syntax_getArg(x_2, x_306);
+lean_object* x_339; lean_object* x_340; lean_object* x_341; lean_object* x_342; 
+x_339 = l_Lean_fieldIdxKind;
+x_340 = l_Lean_Syntax_isNatLitAux(x_339, x_269);
+lean_dec(x_269);
+x_341 = lean_unsigned_to_nat(0u);
+x_342 = l_Lean_Syntax_getArg(x_2, x_341);
 lean_dec(x_2);
-if (lean_obj_tag(x_305) == 0)
+if (lean_obj_tag(x_340) == 0)
 {
-lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; 
-x_308 = l_Nat_Inhabited;
-x_309 = l_Option_get_x21___rarg___closed__3;
-x_310 = lean_panic_fn(x_308, x_309);
-x_311 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_311, 0, x_310);
-x_312 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_312, 0, x_311);
-lean_ctor_set(x_312, 1, x_3);
-x_2 = x_307;
-x_3 = x_312;
+lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_347; 
+x_343 = l_Nat_Inhabited;
+x_344 = l_Option_get_x21___rarg___closed__3;
+x_345 = lean_panic_fn(x_343, x_344);
+x_346 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_346, 0, x_345);
+x_347 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_347, 0, x_346);
+lean_ctor_set(x_347, 1, x_3);
+x_2 = x_342;
+x_3 = x_347;
 goto _start;
 }
 else
 {
-lean_object* x_314; lean_object* x_315; lean_object* x_316; 
-x_314 = lean_ctor_get(x_305, 0);
-lean_inc(x_314);
-lean_dec(x_305);
-x_315 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_315, 0, x_314);
-x_316 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_316, 0, x_315);
-lean_ctor_set(x_316, 1, x_3);
-x_2 = x_307;
-x_3 = x_316;
+lean_object* x_349; lean_object* x_350; lean_object* x_351; 
+x_349 = lean_ctor_get(x_340, 0);
+lean_inc(x_349);
+lean_dec(x_340);
+x_350 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_350, 0, x_349);
+x_351 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_351, 0, x_350);
+lean_ctor_set(x_351, 1, x_3);
+x_2 = x_342;
+x_3 = x_351;
 goto _start;
 }
 }
@@ -7721,77 +8230,77 @@ goto _start;
 }
 else
 {
-lean_object* x_382; lean_object* x_383; lean_object* x_384; 
-x_382 = l_Lean_Syntax_getArgs(x_2);
-x_383 = lean_unsigned_to_nat(0u);
-x_384 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__5(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_382, x_383, x_8, x_9, x_10);
-lean_dec(x_382);
+lean_object* x_426; lean_object* x_427; lean_object* x_428; 
+x_426 = l_Lean_Syntax_getArgs(x_2);
+x_427 = lean_unsigned_to_nat(0u);
+x_428 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__5(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_426, x_427, x_8, x_9, x_10);
+lean_dec(x_426);
 lean_dec(x_2);
-return x_384;
+return x_428;
 }
 }
 }
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 uint8_t x_11; lean_object* x_12; 
 x_11 = lean_unbox(x_6);
 lean_dec(x_6);
-x_12 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__2(x_1, x_2, x_3, x_4, x_5, x_11, x_7, x_8, x_9, x_10);
+x_12 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__2(x_1, x_2, x_3, x_4, x_5, x_11, x_7, x_8, x_9, x_10);
 return x_12;
 }
 }
-lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 uint8_t x_11; lean_object* x_12; 
 x_11 = lean_unbox(x_6);
 lean_dec(x_6);
-x_12 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__3(x_1, x_2, x_3, x_4, x_5, x_11, x_7, x_8, x_9, x_10);
+x_12 = l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__3(x_1, x_2, x_3, x_4, x_5, x_11, x_7, x_8, x_9, x_10);
 return x_12;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__5___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11, lean_object* x_12) {
 _start:
 {
 uint8_t x_13; lean_object* x_14; 
 x_13 = lean_unbox(x_7);
 lean_dec(x_7);
-x_14 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___spec__5(x_1, x_2, x_3, x_4, x_5, x_6, x_13, x_8, x_9, x_10, x_11, x_12);
+x_14 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___spec__5(x_1, x_2, x_3, x_4, x_5, x_6, x_13, x_8, x_9, x_10, x_11, x_12);
 lean_dec(x_8);
 lean_dec(x_2);
 return x_14;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Elab_TermApp_14__elabAppFn___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 uint8_t x_11; lean_object* x_12; 
 x_11 = lean_unbox(x_7);
 lean_dec(x_7);
-x_12 = l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main(x_1, x_2, x_3, x_4, x_5, x_6, x_11, x_8, x_9, x_10);
+x_12 = l___private_Init_Lean_Elab_TermApp_14__elabAppFn___main(x_1, x_2, x_3, x_4, x_5, x_6, x_11, x_8, x_9, x_10);
 return x_12;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppFn(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Elab_TermApp_14__elabAppFn(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, uint8_t x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; 
-x_11 = l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_11 = l___private_Init_Lean_Elab_TermApp_14__elabAppFn___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_11;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_13__elabAppFn___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Elab_TermApp_14__elabAppFn___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 uint8_t x_11; lean_object* x_12; 
 x_11 = lean_unbox(x_7);
 lean_dec(x_7);
-x_12 = l___private_Init_Lean_Elab_TermApp_13__elabAppFn(x_1, x_2, x_3, x_4, x_5, x_6, x_11, x_8, x_9, x_10);
+x_12 = l___private_Init_Lean_Elab_TermApp_14__elabAppFn(x_1, x_2, x_3, x_4, x_5, x_6, x_11, x_8, x_9, x_10);
 return x_12;
 }
 }
-lean_object* l_Array_filterAux___main___at___private_Init_Lean_Elab_TermApp_14__getSuccess___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_filterAux___main___at___private_Init_Lean_Elab_TermApp_15__getSuccess___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -7855,16 +8364,16 @@ goto _start;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_14__getSuccess(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_TermApp_15__getSuccess(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Array_filterAux___main___at___private_Init_Lean_Elab_TermApp_14__getSuccess___spec__1(x_1, x_2, x_2);
+x_3 = l_Array_filterAux___main___at___private_Init_Lean_Elab_TermApp_15__getSuccess___spec__1(x_1, x_2, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_15__toMessageData___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_16__toMessageData___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -7891,7 +8400,7 @@ return x_11;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -7901,17 +8410,17 @@ lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__1;
+x_1 = l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__1;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_15__toMessageData(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_TermApp_16__toMessageData(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
@@ -7923,7 +8432,7 @@ lean_inc(x_7);
 lean_dec(x_5);
 x_8 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_8, 0, x_6);
-x_9 = l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_15__toMessageData___spec__1(x_8, x_3, x_7);
+x_9 = l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_16__toMessageData___spec__1(x_8, x_3, x_7);
 lean_dec(x_8);
 x_10 = !lean_is_exclusive(x_9);
 if (x_10 == 0)
@@ -7944,7 +8453,7 @@ x_16 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_16, 0, x_15);
 x_17 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_17, 0, x_16);
-x_18 = l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__2;
+x_18 = l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__2;
 x_19 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_19, 0, x_17);
 lean_ctor_set(x_19, 1, x_18);
@@ -8005,7 +8514,7 @@ x_36 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_36, 0, x_35);
 x_37 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_37, 0, x_36);
-x_38 = l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__2;
+x_38 = l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__2;
 x_39 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_39, 0, x_37);
 lean_ctor_set(x_39, 1, x_38);
@@ -8050,27 +8559,27 @@ return x_51;
 }
 }
 }
-lean_object* l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_15__toMessageData___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_16__toMessageData___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_15__toMessageData___spec__1(x_1, x_2, x_3);
+x_4 = l_Lean_Elab_getPosition___at___private_Init_Lean_Elab_TermApp_16__toMessageData___spec__1(x_1, x_2, x_3);
 lean_dec(x_2);
 lean_dec(x_1);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_15__toMessageData___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_TermApp_16__toMessageData___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l___private_Init_Lean_Elab_TermApp_15__toMessageData(x_1, x_2, x_3, x_4);
+x_5 = l___private_Init_Lean_Elab_TermApp_16__toMessageData(x_1, x_2, x_3, x_4);
 lean_dec(x_3);
 lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_16__mergeFailures___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_17__mergeFailures___spec__1(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; uint8_t x_7; 
@@ -8099,7 +8608,7 @@ x_14 = lean_array_fset(x_3, x_2, x_13);
 if (lean_obj_tag(x_11) == 0)
 {
 lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_15 = l___private_Init_Lean_Elab_Term_14__synthesizePendingInstMVar___lambda__1___closed__1;
+x_15 = l___private_Init_Lean_Elab_Term_14__resumePostponed___lambda__1___closed__1;
 x_16 = l_unreachable_x21___rarg(x_15);
 lean_inc(x_4);
 x_17 = lean_apply_2(x_16, x_4, x_5);
@@ -8154,7 +8663,7 @@ else
 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; 
 x_29 = lean_ctor_get(x_11, 0);
 lean_inc(x_29);
-x_30 = l___private_Init_Lean_Elab_TermApp_15__toMessageData(x_29, x_1, x_4, x_5);
+x_30 = l___private_Init_Lean_Elab_TermApp_16__toMessageData(x_29, x_1, x_4, x_5);
 x_31 = lean_ctor_get(x_30, 0);
 lean_inc(x_31);
 x_32 = lean_ctor_get(x_30, 1);
@@ -8174,7 +8683,7 @@ goto _start;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -8182,33 +8691,33 @@ x_1 = lean_mk_string("overloaded, errors ");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__1;
+x_1 = l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__2;
+x_1 = l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; 
 x_5 = lean_unsigned_to_nat(0u);
 lean_inc(x_3);
-x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_16__mergeFailures___spec__1(x_2, x_5, x_1, x_3, x_4);
+x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_17__mergeFailures___spec__1(x_2, x_5, x_1, x_3, x_4);
 if (lean_obj_tag(x_6) == 0)
 {
 lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
@@ -8219,7 +8728,7 @@ lean_inc(x_8);
 lean_dec(x_6);
 x_9 = l_Lean_MessageData_ofArray(x_7);
 lean_dec(x_7);
-x_10 = l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__3;
+x_10 = l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__3;
 x_11 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_11, 0, x_10);
 lean_ctor_set(x_11, 1, x_9);
@@ -8252,24 +8761,24 @@ return x_16;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_16__mergeFailures(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_TermApp_17__mergeFailures(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg), 4, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg), 4, 0);
 return x_2;
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_16__mergeFailures___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_17__mergeFailures___spec__1___boxed(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; 
-x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_16__mergeFailures___spec__1(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_17__mergeFailures___spec__1(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_1);
 return x_6;
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_17__elabAppAux___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_18__elabAppAux___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; uint8_t x_6; 
@@ -8346,7 +8855,7 @@ goto _start;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -8354,27 +8863,27 @@ x_1 = lean_mk_string("ambiguous, possible interpretations ");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__1;
+x_1 = l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__2;
+x_1 = l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_17__elabAppAux(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* l___private_Init_Lean_Elab_TermApp_18__elabAppAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; lean_object* x_10; lean_object* x_11; 
@@ -8383,7 +8892,7 @@ x_9 = 0;
 x_10 = l_Array_empty___closed__1;
 lean_inc(x_6);
 lean_inc(x_2);
-x_11 = l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main(x_1, x_2, x_8, x_3, x_4, x_5, x_9, x_10, x_6, x_7);
+x_11 = l___private_Init_Lean_Elab_TermApp_14__elabAppFn___main(x_1, x_2, x_8, x_3, x_4, x_5, x_9, x_10, x_6, x_7);
 if (lean_obj_tag(x_11) == 0)
 {
 lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
@@ -8401,7 +8910,7 @@ if (x_16 == 0)
 lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
 x_17 = lean_unsigned_to_nat(0u);
 lean_inc(x_12);
-x_18 = l_Array_filterAux___main___at___private_Init_Lean_Elab_TermApp_14__getSuccess___spec__1(x_12, x_17, x_17);
+x_18 = l_Array_filterAux___main___at___private_Init_Lean_Elab_TermApp_15__getSuccess___spec__1(x_12, x_17, x_17);
 x_19 = lean_array_get_size(x_18);
 x_20 = lean_nat_dec_eq(x_19, x_15);
 if (x_20 == 0)
@@ -8413,7 +8922,7 @@ if (x_21 == 0)
 {
 lean_object* x_22; 
 lean_dec(x_18);
-x_22 = l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg(x_12, x_2, x_6, x_13);
+x_22 = l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg(x_12, x_2, x_6, x_13);
 return x_22;
 }
 else
@@ -8432,10 +8941,10 @@ lean_inc(x_27);
 x_28 = lean_ctor_get(x_26, 1);
 lean_inc(x_28);
 lean_dec(x_26);
-x_29 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_17__elabAppAux___spec__1(x_24, x_27, x_17, x_18);
+x_29 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermApp_18__elabAppAux___spec__1(x_24, x_27, x_17, x_18);
 x_30 = l_Lean_MessageData_ofArray(x_29);
 lean_dec(x_29);
-x_31 = l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__3;
+x_31 = l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__3;
 x_32 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_32, 0, x_31);
 lean_ctor_set(x_32, 1, x_30);
@@ -8498,7 +9007,7 @@ return x_44;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_18__expandApp___main___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_19__expandApp___main___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -8509,7 +9018,7 @@ lean_ctor_set(x_2, 1, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_18__expandApp___main(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_TermApp_19__expandApp___main(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -8520,7 +9029,7 @@ if (x_5 == 0)
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 lean_dec(x_2);
-x_6 = l___private_Init_Lean_Elab_TermApp_18__expandApp___main___closed__1;
+x_6 = l___private_Init_Lean_Elab_TermApp_19__expandApp___main___closed__1;
 x_7 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_7, 0, x_1);
 lean_ctor_set(x_7, 1, x_6);
@@ -8542,7 +9051,7 @@ if (x_12 == 0)
 {
 lean_object* x_13; lean_object* x_14; lean_object* x_15; 
 lean_dec(x_2);
-x_13 = l___private_Init_Lean_Elab_TermApp_18__expandApp___main___closed__1;
+x_13 = l___private_Init_Lean_Elab_TermApp_19__expandApp___main___closed__1;
 x_14 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_14, 0, x_1);
 lean_ctor_set(x_14, 1, x_13);
@@ -8565,7 +9074,7 @@ x_21 = l_Lean_Syntax_isOfKind(x_19, x_20);
 if (x_21 == 0)
 {
 lean_object* x_22; 
-x_22 = l___private_Init_Lean_Elab_TermApp_18__expandApp___main(x_17, x_2, x_3);
+x_22 = l___private_Init_Lean_Elab_TermApp_19__expandApp___main(x_17, x_2, x_3);
 if (lean_obj_tag(x_22) == 0)
 {
 lean_object* x_23; lean_object* x_24; uint8_t x_25; 
@@ -8736,7 +9245,7 @@ lean_dec(x_62);
 if (x_64 == 0)
 {
 lean_object* x_65; 
-x_65 = l___private_Init_Lean_Elab_TermApp_18__expandApp___main(x_17, x_2, x_3);
+x_65 = l___private_Init_Lean_Elab_TermApp_19__expandApp___main(x_17, x_2, x_3);
 if (lean_obj_tag(x_65) == 0)
 {
 lean_object* x_66; lean_object* x_67; uint8_t x_68; 
@@ -8903,7 +9412,7 @@ x_105 = lean_unsigned_to_nat(3u);
 x_106 = l_Lean_Syntax_getArg(x_19, x_105);
 lean_dec(x_19);
 lean_inc(x_2);
-x_107 = l___private_Init_Lean_Elab_TermApp_18__expandApp___main(x_17, x_2, x_3);
+x_107 = l___private_Init_Lean_Elab_TermApp_19__expandApp___main(x_17, x_2, x_3);
 if (lean_obj_tag(x_107) == 0)
 {
 lean_object* x_108; lean_object* x_109; lean_object* x_110; uint8_t x_111; 
@@ -9179,11 +9688,11 @@ return x_166;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_18__expandApp(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_TermApp_19__expandApp(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l___private_Init_Lean_Elab_TermApp_18__expandApp___main(x_1, x_2, x_3);
+x_4 = l___private_Init_Lean_Elab_TermApp_19__expandApp___main(x_1, x_2, x_3);
 return x_4;
 }
 }
@@ -9193,7 +9702,7 @@ _start:
 lean_object* x_5; 
 lean_inc(x_3);
 lean_inc(x_1);
-x_5 = l___private_Init_Lean_Elab_TermApp_18__expandApp___main(x_1, x_3, x_4);
+x_5 = l___private_Init_Lean_Elab_TermApp_19__expandApp___main(x_1, x_3, x_4);
 if (lean_obj_tag(x_5) == 0)
 {
 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; 
@@ -9212,7 +9721,7 @@ lean_inc(x_10);
 x_11 = lean_ctor_get(x_7, 1);
 lean_inc(x_11);
 lean_dec(x_7);
-x_12 = l___private_Init_Lean_Elab_TermApp_17__elabAppAux(x_1, x_9, x_10, x_11, x_2, x_3, x_8);
+x_12 = l___private_Init_Lean_Elab_TermApp_18__elabAppAux(x_1, x_9, x_10, x_11, x_2, x_3, x_8);
 return x_12;
 }
 else
@@ -9507,97 +10016,95 @@ return x_5;
 lean_object* l_Lean_Elab_Term_elabSortApp(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_5 = lean_ctor_get(x_1, 1);
-x_6 = l_Lean_stxInh;
-x_7 = lean_unsigned_to_nat(1u);
-x_8 = lean_array_get(x_6, x_5, x_7);
-x_9 = l_Lean_Elab_Term_elabLevel(x_8, x_3, x_4);
-if (lean_obj_tag(x_9) == 0)
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_unsigned_to_nat(1u);
+x_6 = l_Lean_Syntax_getArg(x_1, x_5);
+x_7 = l_Lean_Elab_Term_elabLevel(x_6, x_3, x_4);
+if (lean_obj_tag(x_7) == 0)
 {
-uint8_t x_10; 
-x_10 = !lean_is_exclusive(x_9);
-if (x_10 == 0)
+uint8_t x_8; 
+x_8 = !lean_is_exclusive(x_7);
+if (x_8 == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
-x_11 = lean_ctor_get(x_9, 0);
-x_12 = lean_unsigned_to_nat(0u);
-x_13 = lean_array_get(x_6, x_5, x_12);
-x_14 = l_Lean_Syntax_getKind(x_13);
-x_15 = l_Lean_Parser_Term_sort___elambda__1___closed__2;
-x_16 = lean_name_eq(x_14, x_15);
-lean_dec(x_14);
-if (x_16 == 0)
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_9 = lean_ctor_get(x_7, 0);
+x_10 = lean_unsigned_to_nat(0u);
+x_11 = l_Lean_Syntax_getArg(x_1, x_10);
+x_12 = l_Lean_Syntax_getKind(x_11);
+x_13 = l_Lean_Parser_Term_sort___elambda__1___closed__2;
+x_14 = lean_name_eq(x_12, x_13);
+lean_dec(x_12);
+if (x_14 == 0)
 {
-lean_object* x_17; lean_object* x_18; 
-x_17 = l_Lean_mkLevelSucc(x_11);
-x_18 = l_Lean_mkSort(x_17);
-lean_ctor_set(x_9, 0, x_18);
-return x_9;
+lean_object* x_15; lean_object* x_16; 
+x_15 = l_Lean_mkLevelSucc(x_9);
+x_16 = l_Lean_mkSort(x_15);
+lean_ctor_set(x_7, 0, x_16);
+return x_7;
 }
 else
 {
-lean_object* x_19; 
-x_19 = l_Lean_mkSort(x_11);
-lean_ctor_set(x_9, 0, x_19);
-return x_9;
+lean_object* x_17; 
+x_17 = l_Lean_mkSort(x_9);
+lean_ctor_set(x_7, 0, x_17);
+return x_7;
 }
 }
 else
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; 
-x_20 = lean_ctor_get(x_9, 0);
-x_21 = lean_ctor_get(x_9, 1);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_dec(x_9);
-x_22 = lean_unsigned_to_nat(0u);
-x_23 = lean_array_get(x_6, x_5, x_22);
-x_24 = l_Lean_Syntax_getKind(x_23);
-x_25 = l_Lean_Parser_Term_sort___elambda__1___closed__2;
-x_26 = lean_name_eq(x_24, x_25);
-lean_dec(x_24);
-if (x_26 == 0)
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; 
+x_18 = lean_ctor_get(x_7, 0);
+x_19 = lean_ctor_get(x_7, 1);
+lean_inc(x_19);
+lean_inc(x_18);
+lean_dec(x_7);
+x_20 = lean_unsigned_to_nat(0u);
+x_21 = l_Lean_Syntax_getArg(x_1, x_20);
+x_22 = l_Lean_Syntax_getKind(x_21);
+x_23 = l_Lean_Parser_Term_sort___elambda__1___closed__2;
+x_24 = lean_name_eq(x_22, x_23);
+lean_dec(x_22);
+if (x_24 == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = l_Lean_mkLevelSucc(x_20);
-x_28 = l_Lean_mkSort(x_27);
+lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_25 = l_Lean_mkLevelSucc(x_18);
+x_26 = l_Lean_mkSort(x_25);
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_26);
+lean_ctor_set(x_27, 1, x_19);
+return x_27;
+}
+else
+{
+lean_object* x_28; lean_object* x_29; 
+x_28 = l_Lean_mkSort(x_18);
 x_29 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_21);
+lean_ctor_set(x_29, 1, x_19);
 return x_29;
 }
-else
-{
-lean_object* x_30; lean_object* x_31; 
-x_30 = l_Lean_mkSort(x_20);
-x_31 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_31, 0, x_30);
-lean_ctor_set(x_31, 1, x_21);
-return x_31;
-}
 }
 }
 else
 {
-uint8_t x_32; 
-x_32 = !lean_is_exclusive(x_9);
-if (x_32 == 0)
+uint8_t x_30; 
+x_30 = !lean_is_exclusive(x_7);
+if (x_30 == 0)
 {
-return x_9;
+return x_7;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; lean_object* x_35; 
-x_33 = lean_ctor_get(x_9, 0);
-x_34 = lean_ctor_get(x_9, 1);
-lean_inc(x_34);
-lean_inc(x_33);
-lean_dec(x_9);
-x_35 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_35, 0, x_33);
-lean_ctor_set(x_35, 1, x_34);
-return x_35;
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_31 = lean_ctor_get(x_7, 0);
+x_32 = lean_ctor_get(x_7, 1);
+lean_inc(x_32);
+lean_inc(x_31);
+lean_dec(x_7);
+x_33 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_33, 0, x_31);
+lean_ctor_set(x_33, 1, x_32);
+return x_33;
 }
 }
 }
@@ -9650,7 +10157,7 @@ x_5 = l_Lean_Elab_Term_addBuiltinTermElab(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermApp_19__regTraceClasses___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermApp_20__regTraceClasses___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -9660,11 +10167,11 @@ x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermApp_19__regTraceClasses(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_TermApp_20__regTraceClasses(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l___private_Init_Lean_Elab_TermApp_19__regTraceClasses___closed__1;
+x_2 = l___private_Init_Lean_Elab_TermApp_20__regTraceClasses___closed__1;
 x_3 = l_Lean_registerTraceClass(x_2, x_1);
 if (lean_obj_tag(x_3) == 0)
 {
@@ -9745,144 +10252,142 @@ l_Lean_Elab_Term_addNamedArg___closed__5 = _init_l_Lean_Elab_Term_addNamedArg___
 lean_mark_persistent(l_Lean_Elab_Term_addNamedArg___closed__5);
 l_Lean_Elab_Term_addNamedArg___closed__6 = _init_l_Lean_Elab_Term_addNamedArg___closed__6();
 lean_mark_persistent(l_Lean_Elab_Term_addNamedArg___closed__6);
-l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__1);
-l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__2);
-l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__3);
-l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__4 = _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__4();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__4);
-l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__5 = _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__5();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__5);
-l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__6 = _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__6();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__6);
-l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__7 = _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__7();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__7);
-l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__8 = _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__8();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__8);
-l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__9 = _init_l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__9();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_3__elabAppArgsAux___main___closed__9);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__1);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__2);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__3);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__4 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__4();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__4);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__5 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__5();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__5);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__6 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__6();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__6);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__7 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__7();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__7);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__8 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__8();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__8);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__9 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__9();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__9);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__10 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__10();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__10);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__11 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__11();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__11);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__12 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__12();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__12);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__13 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__13();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__13);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__14 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__14();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__14);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__15 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__15();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__15);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__16 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__16();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__16);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__17 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__17();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__17);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__18 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__18();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__18);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__19 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__19();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__19);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__20 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__20();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__20);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__21);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__22 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__22();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__22);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__23 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__23();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__23);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__24);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__25 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__25();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__25);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__26 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__26();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__26);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__27 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__27();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__27);
-l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__28 = _init_l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__28();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_6__resolveLValAux___closed__28);
-l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__1 = _init_l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__1();
-lean_mark_persistent(l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__1);
-l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2 = _init_l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2();
-lean_mark_persistent(l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___spec__1___closed__2);
-l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__1);
-l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__2);
-l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_9__mkBaseProjections___closed__3);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__1);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__2);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__3);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__4 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__4();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__4);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__5 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__5();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__5);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__6 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__6();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__6);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__7 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__7();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__7);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__8 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__8();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__8);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__9 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__9();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__9);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__10 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__10();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__10);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__11 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__11();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__11);
-l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__12 = _init_l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__12();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__addLValArg___main___closed__12);
-l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__1);
-l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__elabAppLValsAux___main___closed__2);
-l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__1);
-l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__2);
-l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_12__elabAppLVals___closed__3);
-l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_13__elabAppFn___main___closed__1);
-l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__1);
-l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_15__toMessageData___closed__2);
-l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__1);
-l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__2);
-l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_16__mergeFailures___rarg___closed__3);
-l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__1);
-l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__2);
-l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_17__elabAppAux___closed__3);
-l___private_Init_Lean_Elab_TermApp_18__expandApp___main___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_18__expandApp___main___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_18__expandApp___main___closed__1);
+l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__1);
+l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__2);
+l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__3);
+l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__4 = _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__4();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__4);
+l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__5 = _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__5();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__5);
+l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__6 = _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__6();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__6);
+l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__7 = _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__7();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__7);
+l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__8 = _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__8();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__8);
+l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__9 = _init_l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__9();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_4__elabAppArgsAux___main___closed__9);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__1);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__2);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__3);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__4 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__4();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__4);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__5 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__5();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__5);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__6 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__6();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__6);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__7 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__7();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__7);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__8 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__8();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__8);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__9 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__9();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__9);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__10 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__10();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__10);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__11 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__11();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__11);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__12 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__12();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__12);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__13 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__13();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__13);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__14 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__14();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__14);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__15 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__15();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__15);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__16 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__16();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__16);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__17 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__17();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__17);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__18 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__18();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__18);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__19 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__19();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__19);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__20 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__20();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__20);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__21);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__22 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__22();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__22);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__23 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__23();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__23);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__24);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__25 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__25();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__25);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__26 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__26();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__26);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__27 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__27();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__27);
+l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__28 = _init_l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__28();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_7__resolveLValAux___closed__28);
+l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__1 = _init_l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__1();
+lean_mark_persistent(l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__1);
+l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2 = _init_l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2();
+lean_mark_persistent(l_List_foldlM___main___at___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___spec__1___closed__2);
+l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__1);
+l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__2);
+l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_10__mkBaseProjections___closed__3);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__1);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__2);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__3);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__4 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__4();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__4);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__5 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__5();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__5);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__6 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__6();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__6);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__7 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__7();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__7);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__8 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__8();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__8);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__9 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__9();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__9);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__10 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__10();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__10);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__11 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__11();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__11);
+l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__12 = _init_l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__12();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_11__addLValArg___main___closed__12);
+l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__1);
+l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_12__elabAppLValsAux___main___closed__2);
+l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__1);
+l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__2);
+l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_13__elabAppLVals___closed__3);
+l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__1);
+l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_16__toMessageData___closed__2);
+l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__1);
+l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__2);
+l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_17__mergeFailures___rarg___closed__3);
+l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__1);
+l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__2 = _init_l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__2);
+l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__3 = _init_l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_18__elabAppAux___closed__3);
+l___private_Init_Lean_Elab_TermApp_19__expandApp___main___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_19__expandApp___main___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_19__expandApp___main___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabApp___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabApp___closed__1();
 lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabApp___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabApp___closed__2 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabApp___closed__2();
@@ -9946,9 +10451,9 @@ lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabSortApp___closed_
 res = l___regBuiltinTermElab_Lean_Elab_Term_elabSortApp(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l___private_Init_Lean_Elab_TermApp_19__regTraceClasses___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_19__regTraceClasses___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_19__regTraceClasses___closed__1);
-res = l___private_Init_Lean_Elab_TermApp_19__regTraceClasses(lean_io_mk_world());
+l___private_Init_Lean_Elab_TermApp_20__regTraceClasses___closed__1 = _init_l___private_Init_Lean_Elab_TermApp_20__regTraceClasses___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermApp_20__regTraceClasses___closed__1);
+res = l___private_Init_Lean_Elab_TermApp_20__regTraceClasses(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_mk_io_result(lean_box(0));
diff --git a/stage0/stdlib/Init/Lean/Elab/TermBinders.c b/stage0/stdlib/Init/Lean/Elab/TermBinders.c
index 8ef4979cef..f9b6ba0ef2 100644
--- a/stage0/stdlib/Init/Lean/Elab/TermBinders.c
+++ b/stage0/stdlib/Init/Lean/Elab/TermBinders.c
@@ -16,28 +16,25 @@ extern "C" {
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabLet___closed__3;
 lean_object* l_Lean_Elab_Term_elabBinder___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBinders(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__2;
 lean_object* l_Lean_Elab_Term_mkForall(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabLet___closed__3;
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
-lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabDepArrow___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBinders___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_nameToExprAux___main___closed__1;
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__2;
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabDepArrow(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrow___closed__1;
 extern lean_object* l_Lean_Syntax_formatStxAux___main___closed__5;
 lean_object* l___private_Init_Lean_Elab_TermBinders_1__expandBinderType___boxed(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabFun___closed__1;
 lean_object* l_Lean_Format_pretty(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 extern lean_object* l_Lean_List_format___rarg___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getIdAt(lean_object*, lean_object*);
 lean_object* lean_local_ctx_mk_let_decl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBinder___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -48,17 +45,19 @@ lean_object* l_Lean_Elab_Term_elabForall___lambda__1___boxed(lean_object*, lean_
 extern lean_object* l_Lean_Parser_Term_typeAscription___elambda__1___closed__1;
 extern lean_object* l_Lean_Parser_Term_match___elambda__1___closed__1;
 extern lean_object* l_Prod_HasRepr___rarg___closed__1;
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_stxInh;
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabLetIdDecl___closed__3;
 extern lean_object* l_PersistentHashMap_mkCollisionNode___rarg___closed__1;
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabLet(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__2;
 uint8_t lean_name_eq(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__4;
+lean_object* l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkIdentFrom(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabForall(lean_object*);
 lean_object* l_Lean_Elab_Term_elabLetPatDecl(lean_object*);
@@ -66,54 +65,72 @@ lean_object* l_Lean_Elab_Term_mkLambda(lean_object*, lean_object*, lean_object*,
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 extern lean_object* l_Lean_Parser_Term_depArrow___elambda__1___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_letEqns___elambda__1___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabLetPatDecl___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_elabLetEqnsDecl___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabLetPatDecl___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabLet___closed__2;
+lean_object* lean_string_utf8_byte_size(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_11__expandFunBinders___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__1;
 lean_object* l_Lean_Elab_Term_withLetDecl___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
 extern lean_object* l___private_Init_Lean_Elab_Term_8__expandCDot___closed__4;
 lean_object* lean_nat_add(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_11__expandFunBinders(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__2;
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousIdent(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__9;
+extern lean_object* l_Lean_Parser_Term_binderTactic___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_mkLet(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getOptions(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
 lean_object* l_Lean_Syntax_isSimpleTermId_x3f(lean_object*);
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_11__regTraceClasses(lean_object*);
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__8;
+lean_object* l___private_Init_Lean_Elab_TermBinders_12__regTraceClasses(lean_object*);
 extern lean_object* l_Lean_Parser_Term_letIdDecl___elambda__1___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabFun___closed__3;
 lean_object* l_Lean_Elab_Term_elabLetIdDecl___lambda__1(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_Lean_Expr_getOptParamDefault_x3f___closed__2;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrow___closed__2;
-lean_object* l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrow___closed__1;
+extern lean_object* l_Lean_Parser_Term_id___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_mkFreshFVarId___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_elabLetIdDecl___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_instBinder___elambda__1___closed__2;
-lean_object* l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTerm(lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_elabForall___closed__1;
 lean_object* l_Lean_Elab_Term_elabForall___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabDepArrow___closed__3;
 lean_object* l_Lean_Elab_Term_elabFun___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabFun___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBinders(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_logTrace(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabForall___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__1;
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__1;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4;
 lean_object* l_Lean_Elab_Term_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabFun(lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__5;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabDepArrow(lean_object*);
 extern lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__2;
@@ -122,23 +139,18 @@ lean_object* l_Lean_Elab_Term_elabBinder___rarg___lambda__1(lean_object*, lean_o
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_expandOptType(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
-lean_object* l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__1;
 extern lean_object* l_Lean_Parser_Term_explicitUniv___elambda__1___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__6;
 extern lean_object* l_Lean_Options_empty;
 lean_object* l_Lean_Elab_Term_mkFreshFVarId(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__9;
 lean_object* l___private_Init_Lean_Elab_TermBinders_1__expandBinderType(lean_object*);
 extern lean_object* l_Lean_Elab_Term_expandCDot_x3f___closed__2;
+extern lean_object* l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3;
 lean_object* l_Lean_Elab_Term_elabLetIdDecl___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabLetEqnsDecl___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 extern lean_object* l_Lean_Parser_Term_arrow___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__4;
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__8;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabForall___closed__2;
 extern lean_object* l_Lean_Parser_Term_let___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Term_hole___elambda__1___closed__1;
@@ -148,9 +160,7 @@ lean_object* l_Lean_Elab_Term_mkFreshInstanceName___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_isClass(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__8;
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__4;
 lean_object* l_Lean_mkFVar(lean_object*);
-extern lean_object* l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3;
 lean_object* l_Lean_Elab_Term_elabLet___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabLet___closed__1;
 lean_object* l_Lean_Elab_Term_elabLetIdDecl___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -161,8 +171,8 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabDepArrow___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrow___closed__3;
 lean_object* l_Lean_Elab_Term_mkTermIdFromIdent(lean_object*);
 extern lean_object* l_Lean_Parser_Level_hole___elambda__1___closed__1;
-extern lean_object* l_Lean_Parser_Command_openRenamingItem___elambda__1___closed__7;
-lean_object* l___private_Init_Lean_Elab_TermBinders_4__matchBinder(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_5__matchBinder(lean_object*, lean_object*, lean_object*);
 lean_object* lean_local_ctx_mk_local_decl(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_Elab_Term_elabLetEqnsDecl___boxed(lean_object*);
 extern lean_object* l_Option_HasRepr___rarg___closed__3;
@@ -170,19 +180,20 @@ extern lean_object* l___private_Init_Lean_Elab_Term_8__expandCDot___closed__3;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabForall___closed__1;
 extern lean_object* l_Lean_Parser_Term_implicitBinder___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabArrow(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__9;
 extern lean_object* l_Lean_Parser_Term_matchAlt___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__5;
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__5;
-lean_object* l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Level_paren___elambda__1___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 lean_object* l_Lean_Elab_Term_elabFun___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabForall___closed__3;
 lean_object* l_Lean_Syntax_getNumArgs(lean_object*);
 extern lean_object* l_Lean_Parser_Term_letPatDecl___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_getLCtx(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_TermBinders_2__expandBinderIdent___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabLet(lean_object*);
+extern lean_object* l_Lean_Expr_getOptParamDefault_x3f___closed__1;
 lean_object* l_Lean_Elab_Term_mkHole(lean_object*);
 lean_object* l_Lean_Elab_Term_elabLetIdDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -199,16 +210,19 @@ lean_object* l_Lean_Elab_Term_elabLetPatDecl___rarg___boxed(lean_object*, lean_o
 extern lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__4;
 lean_object* l_Lean_Elab_Term_mkExplicitBinder(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_adaptExpander(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabType(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__7;
+lean_object* l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabLetIdDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isNone(lean_object*);
 lean_object* l_Lean_Elab_Term_resetSynthInstanceCache___rarg(lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
-lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f___boxed(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_Parser_Term_binderDefault___elambda__1___closed__2;
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__5;
 extern lean_object* l_Lean_Expr_Inhabited;
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__1;
 lean_object* l_Lean_Elab_Term_addBuiltinTermElab(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withLetDecl___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -216,13 +230,11 @@ lean_object* l_Lean_Elab_Term_withLetDecl(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabDepArrow___closed__2;
 lean_object* l___private_Init_Lean_Elab_TermBinders_2__expandBinderIdent(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBinders___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__3;
-lean_object* l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__3;
+lean_object* l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__3;
 extern lean_object* l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_withNode___rarg___closed__3;
-lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_formatStxAux___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -231,19 +243,16 @@ lean_object* l___private_Init_Lean_Elab_TermBinders_3__expandOptIdent___boxed(le
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrow(lean_object*);
 extern lean_object* l___private_Init_Lean_Meta_ExprDefEq_10__checkAssignmentFailure___closed__5;
 lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___closed__3;
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_simpleBinder___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Term_forall___elambda__1___closed__1;
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Lean_Elab_Term_11__postponeElabTerm___closed__4;
 lean_object* lean_name_mk_numeral(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_TermBinders_3__expandOptIdent(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__2;
 lean_object* l_Lean_Elab_Term_elabLet___closed__2;
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabBinder(lean_object*);
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_TermBinders_1__expandBinderType(lean_object* x_1) {
 _start:
 {
@@ -384,7 +393,201 @@ lean_dec(x_1);
 return x_4;
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Expr_getOptParamDefault_x3f___closed__1;
+x_2 = lean_string_utf8_byte_size(x_1);
+return x_2;
+}
+}
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_1 = l_Lean_Expr_getOptParamDefault_x3f___closed__1;
+x_2 = lean_unsigned_to_nat(0u);
+x_3 = l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__1;
+x_4 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_4, 0, x_1);
+lean_ctor_set(x_4, 1, x_2);
+lean_ctor_set(x_4, 2, x_3);
+return x_4;
+}
+}
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l_Lean_Expr_getOptParamDefault_x3f___closed__2;
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = lean_box(0);
+x_2 = l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__3;
+x_3 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
+lean_object* l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; 
+x_5 = l_Lean_Syntax_isNone(x_2);
+if (x_5 == 0)
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_6 = lean_unsigned_to_nat(0u);
+x_7 = l_Lean_Syntax_getArg(x_2, x_6);
+lean_inc(x_7);
+x_8 = l_Lean_Syntax_getKind(x_7);
+x_9 = l_Lean_Parser_Term_binderDefault___elambda__1___closed__2;
+x_10 = lean_name_eq(x_8, x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; uint8_t x_12; 
+lean_dec(x_1);
+x_11 = l_Lean_Parser_Term_binderTactic___elambda__1___closed__2;
+x_12 = lean_name_eq(x_8, x_11);
+lean_dec(x_8);
+if (x_12 == 0)
+{
+lean_object* x_13; 
+lean_dec(x_7);
+lean_dec(x_3);
+x_13 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_4);
+return x_13;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3;
+x_15 = l_Lean_Elab_Term_throwError___rarg(x_7, x_14, x_3, x_4);
+return x_15;
+}
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
+lean_dec(x_8);
+x_16 = lean_unsigned_to_nat(1u);
+x_17 = l_Lean_Syntax_getArg(x_7, x_16);
+lean_dec(x_7);
+x_18 = l_Lean_Elab_Term_getCurrMacroScope(x_3, x_4);
+lean_dec(x_3);
+x_19 = !lean_is_exclusive(x_18);
+if (x_19 == 0)
+{
+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; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_20 = lean_ctor_get(x_18, 0);
+x_21 = lean_box(0);
+x_22 = l_Lean_Expr_getOptParamDefault_x3f___closed__2;
+x_23 = lean_name_mk_numeral(x_22, x_20);
+x_24 = l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__2;
+x_25 = l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__4;
+x_26 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_26, 0, x_21);
+lean_ctor_set(x_26, 1, x_24);
+lean_ctor_set(x_26, 2, x_23);
+lean_ctor_set(x_26, 3, x_25);
+x_27 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_28 = lean_array_push(x_27, x_26);
+x_29 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_30 = lean_array_push(x_28, x_29);
+x_31 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_31);
+lean_ctor_set(x_32, 1, x_30);
+x_33 = lean_array_push(x_27, x_32);
+x_34 = lean_array_push(x_33, x_1);
+x_35 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_36 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set(x_36, 1, x_34);
+x_37 = lean_array_push(x_27, x_36);
+x_38 = lean_array_push(x_37, x_17);
+x_39 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_39, 0, x_35);
+lean_ctor_set(x_39, 1, x_38);
+lean_ctor_set(x_18, 0, x_39);
+return x_18;
+}
+else
+{
+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_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; 
+x_40 = lean_ctor_get(x_18, 0);
+x_41 = lean_ctor_get(x_18, 1);
+lean_inc(x_41);
+lean_inc(x_40);
+lean_dec(x_18);
+x_42 = lean_box(0);
+x_43 = l_Lean_Expr_getOptParamDefault_x3f___closed__2;
+x_44 = lean_name_mk_numeral(x_43, x_40);
+x_45 = l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__2;
+x_46 = l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__4;
+x_47 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_47, 0, x_42);
+lean_ctor_set(x_47, 1, x_45);
+lean_ctor_set(x_47, 2, x_44);
+lean_ctor_set(x_47, 3, x_46);
+x_48 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
+x_49 = lean_array_push(x_48, x_47);
+x_50 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_51 = lean_array_push(x_49, x_50);
+x_52 = l_Lean_Parser_Term_id___elambda__1___closed__2;
+x_53 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_53, 0, x_52);
+lean_ctor_set(x_53, 1, x_51);
+x_54 = lean_array_push(x_48, x_53);
+x_55 = lean_array_push(x_54, x_1);
+x_56 = l_Lean_Parser_Term_app___elambda__1___closed__2;
+x_57 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_57, 0, x_56);
+lean_ctor_set(x_57, 1, x_55);
+x_58 = lean_array_push(x_48, x_57);
+x_59 = lean_array_push(x_58, x_17);
+x_60 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_60, 0, x_56);
+lean_ctor_set(x_60, 1, x_59);
+x_61 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_61, 0, x_60);
+lean_ctor_set(x_61, 1, x_41);
+return x_61;
+}
+}
+}
+else
+{
+lean_object* x_62; 
+lean_dec(x_3);
+x_62 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_62, 0, x_1);
+lean_ctor_set(x_62, 1, x_4);
+return x_62;
+}
+}
+}
+lean_object* l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; 
+x_5 = l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier(x_1, x_2, x_3, x_4);
+lean_dec(x_2);
+return x_5;
+}
+}
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__1(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; uint8_t x_7; 
@@ -436,7 +639,7 @@ goto _start;
 }
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__2(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; uint8_t x_7; 
@@ -488,7 +691,7 @@ goto _start;
 }
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__3(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; uint8_t x_7; 
@@ -540,7 +743,7 @@ goto _start;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -548,219 +751,255 @@ x_1 = lean_mk_string("term elaborator failed, unexpected binder syntax");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__1;
+x_1 = l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__1;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__2;
+x_1 = l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__2;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_4__matchBinder(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_5__matchBinder(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
+lean_object* x_4; 
 if (lean_obj_tag(x_1) == 1)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; 
-x_4 = lean_ctor_get(x_1, 0);
-lean_inc(x_4);
-x_5 = lean_ctor_get(x_1, 1);
-lean_inc(x_5);
-x_6 = l_Lean_Parser_Term_simpleBinder___elambda__1___closed__2;
-x_7 = lean_name_eq(x_4, x_6);
-if (x_7 == 0)
+lean_object* x_16; lean_object* x_17; uint8_t x_18; 
+lean_inc(x_1);
+x_16 = l_Lean_Syntax_getKind(x_1);
+x_17 = l_Lean_Parser_Term_simpleBinder___elambda__1___closed__2;
+x_18 = lean_name_eq(x_16, x_17);
+if (x_18 == 0)
 {
-lean_object* x_8; uint8_t x_9; 
-x_8 = l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
-x_9 = lean_name_eq(x_4, x_8);
-if (x_9 == 0)
-{
-lean_object* x_10; uint8_t x_11; 
-x_10 = l_Lean_Parser_Term_implicitBinder___elambda__1___closed__2;
-x_11 = lean_name_eq(x_4, x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; uint8_t x_13; 
-x_12 = l_Lean_Parser_Term_instBinder___elambda__1___closed__2;
-x_13 = lean_name_eq(x_4, x_12);
-lean_dec(x_4);
-if (x_13 == 0)
-{
-lean_object* x_14; lean_object* x_15; 
-lean_dec(x_5);
-x_14 = l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__3;
-x_15 = l_Lean_Elab_Term_throwError___rarg(x_1, x_14, x_2, x_3);
-return x_15;
-}
-else
-{
-lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
-lean_dec(x_1);
-x_16 = l_Lean_stxInh;
-x_17 = lean_unsigned_to_nat(1u);
-x_18 = lean_array_get(x_16, x_5, x_17);
-x_19 = l___private_Init_Lean_Elab_TermBinders_3__expandOptIdent(x_18, x_2, x_3);
-lean_dec(x_2);
-lean_dec(x_18);
-x_20 = !lean_is_exclusive(x_19);
+lean_object* x_19; uint8_t x_20; 
+x_19 = l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
+x_20 = lean_name_eq(x_16, x_19);
 if (x_20 == 0)
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
-x_21 = lean_ctor_get(x_19, 0);
-x_22 = lean_unsigned_to_nat(2u);
-x_23 = lean_array_get(x_16, x_5, x_22);
-lean_dec(x_5);
-x_24 = 3;
-x_25 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_25, 0, x_21);
-lean_ctor_set(x_25, 1, x_23);
-lean_ctor_set_uint8(x_25, sizeof(void*)*2, x_24);
-x_26 = l_Lean_mkOptionalNode___closed__1;
-x_27 = lean_array_push(x_26, x_25);
-lean_ctor_set(x_19, 0, x_27);
-return x_19;
+lean_object* x_21; uint8_t x_22; 
+x_21 = l_Lean_Parser_Term_implicitBinder___elambda__1___closed__2;
+x_22 = lean_name_eq(x_16, x_21);
+if (x_22 == 0)
+{
+lean_object* x_23; uint8_t x_24; 
+x_23 = l_Lean_Parser_Term_instBinder___elambda__1___closed__2;
+x_24 = lean_name_eq(x_16, x_23);
+lean_dec(x_16);
+if (x_24 == 0)
+{
+lean_object* x_25; lean_object* x_26; 
+x_25 = l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__3;
+x_26 = l_Lean_Elab_Term_throwError___rarg(x_1, x_25, x_2, x_3);
+return x_26;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; uint8_t x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_28 = lean_ctor_get(x_19, 0);
-x_29 = lean_ctor_get(x_19, 1);
-lean_inc(x_29);
-lean_inc(x_28);
-lean_dec(x_19);
-x_30 = lean_unsigned_to_nat(2u);
-x_31 = lean_array_get(x_16, x_5, x_30);
-lean_dec(x_5);
-x_32 = 3;
-x_33 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_33, 0, x_28);
-lean_ctor_set(x_33, 1, x_31);
-lean_ctor_set_uint8(x_33, sizeof(void*)*2, x_32);
-x_34 = l_Lean_mkOptionalNode___closed__1;
-x_35 = lean_array_push(x_34, x_33);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_29);
-return x_36;
-}
-}
-}
-else
-{
-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_dec(x_4);
-lean_dec(x_1);
-x_37 = l_Lean_stxInh;
-x_38 = lean_unsigned_to_nat(1u);
-x_39 = lean_array_get(x_37, x_5, x_38);
-x_40 = l_Lean_Syntax_getArgs(x_39);
-lean_dec(x_39);
-x_41 = lean_unsigned_to_nat(2u);
-x_42 = lean_array_get(x_37, x_5, x_41);
-lean_dec(x_5);
-x_43 = l___private_Init_Lean_Elab_TermBinders_1__expandBinderType(x_42);
-lean_dec(x_42);
-x_44 = lean_unsigned_to_nat(0u);
-x_45 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__1(x_43, x_44, x_40, x_2, x_3);
+lean_object* x_27; lean_object* x_28; lean_object* x_29; uint8_t x_30; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = l_Lean_Syntax_getArg(x_1, x_27);
+x_29 = l___private_Init_Lean_Elab_TermBinders_3__expandOptIdent(x_28, x_2, x_3);
 lean_dec(x_2);
-return x_45;
+lean_dec(x_28);
+x_30 = !lean_is_exclusive(x_29);
+if (x_30 == 0)
+{
+lean_object* x_31; lean_object* x_32; lean_object* x_33; uint8_t x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_31 = lean_ctor_get(x_29, 0);
+x_32 = lean_unsigned_to_nat(2u);
+x_33 = l_Lean_Syntax_getArg(x_1, x_32);
+lean_dec(x_1);
+x_34 = 3;
+x_35 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_35, 0, x_31);
+lean_ctor_set(x_35, 1, x_33);
+lean_ctor_set_uint8(x_35, sizeof(void*)*2, x_34);
+x_36 = l_Lean_mkOptionalNode___closed__1;
+x_37 = lean_array_push(x_36, x_35);
+lean_ctor_set(x_29, 0, x_37);
+return x_29;
+}
+else
+{
+lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_38 = lean_ctor_get(x_29, 0);
+x_39 = lean_ctor_get(x_29, 1);
+lean_inc(x_39);
+lean_inc(x_38);
+lean_dec(x_29);
+x_40 = lean_unsigned_to_nat(2u);
+x_41 = l_Lean_Syntax_getArg(x_1, x_40);
+lean_dec(x_1);
+x_42 = 3;
+x_43 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_43, 0, x_38);
+lean_ctor_set(x_43, 1, x_41);
+lean_ctor_set_uint8(x_43, sizeof(void*)*2, x_42);
+x_44 = l_Lean_mkOptionalNode___closed__1;
+x_45 = lean_array_push(x_44, 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_39);
+return x_46;
+}
 }
 }
 else
 {
-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_dec(x_4);
-lean_dec(x_1);
-x_46 = l_Lean_stxInh;
+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_dec(x_16);
 x_47 = lean_unsigned_to_nat(1u);
-x_48 = lean_array_get(x_46, x_5, x_47);
+x_48 = l_Lean_Syntax_getArg(x_1, x_47);
 x_49 = l_Lean_Syntax_getArgs(x_48);
 lean_dec(x_48);
 x_50 = lean_unsigned_to_nat(2u);
-x_51 = lean_array_get(x_46, x_5, x_50);
-lean_dec(x_5);
+x_51 = l_Lean_Syntax_getArg(x_1, x_50);
+lean_dec(x_1);
 x_52 = l___private_Init_Lean_Elab_TermBinders_1__expandBinderType(x_51);
 lean_dec(x_51);
 x_53 = lean_unsigned_to_nat(0u);
-x_54 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__2(x_52, x_53, x_49, x_2, x_3);
+x_54 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__1(x_52, x_53, x_49, x_2, x_3);
 lean_dec(x_2);
 return x_54;
 }
 }
 else
 {
-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_dec(x_4);
-x_55 = l_Lean_stxInh;
-x_56 = lean_unsigned_to_nat(0u);
-x_57 = lean_array_get(x_55, x_5, x_56);
-lean_dec(x_5);
-x_58 = l_Lean_Syntax_getArgs(x_57);
-lean_dec(x_57);
-x_59 = l_Lean_Elab_Term_mkHole(x_1);
+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_dec(x_16);
+x_55 = lean_unsigned_to_nat(1u);
+x_56 = l_Lean_Syntax_getArg(x_1, x_55);
+x_57 = l_Lean_Syntax_getArgs(x_56);
+lean_dec(x_56);
+x_58 = lean_unsigned_to_nat(2u);
+x_59 = l_Lean_Syntax_getArg(x_1, x_58);
+x_60 = l___private_Init_Lean_Elab_TermBinders_1__expandBinderType(x_59);
+lean_dec(x_59);
+x_61 = lean_unsigned_to_nat(3u);
+x_62 = l_Lean_Syntax_getArg(x_1, x_61);
 lean_dec(x_1);
-x_60 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__3(x_59, x_56, x_58, x_2, x_3);
+lean_inc(x_2);
+x_63 = l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier(x_60, x_62, x_2, x_3);
+lean_dec(x_62);
+if (lean_obj_tag(x_63) == 0)
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+x_64 = lean_ctor_get(x_63, 0);
+lean_inc(x_64);
+x_65 = lean_ctor_get(x_63, 1);
+lean_inc(x_65);
+lean_dec(x_63);
+x_66 = lean_unsigned_to_nat(0u);
+x_67 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__2(x_64, x_66, x_57, x_2, x_65);
 lean_dec(x_2);
-return x_60;
+return x_67;
+}
+else
+{
+uint8_t x_68; 
+lean_dec(x_57);
+lean_dec(x_2);
+x_68 = !lean_is_exclusive(x_63);
+if (x_68 == 0)
+{
+return x_63;
+}
+else
+{
+lean_object* x_69; lean_object* x_70; lean_object* x_71; 
+x_69 = lean_ctor_get(x_63, 0);
+x_70 = lean_ctor_get(x_63, 1);
+lean_inc(x_70);
+lean_inc(x_69);
+lean_dec(x_63);
+x_71 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_71, 0, x_69);
+lean_ctor_set(x_71, 1, x_70);
+return x_71;
+}
+}
 }
 }
 else
 {
-lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-x_61 = lean_box(0);
-x_62 = lean_unsigned_to_nat(0u);
+lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; 
+lean_dec(x_16);
+x_72 = lean_unsigned_to_nat(0u);
+x_73 = l_Lean_Syntax_getArg(x_1, x_72);
+x_74 = l_Lean_Syntax_getArgs(x_73);
+lean_dec(x_73);
+x_75 = l_Lean_Elab_Term_mkHole(x_1);
+lean_dec(x_1);
+x_76 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__3(x_75, x_72, x_74, x_2, x_3);
+lean_dec(x_2);
+return x_76;
+}
+}
+else
+{
+lean_object* x_77; 
+x_77 = lean_box(0);
+x_4 = x_77;
+goto block_15;
+}
+block_15:
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+lean_dec(x_4);
+x_5 = lean_box(0);
+x_6 = lean_unsigned_to_nat(0u);
 lean_inc(x_1);
-x_63 = l_Lean_Syntax_formatStxAux___main(x_61, x_62, x_1);
-x_64 = l_Lean_Options_empty;
-x_65 = l_Lean_Format_pretty(x_63, x_64);
-x_66 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_66, 0, x_65);
-x_67 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_67, 0, x_66);
-x_68 = l_Lean_Elab_Term_withNode___rarg___closed__3;
-x_69 = lean_alloc_ctor(8, 2, 0);
-lean_ctor_set(x_69, 0, x_68);
-lean_ctor_set(x_69, 1, x_67);
-x_70 = l_Lean_Elab_Term_throwError___rarg(x_1, x_69, x_2, x_3);
-return x_70;
+x_7 = l_Lean_Syntax_formatStxAux___main(x_5, x_6, x_1);
+x_8 = l_Lean_Options_empty;
+x_9 = l_Lean_Format_pretty(x_7, x_8);
+x_10 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_10, 0, x_9);
+x_11 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_11, 0, x_10);
+x_12 = l_Lean_Elab_Term_withNode___rarg___closed__3;
+x_13 = lean_alloc_ctor(8, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_11);
+x_14 = l_Lean_Elab_Term_throwError___rarg(x_1, x_13, x_2, x_3);
+return x_14;
 }
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__1___boxed(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; 
-x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__1(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__1(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 return x_6;
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__2___boxed(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; 
-x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__2(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__2(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 return x_6;
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__3___boxed(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; 
-x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_4__matchBinder___spec__3(x_1, x_2, x_3, x_4, x_5);
+x_6 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_5__matchBinder___spec__3(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 return x_6;
 }
@@ -983,7 +1222,7 @@ lean_dec(x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews___main(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* l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; 
@@ -1535,33 +1774,33 @@ return x_141;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_1);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews(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* l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_1);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux___main(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* l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; 
@@ -1589,7 +1828,7 @@ else
 lean_object* x_13; lean_object* x_14; 
 x_13 = lean_array_fget(x_1, x_2);
 lean_inc(x_6);
-x_14 = l___private_Init_Lean_Elab_TermBinders_4__matchBinder(x_13, x_6, x_7);
+x_14 = l___private_Init_Lean_Elab_TermBinders_5__matchBinder(x_13, x_6, x_7);
 if (lean_obj_tag(x_14) == 0)
 {
 lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
@@ -1600,7 +1839,7 @@ lean_inc(x_16);
 lean_dec(x_14);
 x_17 = lean_unsigned_to_nat(0u);
 lean_inc(x_6);
-x_18 = l___private_Init_Lean_Elab_TermBinders_5__elabBinderViews___main(x_15, x_17, x_3, x_4, x_5, x_6, x_16);
+x_18 = l___private_Init_Lean_Elab_TermBinders_6__elabBinderViews___main(x_15, x_17, x_3, x_4, x_5, x_6, x_16);
 lean_dec(x_15);
 if (lean_obj_tag(x_18) == 0)
 {
@@ -1685,28 +1924,28 @@ return x_35;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_1);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux(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* l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_1);
 return x_8;
 }
@@ -1735,7 +1974,7 @@ x_12 = lean_unsigned_to_nat(0u);
 x_13 = l_Array_empty___closed__1;
 lean_inc(x_3);
 lean_inc(x_10);
-x_14 = l___private_Init_Lean_Elab_TermBinders_6__elabBindersAux___main(x_1, x_12, x_13, x_7, x_10, x_3, x_11);
+x_14 = l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___main(x_1, x_12, x_13, x_7, x_10, x_3, x_11);
 if (lean_obj_tag(x_14) == 0)
 {
 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; uint8_t x_23; 
@@ -3111,16 +3350,6 @@ return x_13;
 }
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabForall___closed__1() {
-_start:
-{
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Term_forall___elambda__1___closed__1;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
 lean_object* l_Lean_Elab_Term_elabForall(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
@@ -3130,42 +3359,44 @@ lean_inc(x_1);
 x_6 = l_Lean_Syntax_isOfKind(x_1, x_5);
 if (x_6 == 0)
 {
-lean_object* x_7; lean_object* x_8; 
-x_7 = l_Lean_Elab_Term_elabForall___closed__1;
-x_8 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_7, x_3, x_4);
-return x_8;
+lean_object* x_7; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_7 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_4);
+return x_7;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
-x_9 = l_Lean_Syntax_getArgs(x_1);
-x_10 = lean_array_get_size(x_9);
+lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+x_8 = l_Lean_Syntax_getArgs(x_1);
+x_9 = lean_array_get_size(x_8);
+lean_dec(x_8);
+x_10 = lean_unsigned_to_nat(4u);
+x_11 = lean_nat_dec_eq(x_9, x_10);
 lean_dec(x_9);
-x_11 = lean_unsigned_to_nat(4u);
-x_12 = lean_nat_dec_eq(x_10, x_11);
-lean_dec(x_10);
-if (x_12 == 0)
+if (x_11 == 0)
 {
-lean_object* x_13; lean_object* x_14; 
-x_13 = l_Lean_Elab_Term_elabForall___closed__1;
-x_14 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_13, x_3, x_4);
-return x_14;
+lean_object* x_12; 
+lean_dec(x_3);
+lean_dec(x_1);
+x_12 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_4);
+return x_12;
 }
 else
 {
-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; 
-x_15 = lean_unsigned_to_nat(1u);
+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; 
+x_13 = lean_unsigned_to_nat(1u);
+x_14 = l_Lean_Syntax_getArg(x_1, x_13);
+x_15 = lean_unsigned_to_nat(3u);
 x_16 = l_Lean_Syntax_getArg(x_1, x_15);
-x_17 = lean_unsigned_to_nat(3u);
-x_18 = l_Lean_Syntax_getArg(x_1, x_17);
-x_19 = l_Lean_Syntax_getArgs(x_16);
-lean_dec(x_16);
-x_20 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabForall___lambda__1___boxed), 5, 2);
-lean_closure_set(x_20, 0, x_18);
-lean_closure_set(x_20, 1, x_1);
-x_21 = l_Lean_Elab_Term_elabBinders___rarg(x_19, x_20, x_3, x_4);
-lean_dec(x_19);
-return x_21;
+x_17 = l_Lean_Syntax_getArgs(x_14);
+lean_dec(x_14);
+x_18 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabForall___lambda__1___boxed), 5, 2);
+lean_closure_set(x_18, 0, x_16);
+lean_closure_set(x_18, 1, x_1);
+x_19 = l_Lean_Elab_Term_elabBinders___rarg(x_17, x_18, x_3, x_4);
+lean_dec(x_17);
+return x_19;
 }
 }
 }
@@ -3228,16 +3459,6 @@ return x_5;
 lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__1() {
 _start:
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Parser_Command_openRenamingItem___elambda__1___closed__7;
-x_2 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_2, 0, x_1);
-return x_2;
-}
-}
-lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__2() {
-_start:
-{
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
 x_2 = l_Lean_Parser_Term_forall___elambda__1___closed__1;
@@ -3247,7 +3468,7 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__3() {
+lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -3259,7 +3480,7 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__4() {
+lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -3271,17 +3492,17 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__5() {
+lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_iterateMAux___main___at_Lean_mkAppStx___spec__1___closed__1;
-x_2 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__4;
+x_2 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__3;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__6() {
+lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -3293,17 +3514,17 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__7() {
+lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Term_mkExplicitBinder___closed__5;
-x_2 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__3;
+x_2 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__2;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__8() {
+lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -3315,12 +3536,12 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__9() {
+lean_object* _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_PersistentHashMap_mkCollisionNode___rarg___closed__1;
-x_2 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__2;
+x_2 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__1;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -3334,147 +3555,146 @@ lean_inc(x_1);
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; 
-x_6 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__1;
-x_7 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_6, x_2, x_3);
-return x_7;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_8 = l_Lean_Syntax_getArgs(x_1);
-x_9 = lean_array_get_size(x_8);
-lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(3u);
-x_11 = lean_nat_dec_eq(x_9, x_10);
-lean_dec(x_9);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; 
-x_12 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__1;
-x_13 = l_Lean_Elab_Term_throwUnexpectedSyntax___rarg(x_1, x_12, x_2, x_3);
-return x_13;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-x_14 = lean_unsigned_to_nat(0u);
-x_15 = l_Lean_Syntax_getArg(x_1, x_14);
-x_16 = lean_unsigned_to_nat(2u);
-x_17 = l_Lean_Syntax_getArg(x_1, x_16);
+lean_object* x_6; 
 lean_dec(x_1);
-x_18 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
-lean_dec(x_2);
-x_19 = !lean_is_exclusive(x_18);
-if (x_19 == 0)
-{
-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; 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_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; 
-x_20 = lean_ctor_get(x_18, 0);
-x_21 = lean_box(0);
-x_22 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__4;
-x_23 = lean_name_mk_numeral(x_22, x_20);
-x_24 = lean_box(0);
-x_25 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__3;
-x_26 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_26, 0, x_21);
-lean_ctor_set(x_26, 1, x_25);
-lean_ctor_set(x_26, 2, x_23);
-lean_ctor_set(x_26, 3, x_24);
-x_27 = l_Lean_mkOptionalNode___closed__1;
-x_28 = lean_array_push(x_27, x_26);
-x_29 = l_Lean_nullKind___closed__2;
-x_30 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_30, 0, x_29);
-lean_ctor_set(x_30, 1, x_28);
-x_31 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__5;
-x_32 = lean_array_push(x_31, x_15);
-x_33 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_33, 0, x_29);
-lean_ctor_set(x_33, 1, x_32);
-x_34 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__7;
-x_35 = lean_array_push(x_34, x_30);
-x_36 = lean_array_push(x_35, x_33);
-x_37 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
-x_38 = lean_array_push(x_36, x_37);
-x_39 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__6;
-x_40 = lean_array_push(x_38, x_39);
-x_41 = l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
-x_42 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_42, 0, x_41);
-lean_ctor_set(x_42, 1, x_40);
-x_43 = lean_array_push(x_27, x_42);
-x_44 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_44, 0, x_29);
-lean_ctor_set(x_44, 1, x_43);
-x_45 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__9;
-x_46 = lean_array_push(x_45, x_44);
-x_47 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__8;
-x_48 = lean_array_push(x_46, x_47);
-x_49 = lean_array_push(x_48, x_17);
-x_50 = l_Lean_Parser_Term_forall___elambda__1___closed__2;
-x_51 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_51, 0, x_50);
-lean_ctor_set(x_51, 1, x_49);
-lean_ctor_set(x_18, 0, x_51);
-return x_18;
+x_6 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_6;
 }
 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; 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; 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; 
-x_52 = lean_ctor_get(x_18, 0);
-x_53 = lean_ctor_get(x_18, 1);
-lean_inc(x_53);
-lean_inc(x_52);
-lean_dec(x_18);
-x_54 = lean_box(0);
-x_55 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__4;
-x_56 = lean_name_mk_numeral(x_55, x_52);
-x_57 = lean_box(0);
-x_58 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__3;
-x_59 = lean_alloc_ctor(3, 4, 0);
-lean_ctor_set(x_59, 0, x_54);
-lean_ctor_set(x_59, 1, x_58);
-lean_ctor_set(x_59, 2, x_56);
-lean_ctor_set(x_59, 3, x_57);
-x_60 = l_Lean_mkOptionalNode___closed__1;
-x_61 = lean_array_push(x_60, x_59);
-x_62 = l_Lean_nullKind___closed__2;
-x_63 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_63, 0, x_62);
-lean_ctor_set(x_63, 1, x_61);
-x_64 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__5;
-x_65 = lean_array_push(x_64, x_15);
-x_66 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_66, 0, x_62);
-lean_ctor_set(x_66, 1, x_65);
-x_67 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__7;
-x_68 = lean_array_push(x_67, x_63);
-x_69 = lean_array_push(x_68, x_66);
-x_70 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = l_Lean_Syntax_getArgs(x_1);
+x_8 = lean_array_get_size(x_7);
+lean_dec(x_7);
+x_9 = lean_unsigned_to_nat(3u);
+x_10 = lean_nat_dec_eq(x_8, x_9);
+lean_dec(x_8);
+if (x_10 == 0)
+{
+lean_object* x_11; 
+lean_dec(x_1);
+x_11 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_3);
+return x_11;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
+x_12 = lean_unsigned_to_nat(0u);
+x_13 = l_Lean_Syntax_getArg(x_1, x_12);
+x_14 = lean_unsigned_to_nat(2u);
+x_15 = l_Lean_Syntax_getArg(x_1, x_14);
+lean_dec(x_1);
+x_16 = l_Lean_Elab_Term_getCurrMacroScope(x_2, x_3);
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 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; 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_48; lean_object* x_49; 
+x_18 = lean_ctor_get(x_16, 0);
+x_19 = lean_box(0);
+x_20 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__4;
+x_21 = lean_name_mk_numeral(x_20, x_18);
+x_22 = lean_box(0);
+x_23 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__3;
+x_24 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_24, 0, x_19);
+lean_ctor_set(x_24, 1, x_23);
+lean_ctor_set(x_24, 2, x_21);
+lean_ctor_set(x_24, 3, x_22);
+x_25 = l_Lean_mkOptionalNode___closed__1;
+x_26 = lean_array_push(x_25, x_24);
+x_27 = l_Lean_nullKind___closed__2;
+x_28 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_28, 0, x_27);
+lean_ctor_set(x_28, 1, x_26);
+x_29 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__4;
+x_30 = lean_array_push(x_29, x_13);
+x_31 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_31, 0, x_27);
+lean_ctor_set(x_31, 1, x_30);
+x_32 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__6;
+x_33 = lean_array_push(x_32, x_28);
+x_34 = lean_array_push(x_33, x_31);
+x_35 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_36 = lean_array_push(x_34, x_35);
+x_37 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__5;
+x_38 = lean_array_push(x_36, x_37);
+x_39 = l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
+x_40 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_40, 0, x_39);
+lean_ctor_set(x_40, 1, x_38);
+x_41 = lean_array_push(x_25, x_40);
+x_42 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_42, 0, x_27);
+lean_ctor_set(x_42, 1, x_41);
+x_43 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__8;
+x_44 = lean_array_push(x_43, x_42);
+x_45 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__7;
+x_46 = lean_array_push(x_44, x_45);
+x_47 = lean_array_push(x_46, x_15);
+x_48 = l_Lean_Parser_Term_forall___elambda__1___closed__2;
+x_49 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_49, 0, x_48);
+lean_ctor_set(x_49, 1, x_47);
+lean_ctor_set(x_16, 0, x_49);
+return x_16;
+}
+else
+{
+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; 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; 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; 
+x_50 = lean_ctor_get(x_16, 0);
+x_51 = lean_ctor_get(x_16, 1);
+lean_inc(x_51);
+lean_inc(x_50);
+lean_dec(x_16);
+x_52 = lean_box(0);
+x_53 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__4;
+x_54 = lean_name_mk_numeral(x_53, x_50);
+x_55 = lean_box(0);
+x_56 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__3;
+x_57 = lean_alloc_ctor(3, 4, 0);
+lean_ctor_set(x_57, 0, x_52);
+lean_ctor_set(x_57, 1, x_56);
+lean_ctor_set(x_57, 2, x_54);
+lean_ctor_set(x_57, 3, x_55);
+x_58 = l_Lean_mkOptionalNode___closed__1;
+x_59 = lean_array_push(x_58, x_57);
+x_60 = l_Lean_nullKind___closed__2;
+x_61 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_61, 0, x_60);
+lean_ctor_set(x_61, 1, x_59);
+x_62 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__4;
+x_63 = lean_array_push(x_62, x_13);
+x_64 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_64, 0, x_60);
+lean_ctor_set(x_64, 1, x_63);
+x_65 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__6;
+x_66 = lean_array_push(x_65, x_61);
+x_67 = lean_array_push(x_66, x_64);
+x_68 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
+x_69 = lean_array_push(x_67, x_68);
+x_70 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__5;
 x_71 = lean_array_push(x_69, x_70);
-x_72 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__6;
-x_73 = lean_array_push(x_71, x_72);
-x_74 = l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
+x_72 = l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
+x_73 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_73, 0, x_72);
+lean_ctor_set(x_73, 1, x_71);
+x_74 = lean_array_push(x_58, x_73);
 x_75 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_75, 0, x_74);
-lean_ctor_set(x_75, 1, x_73);
-x_76 = lean_array_push(x_60, x_75);
-x_77 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_77, 0, x_62);
-lean_ctor_set(x_77, 1, x_76);
-x_78 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__9;
-x_79 = lean_array_push(x_78, x_77);
-x_80 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__8;
-x_81 = lean_array_push(x_79, x_80);
-x_82 = lean_array_push(x_81, x_17);
-x_83 = l_Lean_Parser_Term_forall___elambda__1___closed__2;
-x_84 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_84, 0, x_83);
-lean_ctor_set(x_84, 1, x_82);
-x_85 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_85, 0, x_84);
-lean_ctor_set(x_85, 1, x_53);
-return x_85;
+lean_ctor_set(x_75, 0, x_60);
+lean_ctor_set(x_75, 1, x_74);
+x_76 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__8;
+x_77 = lean_array_push(x_76, x_75);
+x_78 = l_Lean_Elab_Term_elabArrow___lambda__1___closed__7;
+x_79 = lean_array_push(x_77, x_78);
+x_80 = lean_array_push(x_79, x_15);
+x_81 = l_Lean_Parser_Term_forall___elambda__1___closed__2;
+x_82 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_82, 0, x_81);
+lean_ctor_set(x_82, 1, x_80);
+x_83 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_83, 0, x_82);
+lean_ctor_set(x_83, 1, x_51);
+return x_83;
 }
 }
 }
@@ -3484,7 +3704,7 @@ lean_object* _init_l_Lean_Elab_Term_elabArrow___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabArrow___lambda__1), 3, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabArrow___lambda__1___boxed), 3, 0);
 return x_1;
 }
 }
@@ -3497,6 +3717,15 @@ x_6 = l_Lean_Elab_Term_adaptExpander(x_5, x_1, x_2, x_3, x_4);
 return x_6;
 }
 }
+lean_object* l_Lean_Elab_Term_elabArrow___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Lean_Elab_Term_elabArrow___lambda__1(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
 lean_object* _init_l___regBuiltinTermElab_Lean_Elab_Term_elabArrow___closed__1() {
 _start:
 {
@@ -3537,23 +3766,19 @@ return x_5;
 lean_object* l_Lean_Elab_Term_elabDepArrow(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
-x_5 = lean_ctor_get(x_1, 1);
-lean_inc(x_5);
-x_6 = l_Lean_stxInh;
-x_7 = lean_unsigned_to_nat(0u);
-x_8 = lean_array_get(x_6, x_5, x_7);
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = l_Lean_Syntax_getArg(x_1, x_5);
+x_7 = lean_unsigned_to_nat(2u);
+x_8 = l_Lean_Syntax_getArg(x_1, x_7);
 x_9 = l_Lean_mkOptionalNode___closed__1;
-x_10 = lean_array_push(x_9, x_8);
-x_11 = lean_unsigned_to_nat(2u);
-x_12 = lean_array_get(x_6, x_5, x_11);
-lean_dec(x_5);
-x_13 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabForall___lambda__1___boxed), 5, 2);
-lean_closure_set(x_13, 0, x_12);
-lean_closure_set(x_13, 1, x_1);
-x_14 = l_Lean_Elab_Term_elabBinders___rarg(x_10, x_13, x_3, x_4);
+x_10 = lean_array_push(x_9, x_6);
+x_11 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabForall___lambda__1___boxed), 5, 2);
+lean_closure_set(x_11, 0, x_8);
+lean_closure_set(x_11, 1, x_1);
+x_12 = l_Lean_Elab_Term_elabBinders___rarg(x_10, x_11, x_3, x_4);
 lean_dec(x_10);
-return x_14;
+return x_12;
 }
 }
 lean_object* l_Lean_Elab_Term_elabDepArrow___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
@@ -3602,7 +3827,7 @@ x_5 = l_Lean_Elab_Term_addBuiltinTermElab(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___main(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___main(uint8_t 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_46; uint8_t x_47; 
@@ -3643,7 +3868,7 @@ x_56 = lean_unsigned_to_nat(1u);
 x_57 = l_Lean_Syntax_getArg(x_2, x_56);
 lean_dec(x_2);
 x_58 = 0;
-x_59 = l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___main(x_58, x_55, x_3, x_4, x_5);
+x_59 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___main(x_58, x_55, x_3, x_4, x_5);
 x_60 = lean_ctor_get(x_59, 0);
 lean_inc(x_60);
 if (lean_obj_tag(x_60) == 0)
@@ -3845,56 +4070,56 @@ return x_44;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 uint8_t x_6; lean_object* x_7; 
 x_6 = lean_unbox(x_1);
 lean_dec(x_1);
-x_7 = l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___main(x_6, x_2, x_3, x_4, x_5);
+x_7 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___main(x_6, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 lean_object* x_6; 
-x_6 = l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___main(x_1, x_2, x_3, x_4, x_5);
+x_6 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___main(x_1, x_2, x_3, x_4, x_5);
 return x_6;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
 uint8_t x_6; lean_object* x_7; 
 x_6 = lean_unbox(x_1);
 lean_dec(x_1);
-x_7 = l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f(x_6, x_2, x_3, x_4, x_5);
+x_7 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f(x_6, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 uint8_t x_4; lean_object* x_5; lean_object* x_6; 
 x_4 = 0;
 x_5 = l_Array_empty___closed__1;
-x_6 = l___private_Init_Lean_Elab_TermBinders_7__getFunBinderIdsAux_x3f___main(x_4, x_1, x_5, x_2, x_3);
+x_6 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIdsAux_x3f___main(x_4, x_1, x_5, x_2, x_3);
 return x_6;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; 
-x_4 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f(x_1, x_2, x_3);
+x_4 = l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f(x_1, x_2, x_3);
 lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -3932,7 +4157,7 @@ goto _start;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__1() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -3944,7 +4169,7 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__2() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__2() {
 _start:
 {
 lean_object* x_1; 
@@ -3952,19 +4177,19 @@ x_1 = lean_mk_string("with");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__2;
+x_2 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__2;
 x_3 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__4() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -3972,39 +4197,39 @@ x_1 = lean_mk_string("|");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__5() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__4;
+x_2 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4;
 x_3 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_PersistentHashMap_mkCollisionNode___rarg___closed__1;
-x_2 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__5;
+x_2 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__5;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Term_mkExplicitBinder___closed__5;
-x_2 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__1;
+x_2 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__1;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__8() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__8() {
 _start:
 {
 lean_object* x_1; 
@@ -4012,27 +4237,27 @@ x_1 = lean_mk_string("invalid binder, simple identifier expected");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__9() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__8;
+x_1 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__8;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10() {
+lean_object* _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__9;
+x_1 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__9;
 x_2 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(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* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; uint8_t x_8; 
@@ -4147,7 +4372,7 @@ lean_inc(x_34);
 x_39 = l_Lean_Elab_Term_mkExplicitBinder(x_34, x_38);
 x_40 = lean_array_push(x_4, x_39);
 lean_inc(x_5);
-x_41 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_37, x_40, x_5, x_35);
+x_41 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_37, x_40, x_5, x_35);
 if (lean_obj_tag(x_41) == 0)
 {
 lean_object* x_42; lean_object* x_43; uint8_t x_44; 
@@ -4188,7 +4413,7 @@ x_57 = lean_ctor_get(x_11, 0);
 lean_dec(x_57);
 lean_ctor_set(x_11, 1, x_54);
 lean_ctor_set(x_11, 0, x_52);
-x_58 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_58 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_59 = lean_array_push(x_58, x_11);
 x_60 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_61 = lean_array_push(x_59, x_60);
@@ -4201,11 +4426,11 @@ x_65 = lean_array_push(x_50, x_64);
 x_66 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_66, 0, x_52);
 lean_ctor_set(x_66, 1, x_65);
-x_67 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_67 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_68 = lean_array_push(x_67, x_53);
 x_69 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_70 = lean_array_push(x_68, x_69);
-x_71 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_71 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_72 = lean_array_push(x_70, x_71);
 x_73 = lean_array_push(x_72, x_66);
 x_74 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -4223,7 +4448,7 @@ lean_dec(x_11);
 x_76 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_76, 0, x_52);
 lean_ctor_set(x_76, 1, x_54);
-x_77 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_77 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_78 = lean_array_push(x_77, x_76);
 x_79 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_80 = lean_array_push(x_78, x_79);
@@ -4236,11 +4461,11 @@ x_84 = lean_array_push(x_50, x_83);
 x_85 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_85, 0, x_52);
 lean_ctor_set(x_85, 1, x_84);
-x_86 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_86 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_87 = lean_array_push(x_86, x_53);
 x_88 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_89 = lean_array_push(x_87, x_88);
-x_90 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_90 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_91 = lean_array_push(x_89, x_90);
 x_92 = lean_array_push(x_91, x_85);
 x_93 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -4281,7 +4506,7 @@ if (lean_is_scalar(x_101)) {
 }
 lean_ctor_set(x_102, 0, x_98);
 lean_ctor_set(x_102, 1, x_100);
-x_103 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_103 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_104 = lean_array_push(x_103, x_102);
 x_105 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_106 = lean_array_push(x_104, x_105);
@@ -4294,11 +4519,11 @@ x_110 = lean_array_push(x_96, x_109);
 x_111 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_111, 0, x_98);
 lean_ctor_set(x_111, 1, x_110);
-x_112 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_112 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_113 = lean_array_push(x_112, x_99);
 x_114 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_115 = lean_array_push(x_113, x_114);
-x_116 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_116 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_117 = lean_array_push(x_115, x_116);
 x_118 = lean_array_push(x_117, x_111);
 x_119 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -4356,7 +4581,7 @@ if (lean_is_scalar(x_133)) {
 }
 lean_ctor_set(x_134, 0, x_130);
 lean_ctor_set(x_134, 1, x_132);
-x_135 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_135 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_136 = lean_array_push(x_135, x_134);
 x_137 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_138 = lean_array_push(x_136, x_137);
@@ -4369,11 +4594,11 @@ x_142 = lean_array_push(x_128, x_141);
 x_143 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_143, 0, x_130);
 lean_ctor_set(x_143, 1, x_142);
-x_144 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_144 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_145 = lean_array_push(x_144, x_131);
 x_146 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_147 = lean_array_push(x_145, x_146);
-x_148 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_148 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_149 = lean_array_push(x_147, x_148);
 x_150 = lean_array_push(x_149, x_143);
 x_151 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -4439,7 +4664,7 @@ lean_dec(x_160);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_163 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_163 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_164 = l_Lean_Elab_Term_throwError___rarg(x_11, x_163, x_5, x_6);
 x_165 = !lean_is_exclusive(x_164);
 if (x_165 == 0)
@@ -4507,7 +4732,7 @@ lean_inc(x_180);
 x_185 = l_Lean_Elab_Term_mkExplicitBinder(x_180, x_184);
 x_186 = lean_array_push(x_4, x_185);
 lean_inc(x_5);
-x_187 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_183, x_186, x_5, x_181);
+x_187 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_183, x_186, x_5, x_181);
 if (lean_obj_tag(x_187) == 0)
 {
 lean_object* x_188; lean_object* x_189; uint8_t x_190; 
@@ -4548,7 +4773,7 @@ x_203 = lean_ctor_get(x_11, 0);
 lean_dec(x_203);
 lean_ctor_set(x_11, 1, x_200);
 lean_ctor_set(x_11, 0, x_198);
-x_204 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_204 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_205 = lean_array_push(x_204, x_11);
 x_206 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_207 = lean_array_push(x_205, x_206);
@@ -4561,11 +4786,11 @@ x_211 = lean_array_push(x_196, x_210);
 x_212 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_212, 0, x_198);
 lean_ctor_set(x_212, 1, x_211);
-x_213 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_213 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_214 = lean_array_push(x_213, x_199);
 x_215 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_216 = lean_array_push(x_214, x_215);
-x_217 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_217 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_218 = lean_array_push(x_216, x_217);
 x_219 = lean_array_push(x_218, x_212);
 x_220 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -4583,7 +4808,7 @@ lean_dec(x_11);
 x_222 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_222, 0, x_198);
 lean_ctor_set(x_222, 1, x_200);
-x_223 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_223 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_224 = lean_array_push(x_223, x_222);
 x_225 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_226 = lean_array_push(x_224, x_225);
@@ -4596,11 +4821,11 @@ x_230 = lean_array_push(x_196, x_229);
 x_231 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_231, 0, x_198);
 lean_ctor_set(x_231, 1, x_230);
-x_232 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_232 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_233 = lean_array_push(x_232, x_199);
 x_234 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_235 = lean_array_push(x_233, x_234);
-x_236 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_236 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_237 = lean_array_push(x_235, x_236);
 x_238 = lean_array_push(x_237, x_231);
 x_239 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -4641,7 +4866,7 @@ if (lean_is_scalar(x_247)) {
 }
 lean_ctor_set(x_248, 0, x_244);
 lean_ctor_set(x_248, 1, x_246);
-x_249 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_249 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_250 = lean_array_push(x_249, x_248);
 x_251 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_252 = lean_array_push(x_250, x_251);
@@ -4654,11 +4879,11 @@ x_256 = lean_array_push(x_242, x_255);
 x_257 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_257, 0, x_244);
 lean_ctor_set(x_257, 1, x_256);
-x_258 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_258 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_259 = lean_array_push(x_258, x_245);
 x_260 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_261 = lean_array_push(x_259, x_260);
-x_262 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_262 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_263 = lean_array_push(x_261, x_262);
 x_264 = lean_array_push(x_263, x_257);
 x_265 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -4716,7 +4941,7 @@ if (lean_is_scalar(x_279)) {
 }
 lean_ctor_set(x_280, 0, x_276);
 lean_ctor_set(x_280, 1, x_278);
-x_281 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_281 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_282 = lean_array_push(x_281, x_280);
 x_283 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_284 = lean_array_push(x_282, x_283);
@@ -4729,11 +4954,11 @@ x_288 = lean_array_push(x_274, x_287);
 x_289 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_289, 0, x_276);
 lean_ctor_set(x_289, 1, x_288);
-x_290 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_290 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_291 = lean_array_push(x_290, x_277);
 x_292 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_293 = lean_array_push(x_291, x_292);
-x_294 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_294 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_295 = lean_array_push(x_293, x_294);
 x_296 = lean_array_push(x_295, x_289);
 x_297 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -4800,7 +5025,7 @@ lean_dec(x_306);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_309 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_309 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_310 = l_Lean_Elab_Term_throwError___rarg(x_177, x_309, x_5, x_6);
 x_311 = !lean_is_exclusive(x_310);
 if (x_311 == 0)
@@ -4870,7 +5095,7 @@ lean_inc(x_326);
 x_331 = l_Lean_Elab_Term_mkExplicitBinder(x_326, x_330);
 x_332 = lean_array_push(x_4, x_331);
 lean_inc(x_5);
-x_333 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_329, x_332, x_5, x_327);
+x_333 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_329, x_332, x_5, x_327);
 if (lean_obj_tag(x_333) == 0)
 {
 lean_object* x_334; lean_object* x_335; uint8_t x_336; 
@@ -4911,7 +5136,7 @@ x_349 = lean_ctor_get(x_11, 0);
 lean_dec(x_349);
 lean_ctor_set(x_11, 1, x_346);
 lean_ctor_set(x_11, 0, x_344);
-x_350 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_350 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_351 = lean_array_push(x_350, x_11);
 x_352 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_353 = lean_array_push(x_351, x_352);
@@ -4924,11 +5149,11 @@ x_357 = lean_array_push(x_342, x_356);
 x_358 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_358, 0, x_344);
 lean_ctor_set(x_358, 1, x_357);
-x_359 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_359 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_360 = lean_array_push(x_359, x_345);
 x_361 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_362 = lean_array_push(x_360, x_361);
-x_363 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_363 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_364 = lean_array_push(x_362, x_363);
 x_365 = lean_array_push(x_364, x_358);
 x_366 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -4946,7 +5171,7 @@ lean_dec(x_11);
 x_368 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_368, 0, x_344);
 lean_ctor_set(x_368, 1, x_346);
-x_369 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_369 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_370 = lean_array_push(x_369, x_368);
 x_371 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_372 = lean_array_push(x_370, x_371);
@@ -4959,11 +5184,11 @@ x_376 = lean_array_push(x_342, x_375);
 x_377 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_377, 0, x_344);
 lean_ctor_set(x_377, 1, x_376);
-x_378 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_378 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_379 = lean_array_push(x_378, x_345);
 x_380 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_381 = lean_array_push(x_379, x_380);
-x_382 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_382 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_383 = lean_array_push(x_381, x_382);
 x_384 = lean_array_push(x_383, x_377);
 x_385 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5004,7 +5229,7 @@ if (lean_is_scalar(x_393)) {
 }
 lean_ctor_set(x_394, 0, x_390);
 lean_ctor_set(x_394, 1, x_392);
-x_395 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_395 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_396 = lean_array_push(x_395, x_394);
 x_397 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_398 = lean_array_push(x_396, x_397);
@@ -5017,11 +5242,11 @@ x_402 = lean_array_push(x_388, x_401);
 x_403 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_403, 0, x_390);
 lean_ctor_set(x_403, 1, x_402);
-x_404 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_404 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_405 = lean_array_push(x_404, x_391);
 x_406 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_407 = lean_array_push(x_405, x_406);
-x_408 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_408 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_409 = lean_array_push(x_407, x_408);
 x_410 = lean_array_push(x_409, x_403);
 x_411 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5079,7 +5304,7 @@ if (lean_is_scalar(x_425)) {
 }
 lean_ctor_set(x_426, 0, x_422);
 lean_ctor_set(x_426, 1, x_424);
-x_427 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_427 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_428 = lean_array_push(x_427, x_426);
 x_429 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_430 = lean_array_push(x_428, x_429);
@@ -5092,11 +5317,11 @@ x_434 = lean_array_push(x_420, x_433);
 x_435 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_435, 0, x_422);
 lean_ctor_set(x_435, 1, x_434);
-x_436 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_436 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_437 = lean_array_push(x_436, x_423);
 x_438 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_439 = lean_array_push(x_437, x_438);
-x_440 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_440 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_441 = lean_array_push(x_439, x_440);
 x_442 = lean_array_push(x_441, x_435);
 x_443 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5163,7 +5388,7 @@ lean_dec(x_452);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_455 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_455 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_456 = l_Lean_Elab_Term_throwError___rarg(x_323, x_455, x_5, x_6);
 x_457 = !lean_is_exclusive(x_456);
 if (x_457 == 0)
@@ -5239,7 +5464,7 @@ lean_inc(x_474);
 x_479 = l_Lean_Elab_Term_mkExplicitBinder(x_474, x_478);
 x_480 = lean_array_push(x_4, x_479);
 lean_inc(x_5);
-x_481 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_477, x_480, x_5, x_475);
+x_481 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_477, x_480, x_5, x_475);
 if (lean_obj_tag(x_481) == 0)
 {
 lean_object* x_482; lean_object* x_483; uint8_t x_484; 
@@ -5280,7 +5505,7 @@ x_497 = lean_ctor_get(x_11, 0);
 lean_dec(x_497);
 lean_ctor_set(x_11, 1, x_494);
 lean_ctor_set(x_11, 0, x_492);
-x_498 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_498 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_499 = lean_array_push(x_498, x_11);
 x_500 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_501 = lean_array_push(x_499, x_500);
@@ -5293,11 +5518,11 @@ x_505 = lean_array_push(x_490, x_504);
 x_506 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_506, 0, x_492);
 lean_ctor_set(x_506, 1, x_505);
-x_507 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_507 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_508 = lean_array_push(x_507, x_493);
 x_509 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_510 = lean_array_push(x_508, x_509);
-x_511 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_511 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_512 = lean_array_push(x_510, x_511);
 x_513 = lean_array_push(x_512, x_506);
 x_514 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5315,7 +5540,7 @@ lean_dec(x_11);
 x_516 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_516, 0, x_492);
 lean_ctor_set(x_516, 1, x_494);
-x_517 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_517 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_518 = lean_array_push(x_517, x_516);
 x_519 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_520 = lean_array_push(x_518, x_519);
@@ -5328,11 +5553,11 @@ x_524 = lean_array_push(x_490, x_523);
 x_525 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_525, 0, x_492);
 lean_ctor_set(x_525, 1, x_524);
-x_526 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_526 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_527 = lean_array_push(x_526, x_493);
 x_528 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_529 = lean_array_push(x_527, x_528);
-x_530 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_530 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_531 = lean_array_push(x_529, x_530);
 x_532 = lean_array_push(x_531, x_525);
 x_533 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5373,7 +5598,7 @@ if (lean_is_scalar(x_541)) {
 }
 lean_ctor_set(x_542, 0, x_538);
 lean_ctor_set(x_542, 1, x_540);
-x_543 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_543 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_544 = lean_array_push(x_543, x_542);
 x_545 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_546 = lean_array_push(x_544, x_545);
@@ -5386,11 +5611,11 @@ x_550 = lean_array_push(x_536, x_549);
 x_551 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_551, 0, x_538);
 lean_ctor_set(x_551, 1, x_550);
-x_552 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_552 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_553 = lean_array_push(x_552, x_539);
 x_554 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_555 = lean_array_push(x_553, x_554);
-x_556 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_556 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_557 = lean_array_push(x_555, x_556);
 x_558 = lean_array_push(x_557, x_551);
 x_559 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5448,7 +5673,7 @@ if (lean_is_scalar(x_573)) {
 }
 lean_ctor_set(x_574, 0, x_570);
 lean_ctor_set(x_574, 1, x_572);
-x_575 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_575 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_576 = lean_array_push(x_575, x_574);
 x_577 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_578 = lean_array_push(x_576, x_577);
@@ -5461,11 +5686,11 @@ x_582 = lean_array_push(x_568, x_581);
 x_583 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_583, 0, x_570);
 lean_ctor_set(x_583, 1, x_582);
-x_584 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_584 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_585 = lean_array_push(x_584, x_571);
 x_586 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_587 = lean_array_push(x_585, x_586);
-x_588 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_588 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_589 = lean_array_push(x_587, x_588);
 x_590 = lean_array_push(x_589, x_583);
 x_591 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5532,7 +5757,7 @@ lean_dec(x_600);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_603 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_603 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_604 = l_Lean_Elab_Term_throwError___rarg(x_471, x_603, x_5, x_6);
 x_605 = !lean_is_exclusive(x_604);
 if (x_605 == 0)
@@ -5622,7 +5847,7 @@ lean_inc(x_631);
 x_635 = l_Lean_Elab_Term_mkExplicitBinder(x_631, x_634);
 x_636 = lean_array_push(x_4, x_635);
 lean_inc(x_5);
-x_637 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_633, x_636, x_5, x_632);
+x_637 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_633, x_636, x_5, x_632);
 if (lean_obj_tag(x_637) == 0)
 {
 lean_object* x_638; lean_object* x_639; uint8_t x_640; 
@@ -5663,7 +5888,7 @@ x_653 = lean_ctor_get(x_11, 0);
 lean_dec(x_653);
 lean_ctor_set(x_11, 1, x_650);
 lean_ctor_set(x_11, 0, x_648);
-x_654 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_654 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_655 = lean_array_push(x_654, x_11);
 x_656 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_657 = lean_array_push(x_655, x_656);
@@ -5676,11 +5901,11 @@ x_661 = lean_array_push(x_646, x_660);
 x_662 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_662, 0, x_648);
 lean_ctor_set(x_662, 1, x_661);
-x_663 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_663 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_664 = lean_array_push(x_663, x_649);
 x_665 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_666 = lean_array_push(x_664, x_665);
-x_667 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_667 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_668 = lean_array_push(x_666, x_667);
 x_669 = lean_array_push(x_668, x_662);
 x_670 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5698,7 +5923,7 @@ lean_dec(x_11);
 x_672 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_672, 0, x_648);
 lean_ctor_set(x_672, 1, x_650);
-x_673 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_673 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_674 = lean_array_push(x_673, x_672);
 x_675 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_676 = lean_array_push(x_674, x_675);
@@ -5711,11 +5936,11 @@ x_680 = lean_array_push(x_646, x_679);
 x_681 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_681, 0, x_648);
 lean_ctor_set(x_681, 1, x_680);
-x_682 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_682 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_683 = lean_array_push(x_682, x_649);
 x_684 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_685 = lean_array_push(x_683, x_684);
-x_686 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_686 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_687 = lean_array_push(x_685, x_686);
 x_688 = lean_array_push(x_687, x_681);
 x_689 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5756,7 +5981,7 @@ if (lean_is_scalar(x_697)) {
 }
 lean_ctor_set(x_698, 0, x_694);
 lean_ctor_set(x_698, 1, x_696);
-x_699 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_699 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_700 = lean_array_push(x_699, x_698);
 x_701 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_702 = lean_array_push(x_700, x_701);
@@ -5769,11 +5994,11 @@ x_706 = lean_array_push(x_692, x_705);
 x_707 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_707, 0, x_694);
 lean_ctor_set(x_707, 1, x_706);
-x_708 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_708 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_709 = lean_array_push(x_708, x_695);
 x_710 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_711 = lean_array_push(x_709, x_710);
-x_712 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_712 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_713 = lean_array_push(x_711, x_712);
 x_714 = lean_array_push(x_713, x_707);
 x_715 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5831,7 +6056,7 @@ if (lean_is_scalar(x_729)) {
 }
 lean_ctor_set(x_730, 0, x_726);
 lean_ctor_set(x_730, 1, x_728);
-x_731 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_731 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_732 = lean_array_push(x_731, x_730);
 x_733 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_734 = lean_array_push(x_732, x_733);
@@ -5844,11 +6069,11 @@ x_738 = lean_array_push(x_724, x_737);
 x_739 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_739, 0, x_726);
 lean_ctor_set(x_739, 1, x_738);
-x_740 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_740 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_741 = lean_array_push(x_740, x_727);
 x_742 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_743 = lean_array_push(x_741, x_742);
-x_744 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_744 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_745 = lean_array_push(x_743, x_744);
 x_746 = lean_array_push(x_745, x_739);
 x_747 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5899,7 +6124,7 @@ else
 lean_object* x_755; lean_object* x_756; lean_object* x_757; 
 x_755 = l_Lean_Syntax_getArg(x_622, x_615);
 lean_dec(x_622);
-x_756 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f(x_619, x_5, x_6);
+x_756 = l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f(x_619, x_5, x_6);
 x_757 = lean_ctor_get(x_756, 0);
 lean_inc(x_757);
 if (lean_obj_tag(x_757) == 0)
@@ -5922,7 +6147,7 @@ lean_inc(x_760);
 x_764 = l_Lean_Elab_Term_mkExplicitBinder(x_760, x_763);
 x_765 = lean_array_push(x_4, x_764);
 lean_inc(x_5);
-x_766 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_762, x_765, x_5, x_761);
+x_766 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_762, x_765, x_5, x_761);
 if (lean_obj_tag(x_766) == 0)
 {
 lean_object* x_767; lean_object* x_768; uint8_t x_769; 
@@ -5963,7 +6188,7 @@ x_782 = lean_ctor_get(x_11, 0);
 lean_dec(x_782);
 lean_ctor_set(x_11, 1, x_779);
 lean_ctor_set(x_11, 0, x_777);
-x_783 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_783 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_784 = lean_array_push(x_783, x_11);
 x_785 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_786 = lean_array_push(x_784, x_785);
@@ -5976,11 +6201,11 @@ x_790 = lean_array_push(x_775, x_789);
 x_791 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_791, 0, x_777);
 lean_ctor_set(x_791, 1, x_790);
-x_792 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_792 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_793 = lean_array_push(x_792, x_778);
 x_794 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_795 = lean_array_push(x_793, x_794);
-x_796 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_796 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_797 = lean_array_push(x_795, x_796);
 x_798 = lean_array_push(x_797, x_791);
 x_799 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -5998,7 +6223,7 @@ lean_dec(x_11);
 x_801 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_801, 0, x_777);
 lean_ctor_set(x_801, 1, x_779);
-x_802 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_802 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_803 = lean_array_push(x_802, x_801);
 x_804 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_805 = lean_array_push(x_803, x_804);
@@ -6011,11 +6236,11 @@ x_809 = lean_array_push(x_775, x_808);
 x_810 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_810, 0, x_777);
 lean_ctor_set(x_810, 1, x_809);
-x_811 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_811 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_812 = lean_array_push(x_811, x_778);
 x_813 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_814 = lean_array_push(x_812, x_813);
-x_815 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_815 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_816 = lean_array_push(x_814, x_815);
 x_817 = lean_array_push(x_816, x_810);
 x_818 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6056,7 +6281,7 @@ if (lean_is_scalar(x_826)) {
 }
 lean_ctor_set(x_827, 0, x_823);
 lean_ctor_set(x_827, 1, x_825);
-x_828 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_828 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_829 = lean_array_push(x_828, x_827);
 x_830 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_831 = lean_array_push(x_829, x_830);
@@ -6069,11 +6294,11 @@ x_835 = lean_array_push(x_821, x_834);
 x_836 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_836, 0, x_823);
 lean_ctor_set(x_836, 1, x_835);
-x_837 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_837 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_838 = lean_array_push(x_837, x_824);
 x_839 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_840 = lean_array_push(x_838, x_839);
-x_841 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_841 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_842 = lean_array_push(x_840, x_841);
 x_843 = lean_array_push(x_842, x_836);
 x_844 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6131,7 +6356,7 @@ if (lean_is_scalar(x_858)) {
 }
 lean_ctor_set(x_859, 0, x_855);
 lean_ctor_set(x_859, 1, x_857);
-x_860 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_860 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_861 = lean_array_push(x_860, x_859);
 x_862 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_863 = lean_array_push(x_861, x_862);
@@ -6144,11 +6369,11 @@ x_867 = lean_array_push(x_853, x_866);
 x_868 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_868, 0, x_855);
 lean_ctor_set(x_868, 1, x_867);
-x_869 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_869 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_870 = lean_array_push(x_869, x_856);
 x_871 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_872 = lean_array_push(x_870, x_871);
-x_873 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_873 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_874 = lean_array_push(x_872, x_873);
 x_875 = lean_array_push(x_874, x_868);
 x_876 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6206,7 +6431,7 @@ lean_inc(x_885);
 lean_dec(x_757);
 x_886 = lean_nat_add(x_3, x_615);
 lean_dec(x_3);
-x_887 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___spec__1(x_755, x_618, x_885);
+x_887 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___spec__1(x_755, x_618, x_885);
 x_888 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_887, x_887, x_618, x_4);
 lean_dec(x_887);
 x_3 = x_886;
@@ -6234,7 +6459,7 @@ lean_inc(x_891);
 x_895 = l_Lean_Elab_Term_mkExplicitBinder(x_891, x_894);
 x_896 = lean_array_push(x_4, x_895);
 lean_inc(x_5);
-x_897 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_893, x_896, x_5, x_892);
+x_897 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_893, x_896, x_5, x_892);
 if (lean_obj_tag(x_897) == 0)
 {
 lean_object* x_898; lean_object* x_899; uint8_t x_900; 
@@ -6275,7 +6500,7 @@ x_913 = lean_ctor_get(x_11, 0);
 lean_dec(x_913);
 lean_ctor_set(x_11, 1, x_910);
 lean_ctor_set(x_11, 0, x_908);
-x_914 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_914 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_915 = lean_array_push(x_914, x_11);
 x_916 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_917 = lean_array_push(x_915, x_916);
@@ -6288,11 +6513,11 @@ x_921 = lean_array_push(x_906, x_920);
 x_922 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_922, 0, x_908);
 lean_ctor_set(x_922, 1, x_921);
-x_923 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_923 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_924 = lean_array_push(x_923, x_909);
 x_925 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_926 = lean_array_push(x_924, x_925);
-x_927 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_927 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_928 = lean_array_push(x_926, x_927);
 x_929 = lean_array_push(x_928, x_922);
 x_930 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6310,7 +6535,7 @@ lean_dec(x_11);
 x_932 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_932, 0, x_908);
 lean_ctor_set(x_932, 1, x_910);
-x_933 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_933 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_934 = lean_array_push(x_933, x_932);
 x_935 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_936 = lean_array_push(x_934, x_935);
@@ -6323,11 +6548,11 @@ x_940 = lean_array_push(x_906, x_939);
 x_941 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_941, 0, x_908);
 lean_ctor_set(x_941, 1, x_940);
-x_942 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_942 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_943 = lean_array_push(x_942, x_909);
 x_944 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_945 = lean_array_push(x_943, x_944);
-x_946 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_946 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_947 = lean_array_push(x_945, x_946);
 x_948 = lean_array_push(x_947, x_941);
 x_949 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6368,7 +6593,7 @@ if (lean_is_scalar(x_957)) {
 }
 lean_ctor_set(x_958, 0, x_954);
 lean_ctor_set(x_958, 1, x_956);
-x_959 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_959 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_960 = lean_array_push(x_959, x_958);
 x_961 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_962 = lean_array_push(x_960, x_961);
@@ -6381,11 +6606,11 @@ x_966 = lean_array_push(x_952, x_965);
 x_967 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_967, 0, x_954);
 lean_ctor_set(x_967, 1, x_966);
-x_968 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_968 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_969 = lean_array_push(x_968, x_955);
 x_970 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_971 = lean_array_push(x_969, x_970);
-x_972 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_972 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_973 = lean_array_push(x_971, x_972);
 x_974 = lean_array_push(x_973, x_967);
 x_975 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6443,7 +6668,7 @@ if (lean_is_scalar(x_989)) {
 }
 lean_ctor_set(x_990, 0, x_986);
 lean_ctor_set(x_990, 1, x_988);
-x_991 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_991 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_992 = lean_array_push(x_991, x_990);
 x_993 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_994 = lean_array_push(x_992, x_993);
@@ -6456,11 +6681,11 @@ x_998 = lean_array_push(x_984, x_997);
 x_999 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_999, 0, x_986);
 lean_ctor_set(x_999, 1, x_998);
-x_1000 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1000 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1001 = lean_array_push(x_1000, x_987);
 x_1002 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1003 = lean_array_push(x_1001, x_1002);
-x_1004 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1004 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1005 = lean_array_push(x_1003, x_1004);
 x_1006 = lean_array_push(x_1005, x_999);
 x_1007 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6524,7 +6749,7 @@ lean_inc(x_1016);
 x_1020 = l_Lean_Elab_Term_mkExplicitBinder(x_1016, x_1019);
 x_1021 = lean_array_push(x_4, x_1020);
 lean_inc(x_5);
-x_1022 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1018, x_1021, x_5, x_1017);
+x_1022 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1018, x_1021, x_5, x_1017);
 if (lean_obj_tag(x_1022) == 0)
 {
 lean_object* x_1023; lean_object* x_1024; uint8_t x_1025; 
@@ -6565,7 +6790,7 @@ x_1038 = lean_ctor_get(x_11, 0);
 lean_dec(x_1038);
 lean_ctor_set(x_11, 1, x_1035);
 lean_ctor_set(x_11, 0, x_1033);
-x_1039 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1039 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1040 = lean_array_push(x_1039, x_11);
 x_1041 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1042 = lean_array_push(x_1040, x_1041);
@@ -6578,11 +6803,11 @@ x_1046 = lean_array_push(x_1031, x_1045);
 x_1047 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1047, 0, x_1033);
 lean_ctor_set(x_1047, 1, x_1046);
-x_1048 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1048 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1049 = lean_array_push(x_1048, x_1034);
 x_1050 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1051 = lean_array_push(x_1049, x_1050);
-x_1052 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1052 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1053 = lean_array_push(x_1051, x_1052);
 x_1054 = lean_array_push(x_1053, x_1047);
 x_1055 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6600,7 +6825,7 @@ lean_dec(x_11);
 x_1057 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1057, 0, x_1033);
 lean_ctor_set(x_1057, 1, x_1035);
-x_1058 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1058 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1059 = lean_array_push(x_1058, x_1057);
 x_1060 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1061 = lean_array_push(x_1059, x_1060);
@@ -6613,11 +6838,11 @@ x_1065 = lean_array_push(x_1031, x_1064);
 x_1066 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1066, 0, x_1033);
 lean_ctor_set(x_1066, 1, x_1065);
-x_1067 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1067 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1068 = lean_array_push(x_1067, x_1034);
 x_1069 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1070 = lean_array_push(x_1068, x_1069);
-x_1071 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1071 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1072 = lean_array_push(x_1070, x_1071);
 x_1073 = lean_array_push(x_1072, x_1066);
 x_1074 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6658,7 +6883,7 @@ if (lean_is_scalar(x_1082)) {
 }
 lean_ctor_set(x_1083, 0, x_1079);
 lean_ctor_set(x_1083, 1, x_1081);
-x_1084 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1084 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1085 = lean_array_push(x_1084, x_1083);
 x_1086 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1087 = lean_array_push(x_1085, x_1086);
@@ -6671,11 +6896,11 @@ x_1091 = lean_array_push(x_1077, x_1090);
 x_1092 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1092, 0, x_1079);
 lean_ctor_set(x_1092, 1, x_1091);
-x_1093 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1093 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1094 = lean_array_push(x_1093, x_1080);
 x_1095 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1096 = lean_array_push(x_1094, x_1095);
-x_1097 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1097 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1098 = lean_array_push(x_1096, x_1097);
 x_1099 = lean_array_push(x_1098, x_1092);
 x_1100 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6733,7 +6958,7 @@ if (lean_is_scalar(x_1114)) {
 }
 lean_ctor_set(x_1115, 0, x_1111);
 lean_ctor_set(x_1115, 1, x_1113);
-x_1116 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1116 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1117 = lean_array_push(x_1116, x_1115);
 x_1118 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1119 = lean_array_push(x_1117, x_1118);
@@ -6746,11 +6971,11 @@ x_1123 = lean_array_push(x_1109, x_1122);
 x_1124 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1124, 0, x_1111);
 lean_ctor_set(x_1124, 1, x_1123);
-x_1125 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1125 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1126 = lean_array_push(x_1125, x_1112);
 x_1127 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1128 = lean_array_push(x_1126, x_1127);
-x_1129 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1129 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1130 = lean_array_push(x_1128, x_1129);
 x_1131 = lean_array_push(x_1130, x_1124);
 x_1132 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -6865,7 +7090,7 @@ lean_inc(x_1154);
 x_1159 = l_Lean_Elab_Term_mkExplicitBinder(x_1154, x_1158);
 x_1160 = lean_array_push(x_4, x_1159);
 lean_inc(x_5);
-x_1161 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1157, x_1160, x_5, x_1155);
+x_1161 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1157, x_1160, x_5, x_1155);
 if (lean_obj_tag(x_1161) == 0)
 {
 lean_object* x_1162; lean_object* x_1163; lean_object* x_1164; lean_object* x_1165; lean_object* x_1166; lean_object* x_1167; lean_object* x_1168; lean_object* x_1169; lean_object* x_1170; lean_object* x_1171; lean_object* x_1172; lean_object* x_1173; lean_object* x_1174; lean_object* x_1175; lean_object* x_1176; lean_object* x_1177; lean_object* x_1178; lean_object* x_1179; lean_object* x_1180; lean_object* x_1181; lean_object* x_1182; lean_object* x_1183; lean_object* x_1184; lean_object* x_1185; lean_object* x_1186; lean_object* x_1187; lean_object* x_1188; lean_object* x_1189; lean_object* x_1190; lean_object* x_1191; lean_object* x_1192; lean_object* x_1193; lean_object* x_1194; lean_object* x_1195; lean_object* x_1196; lean_object* x_1197; 
@@ -6922,7 +7147,7 @@ if (lean_is_scalar(x_1176)) {
 }
 lean_ctor_set(x_1177, 0, x_1173);
 lean_ctor_set(x_1177, 1, x_1175);
-x_1178 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1178 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1179 = lean_array_push(x_1178, x_1177);
 x_1180 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1181 = lean_array_push(x_1179, x_1180);
@@ -6935,11 +7160,11 @@ x_1185 = lean_array_push(x_1171, x_1184);
 x_1186 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1186, 0, x_1173);
 lean_ctor_set(x_1186, 1, x_1185);
-x_1187 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1187 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1188 = lean_array_push(x_1187, x_1174);
 x_1189 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1190 = lean_array_push(x_1188, x_1189);
-x_1191 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1191 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1192 = lean_array_push(x_1190, x_1191);
 x_1193 = lean_array_push(x_1192, x_1186);
 x_1194 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -7010,7 +7235,7 @@ lean_dec(x_1203);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1206 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_1206 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_1207 = l_Lean_Elab_Term_throwError___rarg(x_11, x_1206, x_5, x_6);
 x_1208 = lean_ctor_get(x_1207, 0);
 lean_inc(x_1208);
@@ -7084,7 +7309,7 @@ lean_inc(x_1224);
 x_1229 = l_Lean_Elab_Term_mkExplicitBinder(x_1224, x_1228);
 x_1230 = lean_array_push(x_4, x_1229);
 lean_inc(x_5);
-x_1231 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1227, x_1230, x_5, x_1225);
+x_1231 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1227, x_1230, x_5, x_1225);
 if (lean_obj_tag(x_1231) == 0)
 {
 lean_object* x_1232; lean_object* x_1233; lean_object* x_1234; lean_object* x_1235; lean_object* x_1236; lean_object* x_1237; lean_object* x_1238; lean_object* x_1239; lean_object* x_1240; lean_object* x_1241; lean_object* x_1242; lean_object* x_1243; lean_object* x_1244; lean_object* x_1245; lean_object* x_1246; lean_object* x_1247; lean_object* x_1248; lean_object* x_1249; lean_object* x_1250; lean_object* x_1251; lean_object* x_1252; lean_object* x_1253; lean_object* x_1254; lean_object* x_1255; lean_object* x_1256; lean_object* x_1257; lean_object* x_1258; lean_object* x_1259; lean_object* x_1260; lean_object* x_1261; lean_object* x_1262; lean_object* x_1263; lean_object* x_1264; lean_object* x_1265; lean_object* x_1266; lean_object* x_1267; 
@@ -7141,7 +7366,7 @@ if (lean_is_scalar(x_1246)) {
 }
 lean_ctor_set(x_1247, 0, x_1243);
 lean_ctor_set(x_1247, 1, x_1245);
-x_1248 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1248 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1249 = lean_array_push(x_1248, x_1247);
 x_1250 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1251 = lean_array_push(x_1249, x_1250);
@@ -7154,11 +7379,11 @@ x_1255 = lean_array_push(x_1241, x_1254);
 x_1256 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1256, 0, x_1243);
 lean_ctor_set(x_1256, 1, x_1255);
-x_1257 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1257 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1258 = lean_array_push(x_1257, x_1244);
 x_1259 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1260 = lean_array_push(x_1258, x_1259);
-x_1261 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1261 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1262 = lean_array_push(x_1260, x_1261);
 x_1263 = lean_array_push(x_1262, x_1256);
 x_1264 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -7230,7 +7455,7 @@ lean_dec(x_1273);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1276 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_1276 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_1277 = l_Lean_Elab_Term_throwError___rarg(x_1221, x_1276, x_5, x_6);
 x_1278 = lean_ctor_get(x_1277, 0);
 lean_inc(x_1278);
@@ -7306,7 +7531,7 @@ lean_inc(x_1294);
 x_1299 = l_Lean_Elab_Term_mkExplicitBinder(x_1294, x_1298);
 x_1300 = lean_array_push(x_4, x_1299);
 lean_inc(x_5);
-x_1301 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1297, x_1300, x_5, x_1295);
+x_1301 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1297, x_1300, x_5, x_1295);
 if (lean_obj_tag(x_1301) == 0)
 {
 lean_object* x_1302; lean_object* x_1303; lean_object* x_1304; lean_object* x_1305; lean_object* x_1306; lean_object* x_1307; lean_object* x_1308; lean_object* x_1309; lean_object* x_1310; lean_object* x_1311; lean_object* x_1312; lean_object* x_1313; lean_object* x_1314; lean_object* x_1315; lean_object* x_1316; lean_object* x_1317; lean_object* x_1318; lean_object* x_1319; lean_object* x_1320; lean_object* x_1321; lean_object* x_1322; lean_object* x_1323; lean_object* x_1324; lean_object* x_1325; lean_object* x_1326; lean_object* x_1327; lean_object* x_1328; lean_object* x_1329; lean_object* x_1330; lean_object* x_1331; lean_object* x_1332; lean_object* x_1333; lean_object* x_1334; lean_object* x_1335; lean_object* x_1336; lean_object* x_1337; 
@@ -7363,7 +7588,7 @@ if (lean_is_scalar(x_1316)) {
 }
 lean_ctor_set(x_1317, 0, x_1313);
 lean_ctor_set(x_1317, 1, x_1315);
-x_1318 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1318 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1319 = lean_array_push(x_1318, x_1317);
 x_1320 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1321 = lean_array_push(x_1319, x_1320);
@@ -7376,11 +7601,11 @@ x_1325 = lean_array_push(x_1311, x_1324);
 x_1326 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1326, 0, x_1313);
 lean_ctor_set(x_1326, 1, x_1325);
-x_1327 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1327 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1328 = lean_array_push(x_1327, x_1314);
 x_1329 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1330 = lean_array_push(x_1328, x_1329);
-x_1331 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1331 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1332 = lean_array_push(x_1330, x_1331);
 x_1333 = lean_array_push(x_1332, x_1326);
 x_1334 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -7452,7 +7677,7 @@ lean_dec(x_1343);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1346 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_1346 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_1347 = l_Lean_Elab_Term_throwError___rarg(x_1291, x_1346, x_5, x_6);
 x_1348 = lean_ctor_get(x_1347, 0);
 lean_inc(x_1348);
@@ -7534,7 +7759,7 @@ lean_inc(x_1366);
 x_1371 = l_Lean_Elab_Term_mkExplicitBinder(x_1366, x_1370);
 x_1372 = lean_array_push(x_4, x_1371);
 lean_inc(x_5);
-x_1373 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1369, x_1372, x_5, x_1367);
+x_1373 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1369, x_1372, x_5, x_1367);
 if (lean_obj_tag(x_1373) == 0)
 {
 lean_object* x_1374; lean_object* x_1375; lean_object* x_1376; lean_object* x_1377; lean_object* x_1378; lean_object* x_1379; lean_object* x_1380; lean_object* x_1381; lean_object* x_1382; lean_object* x_1383; lean_object* x_1384; lean_object* x_1385; lean_object* x_1386; lean_object* x_1387; lean_object* x_1388; lean_object* x_1389; lean_object* x_1390; lean_object* x_1391; lean_object* x_1392; lean_object* x_1393; lean_object* x_1394; lean_object* x_1395; lean_object* x_1396; lean_object* x_1397; lean_object* x_1398; lean_object* x_1399; lean_object* x_1400; lean_object* x_1401; lean_object* x_1402; lean_object* x_1403; lean_object* x_1404; lean_object* x_1405; lean_object* x_1406; lean_object* x_1407; lean_object* x_1408; lean_object* x_1409; 
@@ -7591,7 +7816,7 @@ if (lean_is_scalar(x_1388)) {
 }
 lean_ctor_set(x_1389, 0, x_1385);
 lean_ctor_set(x_1389, 1, x_1387);
-x_1390 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1390 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1391 = lean_array_push(x_1390, x_1389);
 x_1392 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1393 = lean_array_push(x_1391, x_1392);
@@ -7604,11 +7829,11 @@ x_1397 = lean_array_push(x_1383, x_1396);
 x_1398 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1398, 0, x_1385);
 lean_ctor_set(x_1398, 1, x_1397);
-x_1399 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1399 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1400 = lean_array_push(x_1399, x_1386);
 x_1401 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1402 = lean_array_push(x_1400, x_1401);
-x_1403 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1403 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1404 = lean_array_push(x_1402, x_1403);
 x_1405 = lean_array_push(x_1404, x_1398);
 x_1406 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -7680,7 +7905,7 @@ lean_dec(x_1415);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1418 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_1418 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_1419 = l_Lean_Elab_Term_throwError___rarg(x_1363, x_1418, x_5, x_6);
 x_1420 = lean_ctor_get(x_1419, 0);
 lean_inc(x_1420);
@@ -7771,7 +7996,7 @@ lean_inc(x_1446);
 x_1450 = l_Lean_Elab_Term_mkExplicitBinder(x_1446, x_1449);
 x_1451 = lean_array_push(x_4, x_1450);
 lean_inc(x_5);
-x_1452 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1448, x_1451, x_5, x_1447);
+x_1452 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1448, x_1451, x_5, x_1447);
 if (lean_obj_tag(x_1452) == 0)
 {
 lean_object* x_1453; lean_object* x_1454; lean_object* x_1455; lean_object* x_1456; lean_object* x_1457; lean_object* x_1458; lean_object* x_1459; lean_object* x_1460; lean_object* x_1461; lean_object* x_1462; lean_object* x_1463; lean_object* x_1464; lean_object* x_1465; lean_object* x_1466; lean_object* x_1467; lean_object* x_1468; lean_object* x_1469; lean_object* x_1470; lean_object* x_1471; lean_object* x_1472; lean_object* x_1473; lean_object* x_1474; lean_object* x_1475; lean_object* x_1476; lean_object* x_1477; lean_object* x_1478; lean_object* x_1479; lean_object* x_1480; lean_object* x_1481; lean_object* x_1482; lean_object* x_1483; lean_object* x_1484; lean_object* x_1485; lean_object* x_1486; lean_object* x_1487; lean_object* x_1488; 
@@ -7828,7 +8053,7 @@ if (lean_is_scalar(x_1467)) {
 }
 lean_ctor_set(x_1468, 0, x_1464);
 lean_ctor_set(x_1468, 1, x_1466);
-x_1469 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1469 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1470 = lean_array_push(x_1469, x_1468);
 x_1471 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1472 = lean_array_push(x_1470, x_1471);
@@ -7841,11 +8066,11 @@ x_1476 = lean_array_push(x_1462, x_1475);
 x_1477 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1477, 0, x_1464);
 lean_ctor_set(x_1477, 1, x_1476);
-x_1478 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1478 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1479 = lean_array_push(x_1478, x_1465);
 x_1480 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1481 = lean_array_push(x_1479, x_1480);
-x_1482 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1482 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1483 = lean_array_push(x_1481, x_1482);
 x_1484 = lean_array_push(x_1483, x_1477);
 x_1485 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -7901,7 +8126,7 @@ else
 lean_object* x_1493; lean_object* x_1494; lean_object* x_1495; 
 x_1493 = l_Lean_Syntax_getArg(x_1437, x_1430);
 lean_dec(x_1437);
-x_1494 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f(x_1434, x_5, x_6);
+x_1494 = l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f(x_1434, x_5, x_6);
 x_1495 = lean_ctor_get(x_1494, 0);
 lean_inc(x_1495);
 if (lean_obj_tag(x_1495) == 0)
@@ -7924,7 +8149,7 @@ lean_inc(x_1498);
 x_1502 = l_Lean_Elab_Term_mkExplicitBinder(x_1498, x_1501);
 x_1503 = lean_array_push(x_4, x_1502);
 lean_inc(x_5);
-x_1504 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1500, x_1503, x_5, x_1499);
+x_1504 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1500, x_1503, x_5, x_1499);
 if (lean_obj_tag(x_1504) == 0)
 {
 lean_object* x_1505; lean_object* x_1506; lean_object* x_1507; lean_object* x_1508; lean_object* x_1509; lean_object* x_1510; lean_object* x_1511; lean_object* x_1512; lean_object* x_1513; lean_object* x_1514; lean_object* x_1515; lean_object* x_1516; lean_object* x_1517; lean_object* x_1518; lean_object* x_1519; lean_object* x_1520; lean_object* x_1521; lean_object* x_1522; lean_object* x_1523; lean_object* x_1524; lean_object* x_1525; lean_object* x_1526; lean_object* x_1527; lean_object* x_1528; lean_object* x_1529; lean_object* x_1530; lean_object* x_1531; lean_object* x_1532; lean_object* x_1533; lean_object* x_1534; lean_object* x_1535; lean_object* x_1536; lean_object* x_1537; lean_object* x_1538; lean_object* x_1539; lean_object* x_1540; 
@@ -7981,7 +8206,7 @@ if (lean_is_scalar(x_1519)) {
 }
 lean_ctor_set(x_1520, 0, x_1516);
 lean_ctor_set(x_1520, 1, x_1518);
-x_1521 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1521 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1522 = lean_array_push(x_1521, x_1520);
 x_1523 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1524 = lean_array_push(x_1522, x_1523);
@@ -7994,11 +8219,11 @@ x_1528 = lean_array_push(x_1514, x_1527);
 x_1529 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1529, 0, x_1516);
 lean_ctor_set(x_1529, 1, x_1528);
-x_1530 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1530 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1531 = lean_array_push(x_1530, x_1517);
 x_1532 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1533 = lean_array_push(x_1531, x_1532);
-x_1534 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1534 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1535 = lean_array_push(x_1533, x_1534);
 x_1536 = lean_array_push(x_1535, x_1529);
 x_1537 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -8061,7 +8286,7 @@ lean_inc(x_1546);
 lean_dec(x_1495);
 x_1547 = lean_nat_add(x_3, x_1430);
 lean_dec(x_3);
-x_1548 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___spec__1(x_1493, x_1433, x_1546);
+x_1548 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___spec__1(x_1493, x_1433, x_1546);
 x_1549 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_1548, x_1548, x_1433, x_4);
 lean_dec(x_1548);
 x_3 = x_1547;
@@ -8089,7 +8314,7 @@ lean_inc(x_1552);
 x_1556 = l_Lean_Elab_Term_mkExplicitBinder(x_1552, x_1555);
 x_1557 = lean_array_push(x_4, x_1556);
 lean_inc(x_5);
-x_1558 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1554, x_1557, x_5, x_1553);
+x_1558 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1554, x_1557, x_5, x_1553);
 if (lean_obj_tag(x_1558) == 0)
 {
 lean_object* x_1559; lean_object* x_1560; lean_object* x_1561; lean_object* x_1562; lean_object* x_1563; lean_object* x_1564; lean_object* x_1565; lean_object* x_1566; lean_object* x_1567; lean_object* x_1568; lean_object* x_1569; lean_object* x_1570; lean_object* x_1571; lean_object* x_1572; lean_object* x_1573; lean_object* x_1574; lean_object* x_1575; lean_object* x_1576; lean_object* x_1577; lean_object* x_1578; lean_object* x_1579; lean_object* x_1580; lean_object* x_1581; lean_object* x_1582; lean_object* x_1583; lean_object* x_1584; lean_object* x_1585; lean_object* x_1586; lean_object* x_1587; lean_object* x_1588; lean_object* x_1589; lean_object* x_1590; lean_object* x_1591; lean_object* x_1592; lean_object* x_1593; lean_object* x_1594; 
@@ -8146,7 +8371,7 @@ if (lean_is_scalar(x_1573)) {
 }
 lean_ctor_set(x_1574, 0, x_1570);
 lean_ctor_set(x_1574, 1, x_1572);
-x_1575 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1575 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1576 = lean_array_push(x_1575, x_1574);
 x_1577 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1578 = lean_array_push(x_1576, x_1577);
@@ -8159,11 +8384,11 @@ x_1582 = lean_array_push(x_1568, x_1581);
 x_1583 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1583, 0, x_1570);
 lean_ctor_set(x_1583, 1, x_1582);
-x_1584 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1584 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1585 = lean_array_push(x_1584, x_1571);
 x_1586 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1587 = lean_array_push(x_1585, x_1586);
-x_1588 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1588 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1589 = lean_array_push(x_1587, x_1588);
 x_1590 = lean_array_push(x_1589, x_1583);
 x_1591 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -8232,7 +8457,7 @@ lean_inc(x_1600);
 x_1604 = l_Lean_Elab_Term_mkExplicitBinder(x_1600, x_1603);
 x_1605 = lean_array_push(x_4, x_1604);
 lean_inc(x_5);
-x_1606 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1602, x_1605, x_5, x_1601);
+x_1606 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1602, x_1605, x_5, x_1601);
 if (lean_obj_tag(x_1606) == 0)
 {
 lean_object* x_1607; lean_object* x_1608; lean_object* x_1609; lean_object* x_1610; lean_object* x_1611; lean_object* x_1612; lean_object* x_1613; lean_object* x_1614; lean_object* x_1615; lean_object* x_1616; lean_object* x_1617; lean_object* x_1618; lean_object* x_1619; lean_object* x_1620; lean_object* x_1621; lean_object* x_1622; lean_object* x_1623; lean_object* x_1624; lean_object* x_1625; lean_object* x_1626; lean_object* x_1627; lean_object* x_1628; lean_object* x_1629; lean_object* x_1630; lean_object* x_1631; lean_object* x_1632; lean_object* x_1633; lean_object* x_1634; lean_object* x_1635; lean_object* x_1636; lean_object* x_1637; lean_object* x_1638; lean_object* x_1639; lean_object* x_1640; lean_object* x_1641; lean_object* x_1642; 
@@ -8289,7 +8514,7 @@ if (lean_is_scalar(x_1621)) {
 }
 lean_ctor_set(x_1622, 0, x_1618);
 lean_ctor_set(x_1622, 1, x_1620);
-x_1623 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1623 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1624 = lean_array_push(x_1623, x_1622);
 x_1625 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1626 = lean_array_push(x_1624, x_1625);
@@ -8302,11 +8527,11 @@ x_1630 = lean_array_push(x_1616, x_1629);
 x_1631 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1631, 0, x_1618);
 lean_ctor_set(x_1631, 1, x_1630);
-x_1632 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1632 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1633 = lean_array_push(x_1632, x_1619);
 x_1634 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1635 = lean_array_push(x_1633, x_1634);
-x_1636 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1636 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1637 = lean_array_push(x_1635, x_1636);
 x_1638 = lean_array_push(x_1637, x_1631);
 x_1639 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -8437,7 +8662,7 @@ lean_inc(x_1664);
 x_1669 = l_Lean_Elab_Term_mkExplicitBinder(x_1664, x_1668);
 x_1670 = lean_array_push(x_4, x_1669);
 lean_inc(x_5);
-x_1671 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1667, x_1670, x_5, x_1665);
+x_1671 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1667, x_1670, x_5, x_1665);
 if (lean_obj_tag(x_1671) == 0)
 {
 lean_object* x_1672; lean_object* x_1673; lean_object* x_1674; lean_object* x_1675; lean_object* x_1676; lean_object* x_1677; lean_object* x_1678; lean_object* x_1679; lean_object* x_1680; lean_object* x_1681; lean_object* x_1682; lean_object* x_1683; lean_object* x_1684; lean_object* x_1685; lean_object* x_1686; lean_object* x_1687; lean_object* x_1688; lean_object* x_1689; lean_object* x_1690; lean_object* x_1691; lean_object* x_1692; lean_object* x_1693; lean_object* x_1694; lean_object* x_1695; lean_object* x_1696; lean_object* x_1697; lean_object* x_1698; lean_object* x_1699; lean_object* x_1700; lean_object* x_1701; lean_object* x_1702; lean_object* x_1703; lean_object* x_1704; lean_object* x_1705; lean_object* x_1706; lean_object* x_1707; 
@@ -8494,7 +8719,7 @@ if (lean_is_scalar(x_1686)) {
 }
 lean_ctor_set(x_1687, 0, x_1683);
 lean_ctor_set(x_1687, 1, x_1685);
-x_1688 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1688 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1689 = lean_array_push(x_1688, x_1687);
 x_1690 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1691 = lean_array_push(x_1689, x_1690);
@@ -8507,11 +8732,11 @@ x_1695 = lean_array_push(x_1681, x_1694);
 x_1696 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1696, 0, x_1683);
 lean_ctor_set(x_1696, 1, x_1695);
-x_1697 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1697 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1698 = lean_array_push(x_1697, x_1684);
 x_1699 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1700 = lean_array_push(x_1698, x_1699);
-x_1701 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1701 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1702 = lean_array_push(x_1700, x_1701);
 x_1703 = lean_array_push(x_1702, x_1696);
 x_1704 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -8582,7 +8807,7 @@ lean_dec(x_1713);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1716 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_1716 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_1717 = l_Lean_Elab_Term_throwError___rarg(x_11, x_1716, x_5, x_6);
 x_1718 = lean_ctor_get(x_1717, 0);
 lean_inc(x_1718);
@@ -8664,7 +8889,7 @@ lean_inc(x_1735);
 x_1740 = l_Lean_Elab_Term_mkExplicitBinder(x_1735, x_1739);
 x_1741 = lean_array_push(x_4, x_1740);
 lean_inc(x_5);
-x_1742 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1738, x_1741, x_5, x_1736);
+x_1742 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1738, x_1741, x_5, x_1736);
 if (lean_obj_tag(x_1742) == 0)
 {
 lean_object* x_1743; lean_object* x_1744; lean_object* x_1745; lean_object* x_1746; lean_object* x_1747; lean_object* x_1748; lean_object* x_1749; lean_object* x_1750; lean_object* x_1751; lean_object* x_1752; lean_object* x_1753; lean_object* x_1754; lean_object* x_1755; lean_object* x_1756; lean_object* x_1757; lean_object* x_1758; lean_object* x_1759; lean_object* x_1760; lean_object* x_1761; lean_object* x_1762; lean_object* x_1763; lean_object* x_1764; lean_object* x_1765; lean_object* x_1766; lean_object* x_1767; lean_object* x_1768; lean_object* x_1769; lean_object* x_1770; lean_object* x_1771; lean_object* x_1772; lean_object* x_1773; lean_object* x_1774; lean_object* x_1775; lean_object* x_1776; lean_object* x_1777; lean_object* x_1778; 
@@ -8721,7 +8946,7 @@ if (lean_is_scalar(x_1757)) {
 }
 lean_ctor_set(x_1758, 0, x_1754);
 lean_ctor_set(x_1758, 1, x_1756);
-x_1759 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1759 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1760 = lean_array_push(x_1759, x_1758);
 x_1761 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1762 = lean_array_push(x_1760, x_1761);
@@ -8734,11 +8959,11 @@ x_1766 = lean_array_push(x_1752, x_1765);
 x_1767 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1767, 0, x_1754);
 lean_ctor_set(x_1767, 1, x_1766);
-x_1768 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1768 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1769 = lean_array_push(x_1768, x_1755);
 x_1770 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1771 = lean_array_push(x_1769, x_1770);
-x_1772 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1772 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1773 = lean_array_push(x_1771, x_1772);
 x_1774 = lean_array_push(x_1773, x_1767);
 x_1775 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -8810,7 +9035,7 @@ lean_dec(x_1784);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1787 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_1787 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_1788 = l_Lean_Elab_Term_throwError___rarg(x_1732, x_1787, x_5, x_6);
 x_1789 = lean_ctor_get(x_1788, 0);
 lean_inc(x_1789);
@@ -8893,7 +9118,7 @@ lean_inc(x_1806);
 x_1811 = l_Lean_Elab_Term_mkExplicitBinder(x_1806, x_1810);
 x_1812 = lean_array_push(x_4, x_1811);
 lean_inc(x_5);
-x_1813 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1809, x_1812, x_5, x_1807);
+x_1813 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1809, x_1812, x_5, x_1807);
 if (lean_obj_tag(x_1813) == 0)
 {
 lean_object* x_1814; lean_object* x_1815; lean_object* x_1816; lean_object* x_1817; lean_object* x_1818; lean_object* x_1819; lean_object* x_1820; lean_object* x_1821; lean_object* x_1822; lean_object* x_1823; lean_object* x_1824; lean_object* x_1825; lean_object* x_1826; lean_object* x_1827; lean_object* x_1828; lean_object* x_1829; lean_object* x_1830; lean_object* x_1831; lean_object* x_1832; lean_object* x_1833; lean_object* x_1834; lean_object* x_1835; lean_object* x_1836; lean_object* x_1837; lean_object* x_1838; lean_object* x_1839; lean_object* x_1840; lean_object* x_1841; lean_object* x_1842; lean_object* x_1843; lean_object* x_1844; lean_object* x_1845; lean_object* x_1846; lean_object* x_1847; lean_object* x_1848; lean_object* x_1849; 
@@ -8950,7 +9175,7 @@ if (lean_is_scalar(x_1828)) {
 }
 lean_ctor_set(x_1829, 0, x_1825);
 lean_ctor_set(x_1829, 1, x_1827);
-x_1830 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1830 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1831 = lean_array_push(x_1830, x_1829);
 x_1832 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1833 = lean_array_push(x_1831, x_1832);
@@ -8963,11 +9188,11 @@ x_1837 = lean_array_push(x_1823, x_1836);
 x_1838 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1838, 0, x_1825);
 lean_ctor_set(x_1838, 1, x_1837);
-x_1839 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1839 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1840 = lean_array_push(x_1839, x_1826);
 x_1841 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1842 = lean_array_push(x_1840, x_1841);
-x_1843 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1843 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1844 = lean_array_push(x_1842, x_1843);
 x_1845 = lean_array_push(x_1844, x_1838);
 x_1846 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -9039,7 +9264,7 @@ lean_dec(x_1855);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1858 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_1858 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_1859 = l_Lean_Elab_Term_throwError___rarg(x_1803, x_1858, x_5, x_6);
 x_1860 = lean_ctor_get(x_1859, 0);
 lean_inc(x_1860);
@@ -9128,7 +9353,7 @@ lean_inc(x_1879);
 x_1884 = l_Lean_Elab_Term_mkExplicitBinder(x_1879, x_1883);
 x_1885 = lean_array_push(x_4, x_1884);
 lean_inc(x_5);
-x_1886 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1882, x_1885, x_5, x_1880);
+x_1886 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1882, x_1885, x_5, x_1880);
 if (lean_obj_tag(x_1886) == 0)
 {
 lean_object* x_1887; lean_object* x_1888; lean_object* x_1889; lean_object* x_1890; lean_object* x_1891; lean_object* x_1892; lean_object* x_1893; lean_object* x_1894; lean_object* x_1895; lean_object* x_1896; lean_object* x_1897; lean_object* x_1898; lean_object* x_1899; lean_object* x_1900; lean_object* x_1901; lean_object* x_1902; lean_object* x_1903; lean_object* x_1904; lean_object* x_1905; lean_object* x_1906; lean_object* x_1907; lean_object* x_1908; lean_object* x_1909; lean_object* x_1910; lean_object* x_1911; lean_object* x_1912; lean_object* x_1913; lean_object* x_1914; lean_object* x_1915; lean_object* x_1916; lean_object* x_1917; lean_object* x_1918; lean_object* x_1919; lean_object* x_1920; lean_object* x_1921; lean_object* x_1922; 
@@ -9185,7 +9410,7 @@ if (lean_is_scalar(x_1901)) {
 }
 lean_ctor_set(x_1902, 0, x_1898);
 lean_ctor_set(x_1902, 1, x_1900);
-x_1903 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1903 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1904 = lean_array_push(x_1903, x_1902);
 x_1905 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1906 = lean_array_push(x_1904, x_1905);
@@ -9198,11 +9423,11 @@ x_1910 = lean_array_push(x_1896, x_1909);
 x_1911 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1911, 0, x_1898);
 lean_ctor_set(x_1911, 1, x_1910);
-x_1912 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1912 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1913 = lean_array_push(x_1912, x_1899);
 x_1914 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1915 = lean_array_push(x_1913, x_1914);
-x_1916 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1916 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1917 = lean_array_push(x_1915, x_1916);
 x_1918 = lean_array_push(x_1917, x_1911);
 x_1919 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -9274,7 +9499,7 @@ lean_dec(x_1928);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_1931 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_1931 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_1932 = l_Lean_Elab_Term_throwError___rarg(x_1876, x_1931, x_5, x_6);
 x_1933 = lean_ctor_get(x_1932, 0);
 lean_inc(x_1933);
@@ -9365,7 +9590,7 @@ lean_inc(x_1959);
 x_1963 = l_Lean_Elab_Term_mkExplicitBinder(x_1959, x_1962);
 x_1964 = lean_array_push(x_4, x_1963);
 lean_inc(x_5);
-x_1965 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_1961, x_1964, x_5, x_1960);
+x_1965 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_1961, x_1964, x_5, x_1960);
 if (lean_obj_tag(x_1965) == 0)
 {
 lean_object* x_1966; lean_object* x_1967; lean_object* x_1968; lean_object* x_1969; lean_object* x_1970; lean_object* x_1971; lean_object* x_1972; lean_object* x_1973; lean_object* x_1974; lean_object* x_1975; lean_object* x_1976; lean_object* x_1977; lean_object* x_1978; lean_object* x_1979; lean_object* x_1980; lean_object* x_1981; lean_object* x_1982; lean_object* x_1983; lean_object* x_1984; lean_object* x_1985; lean_object* x_1986; lean_object* x_1987; lean_object* x_1988; lean_object* x_1989; lean_object* x_1990; lean_object* x_1991; lean_object* x_1992; lean_object* x_1993; lean_object* x_1994; lean_object* x_1995; lean_object* x_1996; lean_object* x_1997; lean_object* x_1998; lean_object* x_1999; lean_object* x_2000; lean_object* x_2001; 
@@ -9422,7 +9647,7 @@ if (lean_is_scalar(x_1980)) {
 }
 lean_ctor_set(x_1981, 0, x_1977);
 lean_ctor_set(x_1981, 1, x_1979);
-x_1982 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_1982 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_1983 = lean_array_push(x_1982, x_1981);
 x_1984 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_1985 = lean_array_push(x_1983, x_1984);
@@ -9435,11 +9660,11 @@ x_1989 = lean_array_push(x_1975, x_1988);
 x_1990 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1990, 0, x_1977);
 lean_ctor_set(x_1990, 1, x_1989);
-x_1991 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_1991 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_1992 = lean_array_push(x_1991, x_1978);
 x_1993 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_1994 = lean_array_push(x_1992, x_1993);
-x_1995 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_1995 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_1996 = lean_array_push(x_1994, x_1995);
 x_1997 = lean_array_push(x_1996, x_1990);
 x_1998 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -9495,7 +9720,7 @@ else
 lean_object* x_2006; lean_object* x_2007; lean_object* x_2008; 
 x_2006 = l_Lean_Syntax_getArg(x_1950, x_1943);
 lean_dec(x_1950);
-x_2007 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f(x_1947, x_5, x_6);
+x_2007 = l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f(x_1947, x_5, x_6);
 x_2008 = lean_ctor_get(x_2007, 0);
 lean_inc(x_2008);
 if (lean_obj_tag(x_2008) == 0)
@@ -9518,7 +9743,7 @@ lean_inc(x_2011);
 x_2015 = l_Lean_Elab_Term_mkExplicitBinder(x_2011, x_2014);
 x_2016 = lean_array_push(x_4, x_2015);
 lean_inc(x_5);
-x_2017 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2013, x_2016, x_5, x_2012);
+x_2017 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2013, x_2016, x_5, x_2012);
 if (lean_obj_tag(x_2017) == 0)
 {
 lean_object* x_2018; lean_object* x_2019; lean_object* x_2020; lean_object* x_2021; lean_object* x_2022; lean_object* x_2023; lean_object* x_2024; lean_object* x_2025; lean_object* x_2026; lean_object* x_2027; lean_object* x_2028; lean_object* x_2029; lean_object* x_2030; lean_object* x_2031; lean_object* x_2032; lean_object* x_2033; lean_object* x_2034; lean_object* x_2035; lean_object* x_2036; lean_object* x_2037; lean_object* x_2038; lean_object* x_2039; lean_object* x_2040; lean_object* x_2041; lean_object* x_2042; lean_object* x_2043; lean_object* x_2044; lean_object* x_2045; lean_object* x_2046; lean_object* x_2047; lean_object* x_2048; lean_object* x_2049; lean_object* x_2050; lean_object* x_2051; lean_object* x_2052; lean_object* x_2053; 
@@ -9575,7 +9800,7 @@ if (lean_is_scalar(x_2032)) {
 }
 lean_ctor_set(x_2033, 0, x_2029);
 lean_ctor_set(x_2033, 1, x_2031);
-x_2034 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2034 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2035 = lean_array_push(x_2034, x_2033);
 x_2036 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2037 = lean_array_push(x_2035, x_2036);
@@ -9588,11 +9813,11 @@ x_2041 = lean_array_push(x_2027, x_2040);
 x_2042 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2042, 0, x_2029);
 lean_ctor_set(x_2042, 1, x_2041);
-x_2043 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2043 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2044 = lean_array_push(x_2043, x_2030);
 x_2045 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2046 = lean_array_push(x_2044, x_2045);
-x_2047 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2047 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2048 = lean_array_push(x_2046, x_2047);
 x_2049 = lean_array_push(x_2048, x_2042);
 x_2050 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -9655,7 +9880,7 @@ lean_inc(x_2059);
 lean_dec(x_2008);
 x_2060 = lean_nat_add(x_3, x_1943);
 lean_dec(x_3);
-x_2061 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___spec__1(x_2006, x_1946, x_2059);
+x_2061 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___spec__1(x_2006, x_1946, x_2059);
 x_2062 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_2061, x_2061, x_1946, x_4);
 lean_dec(x_2061);
 x_3 = x_2060;
@@ -9683,7 +9908,7 @@ lean_inc(x_2065);
 x_2069 = l_Lean_Elab_Term_mkExplicitBinder(x_2065, x_2068);
 x_2070 = lean_array_push(x_4, x_2069);
 lean_inc(x_5);
-x_2071 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2067, x_2070, x_5, x_2066);
+x_2071 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2067, x_2070, x_5, x_2066);
 if (lean_obj_tag(x_2071) == 0)
 {
 lean_object* x_2072; lean_object* x_2073; lean_object* x_2074; lean_object* x_2075; lean_object* x_2076; lean_object* x_2077; lean_object* x_2078; lean_object* x_2079; lean_object* x_2080; lean_object* x_2081; lean_object* x_2082; lean_object* x_2083; lean_object* x_2084; lean_object* x_2085; lean_object* x_2086; lean_object* x_2087; lean_object* x_2088; lean_object* x_2089; lean_object* x_2090; lean_object* x_2091; lean_object* x_2092; lean_object* x_2093; lean_object* x_2094; lean_object* x_2095; lean_object* x_2096; lean_object* x_2097; lean_object* x_2098; lean_object* x_2099; lean_object* x_2100; lean_object* x_2101; lean_object* x_2102; lean_object* x_2103; lean_object* x_2104; lean_object* x_2105; lean_object* x_2106; lean_object* x_2107; 
@@ -9740,7 +9965,7 @@ if (lean_is_scalar(x_2086)) {
 }
 lean_ctor_set(x_2087, 0, x_2083);
 lean_ctor_set(x_2087, 1, x_2085);
-x_2088 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2088 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2089 = lean_array_push(x_2088, x_2087);
 x_2090 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2091 = lean_array_push(x_2089, x_2090);
@@ -9753,11 +9978,11 @@ x_2095 = lean_array_push(x_2081, x_2094);
 x_2096 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2096, 0, x_2083);
 lean_ctor_set(x_2096, 1, x_2095);
-x_2097 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2097 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2098 = lean_array_push(x_2097, x_2084);
 x_2099 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2100 = lean_array_push(x_2098, x_2099);
-x_2101 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2101 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2102 = lean_array_push(x_2100, x_2101);
 x_2103 = lean_array_push(x_2102, x_2096);
 x_2104 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -9826,7 +10051,7 @@ lean_inc(x_2113);
 x_2117 = l_Lean_Elab_Term_mkExplicitBinder(x_2113, x_2116);
 x_2118 = lean_array_push(x_4, x_2117);
 lean_inc(x_5);
-x_2119 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2115, x_2118, x_5, x_2114);
+x_2119 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2115, x_2118, x_5, x_2114);
 if (lean_obj_tag(x_2119) == 0)
 {
 lean_object* x_2120; lean_object* x_2121; lean_object* x_2122; lean_object* x_2123; lean_object* x_2124; lean_object* x_2125; lean_object* x_2126; lean_object* x_2127; lean_object* x_2128; lean_object* x_2129; lean_object* x_2130; lean_object* x_2131; lean_object* x_2132; lean_object* x_2133; lean_object* x_2134; lean_object* x_2135; lean_object* x_2136; lean_object* x_2137; lean_object* x_2138; lean_object* x_2139; lean_object* x_2140; lean_object* x_2141; lean_object* x_2142; lean_object* x_2143; lean_object* x_2144; lean_object* x_2145; lean_object* x_2146; lean_object* x_2147; lean_object* x_2148; lean_object* x_2149; lean_object* x_2150; lean_object* x_2151; lean_object* x_2152; lean_object* x_2153; lean_object* x_2154; lean_object* x_2155; 
@@ -9883,7 +10108,7 @@ if (lean_is_scalar(x_2134)) {
 }
 lean_ctor_set(x_2135, 0, x_2131);
 lean_ctor_set(x_2135, 1, x_2133);
-x_2136 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2136 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2137 = lean_array_push(x_2136, x_2135);
 x_2138 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2139 = lean_array_push(x_2137, x_2138);
@@ -9896,11 +10121,11 @@ x_2143 = lean_array_push(x_2129, x_2142);
 x_2144 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2144, 0, x_2131);
 lean_ctor_set(x_2144, 1, x_2143);
-x_2145 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2145 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2146 = lean_array_push(x_2145, x_2132);
 x_2147 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2148 = lean_array_push(x_2146, x_2147);
-x_2149 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2149 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2150 = lean_array_push(x_2148, x_2149);
 x_2151 = lean_array_push(x_2150, x_2144);
 x_2152 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -10042,7 +10267,7 @@ lean_inc(x_2180);
 x_2185 = l_Lean_Elab_Term_mkExplicitBinder(x_2180, x_2184);
 x_2186 = lean_array_push(x_4, x_2185);
 lean_inc(x_5);
-x_2187 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2183, x_2186, x_5, x_2181);
+x_2187 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2183, x_2186, x_5, x_2181);
 if (lean_obj_tag(x_2187) == 0)
 {
 lean_object* x_2188; lean_object* x_2189; lean_object* x_2190; lean_object* x_2191; lean_object* x_2192; lean_object* x_2193; lean_object* x_2194; lean_object* x_2195; lean_object* x_2196; lean_object* x_2197; lean_object* x_2198; lean_object* x_2199; lean_object* x_2200; lean_object* x_2201; lean_object* x_2202; lean_object* x_2203; lean_object* x_2204; lean_object* x_2205; lean_object* x_2206; lean_object* x_2207; lean_object* x_2208; lean_object* x_2209; lean_object* x_2210; lean_object* x_2211; lean_object* x_2212; lean_object* x_2213; lean_object* x_2214; lean_object* x_2215; lean_object* x_2216; lean_object* x_2217; lean_object* x_2218; lean_object* x_2219; lean_object* x_2220; lean_object* x_2221; lean_object* x_2222; lean_object* x_2223; 
@@ -10099,7 +10324,7 @@ if (lean_is_scalar(x_2202)) {
 }
 lean_ctor_set(x_2203, 0, x_2199);
 lean_ctor_set(x_2203, 1, x_2201);
-x_2204 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2204 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2205 = lean_array_push(x_2204, x_2203);
 x_2206 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2207 = lean_array_push(x_2205, x_2206);
@@ -10112,11 +10337,11 @@ x_2211 = lean_array_push(x_2197, x_2210);
 x_2212 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2212, 0, x_2199);
 lean_ctor_set(x_2212, 1, x_2211);
-x_2213 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2213 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2214 = lean_array_push(x_2213, x_2200);
 x_2215 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2216 = lean_array_push(x_2214, x_2215);
-x_2217 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2217 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2218 = lean_array_push(x_2216, x_2217);
 x_2219 = lean_array_push(x_2218, x_2212);
 x_2220 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -10187,7 +10412,7 @@ lean_dec(x_2229);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_2232 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_2232 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_2233 = l_Lean_Elab_Term_throwError___rarg(x_11, x_2232, x_5, x_6);
 x_2234 = lean_ctor_get(x_2233, 0);
 lean_inc(x_2234);
@@ -10277,7 +10502,7 @@ lean_inc(x_2252);
 x_2257 = l_Lean_Elab_Term_mkExplicitBinder(x_2252, x_2256);
 x_2258 = lean_array_push(x_4, x_2257);
 lean_inc(x_5);
-x_2259 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2255, x_2258, x_5, x_2253);
+x_2259 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2255, x_2258, x_5, x_2253);
 if (lean_obj_tag(x_2259) == 0)
 {
 lean_object* x_2260; lean_object* x_2261; lean_object* x_2262; lean_object* x_2263; lean_object* x_2264; lean_object* x_2265; lean_object* x_2266; lean_object* x_2267; lean_object* x_2268; lean_object* x_2269; lean_object* x_2270; lean_object* x_2271; lean_object* x_2272; lean_object* x_2273; lean_object* x_2274; lean_object* x_2275; lean_object* x_2276; lean_object* x_2277; lean_object* x_2278; lean_object* x_2279; lean_object* x_2280; lean_object* x_2281; lean_object* x_2282; lean_object* x_2283; lean_object* x_2284; lean_object* x_2285; lean_object* x_2286; lean_object* x_2287; lean_object* x_2288; lean_object* x_2289; lean_object* x_2290; lean_object* x_2291; lean_object* x_2292; lean_object* x_2293; lean_object* x_2294; lean_object* x_2295; 
@@ -10334,7 +10559,7 @@ if (lean_is_scalar(x_2274)) {
 }
 lean_ctor_set(x_2275, 0, x_2271);
 lean_ctor_set(x_2275, 1, x_2273);
-x_2276 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2276 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2277 = lean_array_push(x_2276, x_2275);
 x_2278 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2279 = lean_array_push(x_2277, x_2278);
@@ -10347,11 +10572,11 @@ x_2283 = lean_array_push(x_2269, x_2282);
 x_2284 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2284, 0, x_2271);
 lean_ctor_set(x_2284, 1, x_2283);
-x_2285 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2285 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2286 = lean_array_push(x_2285, x_2272);
 x_2287 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2288 = lean_array_push(x_2286, x_2287);
-x_2289 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2289 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2290 = lean_array_push(x_2288, x_2289);
 x_2291 = lean_array_push(x_2290, x_2284);
 x_2292 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -10423,7 +10648,7 @@ lean_dec(x_2301);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_2304 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_2304 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_2305 = l_Lean_Elab_Term_throwError___rarg(x_2249, x_2304, x_5, x_6);
 x_2306 = lean_ctor_get(x_2305, 0);
 lean_inc(x_2306);
@@ -10514,7 +10739,7 @@ lean_inc(x_2324);
 x_2329 = l_Lean_Elab_Term_mkExplicitBinder(x_2324, x_2328);
 x_2330 = lean_array_push(x_4, x_2329);
 lean_inc(x_5);
-x_2331 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2327, x_2330, x_5, x_2325);
+x_2331 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2327, x_2330, x_5, x_2325);
 if (lean_obj_tag(x_2331) == 0)
 {
 lean_object* x_2332; lean_object* x_2333; lean_object* x_2334; lean_object* x_2335; lean_object* x_2336; lean_object* x_2337; lean_object* x_2338; lean_object* x_2339; lean_object* x_2340; lean_object* x_2341; lean_object* x_2342; lean_object* x_2343; lean_object* x_2344; lean_object* x_2345; lean_object* x_2346; lean_object* x_2347; lean_object* x_2348; lean_object* x_2349; lean_object* x_2350; lean_object* x_2351; lean_object* x_2352; lean_object* x_2353; lean_object* x_2354; lean_object* x_2355; lean_object* x_2356; lean_object* x_2357; lean_object* x_2358; lean_object* x_2359; lean_object* x_2360; lean_object* x_2361; lean_object* x_2362; lean_object* x_2363; lean_object* x_2364; lean_object* x_2365; lean_object* x_2366; lean_object* x_2367; 
@@ -10571,7 +10796,7 @@ if (lean_is_scalar(x_2346)) {
 }
 lean_ctor_set(x_2347, 0, x_2343);
 lean_ctor_set(x_2347, 1, x_2345);
-x_2348 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2348 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2349 = lean_array_push(x_2348, x_2347);
 x_2350 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2351 = lean_array_push(x_2349, x_2350);
@@ -10584,11 +10809,11 @@ x_2355 = lean_array_push(x_2341, x_2354);
 x_2356 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2356, 0, x_2343);
 lean_ctor_set(x_2356, 1, x_2355);
-x_2357 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2357 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2358 = lean_array_push(x_2357, x_2344);
 x_2359 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2360 = lean_array_push(x_2358, x_2359);
-x_2361 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2361 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2362 = lean_array_push(x_2360, x_2361);
 x_2363 = lean_array_push(x_2362, x_2356);
 x_2364 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -10660,7 +10885,7 @@ lean_dec(x_2373);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_2376 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_2376 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_2377 = l_Lean_Elab_Term_throwError___rarg(x_2321, x_2376, x_5, x_6);
 x_2378 = lean_ctor_get(x_2377, 0);
 lean_inc(x_2378);
@@ -10756,7 +10981,7 @@ lean_inc(x_2398);
 x_2403 = l_Lean_Elab_Term_mkExplicitBinder(x_2398, x_2402);
 x_2404 = lean_array_push(x_4, x_2403);
 lean_inc(x_5);
-x_2405 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2401, x_2404, x_5, x_2399);
+x_2405 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2401, x_2404, x_5, x_2399);
 if (lean_obj_tag(x_2405) == 0)
 {
 lean_object* x_2406; lean_object* x_2407; lean_object* x_2408; lean_object* x_2409; lean_object* x_2410; lean_object* x_2411; lean_object* x_2412; lean_object* x_2413; lean_object* x_2414; lean_object* x_2415; lean_object* x_2416; lean_object* x_2417; lean_object* x_2418; lean_object* x_2419; lean_object* x_2420; lean_object* x_2421; lean_object* x_2422; lean_object* x_2423; lean_object* x_2424; lean_object* x_2425; lean_object* x_2426; lean_object* x_2427; lean_object* x_2428; lean_object* x_2429; lean_object* x_2430; lean_object* x_2431; lean_object* x_2432; lean_object* x_2433; lean_object* x_2434; lean_object* x_2435; lean_object* x_2436; lean_object* x_2437; lean_object* x_2438; lean_object* x_2439; lean_object* x_2440; lean_object* x_2441; 
@@ -10813,7 +11038,7 @@ if (lean_is_scalar(x_2420)) {
 }
 lean_ctor_set(x_2421, 0, x_2417);
 lean_ctor_set(x_2421, 1, x_2419);
-x_2422 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2422 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2423 = lean_array_push(x_2422, x_2421);
 x_2424 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2425 = lean_array_push(x_2423, x_2424);
@@ -10826,11 +11051,11 @@ x_2429 = lean_array_push(x_2415, x_2428);
 x_2430 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2430, 0, x_2417);
 lean_ctor_set(x_2430, 1, x_2429);
-x_2431 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2431 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2432 = lean_array_push(x_2431, x_2418);
 x_2433 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2434 = lean_array_push(x_2432, x_2433);
-x_2435 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2435 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2436 = lean_array_push(x_2434, x_2435);
 x_2437 = lean_array_push(x_2436, x_2430);
 x_2438 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -10902,7 +11127,7 @@ lean_dec(x_2447);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_2450 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_2450 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_2451 = l_Lean_Elab_Term_throwError___rarg(x_2395, x_2450, x_5, x_6);
 x_2452 = lean_ctor_get(x_2451, 0);
 lean_inc(x_2452);
@@ -10993,7 +11218,7 @@ lean_inc(x_2478);
 x_2482 = l_Lean_Elab_Term_mkExplicitBinder(x_2478, x_2481);
 x_2483 = lean_array_push(x_4, x_2482);
 lean_inc(x_5);
-x_2484 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2480, x_2483, x_5, x_2479);
+x_2484 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2480, x_2483, x_5, x_2479);
 if (lean_obj_tag(x_2484) == 0)
 {
 lean_object* x_2485; lean_object* x_2486; lean_object* x_2487; lean_object* x_2488; lean_object* x_2489; lean_object* x_2490; lean_object* x_2491; lean_object* x_2492; lean_object* x_2493; lean_object* x_2494; lean_object* x_2495; lean_object* x_2496; lean_object* x_2497; lean_object* x_2498; lean_object* x_2499; lean_object* x_2500; lean_object* x_2501; lean_object* x_2502; lean_object* x_2503; lean_object* x_2504; lean_object* x_2505; lean_object* x_2506; lean_object* x_2507; lean_object* x_2508; lean_object* x_2509; lean_object* x_2510; lean_object* x_2511; lean_object* x_2512; lean_object* x_2513; lean_object* x_2514; lean_object* x_2515; lean_object* x_2516; lean_object* x_2517; lean_object* x_2518; lean_object* x_2519; lean_object* x_2520; 
@@ -11050,7 +11275,7 @@ if (lean_is_scalar(x_2499)) {
 }
 lean_ctor_set(x_2500, 0, x_2496);
 lean_ctor_set(x_2500, 1, x_2498);
-x_2501 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2501 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2502 = lean_array_push(x_2501, x_2500);
 x_2503 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2504 = lean_array_push(x_2502, x_2503);
@@ -11063,11 +11288,11 @@ x_2508 = lean_array_push(x_2494, x_2507);
 x_2509 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2509, 0, x_2496);
 lean_ctor_set(x_2509, 1, x_2508);
-x_2510 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2510 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2511 = lean_array_push(x_2510, x_2497);
 x_2512 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2513 = lean_array_push(x_2511, x_2512);
-x_2514 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2514 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2515 = lean_array_push(x_2513, x_2514);
 x_2516 = lean_array_push(x_2515, x_2509);
 x_2517 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -11123,7 +11348,7 @@ else
 lean_object* x_2525; lean_object* x_2526; lean_object* x_2527; 
 x_2525 = l_Lean_Syntax_getArg(x_2469, x_2462);
 lean_dec(x_2469);
-x_2526 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f(x_2466, x_5, x_6);
+x_2526 = l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f(x_2466, x_5, x_6);
 x_2527 = lean_ctor_get(x_2526, 0);
 lean_inc(x_2527);
 if (lean_obj_tag(x_2527) == 0)
@@ -11146,7 +11371,7 @@ lean_inc(x_2530);
 x_2534 = l_Lean_Elab_Term_mkExplicitBinder(x_2530, x_2533);
 x_2535 = lean_array_push(x_4, x_2534);
 lean_inc(x_5);
-x_2536 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2532, x_2535, x_5, x_2531);
+x_2536 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2532, x_2535, x_5, x_2531);
 if (lean_obj_tag(x_2536) == 0)
 {
 lean_object* x_2537; lean_object* x_2538; lean_object* x_2539; lean_object* x_2540; lean_object* x_2541; lean_object* x_2542; lean_object* x_2543; lean_object* x_2544; lean_object* x_2545; lean_object* x_2546; lean_object* x_2547; lean_object* x_2548; lean_object* x_2549; lean_object* x_2550; lean_object* x_2551; lean_object* x_2552; lean_object* x_2553; lean_object* x_2554; lean_object* x_2555; lean_object* x_2556; lean_object* x_2557; lean_object* x_2558; lean_object* x_2559; lean_object* x_2560; lean_object* x_2561; lean_object* x_2562; lean_object* x_2563; lean_object* x_2564; lean_object* x_2565; lean_object* x_2566; lean_object* x_2567; lean_object* x_2568; lean_object* x_2569; lean_object* x_2570; lean_object* x_2571; lean_object* x_2572; 
@@ -11203,7 +11428,7 @@ if (lean_is_scalar(x_2551)) {
 }
 lean_ctor_set(x_2552, 0, x_2548);
 lean_ctor_set(x_2552, 1, x_2550);
-x_2553 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2553 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2554 = lean_array_push(x_2553, x_2552);
 x_2555 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2556 = lean_array_push(x_2554, x_2555);
@@ -11216,11 +11441,11 @@ x_2560 = lean_array_push(x_2546, x_2559);
 x_2561 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2561, 0, x_2548);
 lean_ctor_set(x_2561, 1, x_2560);
-x_2562 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2562 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2563 = lean_array_push(x_2562, x_2549);
 x_2564 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2565 = lean_array_push(x_2563, x_2564);
-x_2566 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2566 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2567 = lean_array_push(x_2565, x_2566);
 x_2568 = lean_array_push(x_2567, x_2561);
 x_2569 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -11283,7 +11508,7 @@ lean_inc(x_2578);
 lean_dec(x_2527);
 x_2579 = lean_nat_add(x_3, x_2462);
 lean_dec(x_3);
-x_2580 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___spec__1(x_2525, x_2465, x_2578);
+x_2580 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___spec__1(x_2525, x_2465, x_2578);
 x_2581 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_2580, x_2580, x_2465, x_4);
 lean_dec(x_2580);
 x_3 = x_2579;
@@ -11311,7 +11536,7 @@ lean_inc(x_2584);
 x_2588 = l_Lean_Elab_Term_mkExplicitBinder(x_2584, x_2587);
 x_2589 = lean_array_push(x_4, x_2588);
 lean_inc(x_5);
-x_2590 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2586, x_2589, x_5, x_2585);
+x_2590 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2586, x_2589, x_5, x_2585);
 if (lean_obj_tag(x_2590) == 0)
 {
 lean_object* x_2591; lean_object* x_2592; lean_object* x_2593; lean_object* x_2594; lean_object* x_2595; lean_object* x_2596; lean_object* x_2597; lean_object* x_2598; lean_object* x_2599; lean_object* x_2600; lean_object* x_2601; lean_object* x_2602; lean_object* x_2603; lean_object* x_2604; lean_object* x_2605; lean_object* x_2606; lean_object* x_2607; lean_object* x_2608; lean_object* x_2609; lean_object* x_2610; lean_object* x_2611; lean_object* x_2612; lean_object* x_2613; lean_object* x_2614; lean_object* x_2615; lean_object* x_2616; lean_object* x_2617; lean_object* x_2618; lean_object* x_2619; lean_object* x_2620; lean_object* x_2621; lean_object* x_2622; lean_object* x_2623; lean_object* x_2624; lean_object* x_2625; lean_object* x_2626; 
@@ -11368,7 +11593,7 @@ if (lean_is_scalar(x_2605)) {
 }
 lean_ctor_set(x_2606, 0, x_2602);
 lean_ctor_set(x_2606, 1, x_2604);
-x_2607 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2607 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2608 = lean_array_push(x_2607, x_2606);
 x_2609 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2610 = lean_array_push(x_2608, x_2609);
@@ -11381,11 +11606,11 @@ x_2614 = lean_array_push(x_2600, x_2613);
 x_2615 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2615, 0, x_2602);
 lean_ctor_set(x_2615, 1, x_2614);
-x_2616 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2616 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2617 = lean_array_push(x_2616, x_2603);
 x_2618 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2619 = lean_array_push(x_2617, x_2618);
-x_2620 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2620 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2621 = lean_array_push(x_2619, x_2620);
 x_2622 = lean_array_push(x_2621, x_2615);
 x_2623 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -11454,7 +11679,7 @@ lean_inc(x_2632);
 x_2636 = l_Lean_Elab_Term_mkExplicitBinder(x_2632, x_2635);
 x_2637 = lean_array_push(x_4, x_2636);
 lean_inc(x_5);
-x_2638 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2634, x_2637, x_5, x_2633);
+x_2638 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2634, x_2637, x_5, x_2633);
 if (lean_obj_tag(x_2638) == 0)
 {
 lean_object* x_2639; lean_object* x_2640; lean_object* x_2641; lean_object* x_2642; lean_object* x_2643; lean_object* x_2644; lean_object* x_2645; lean_object* x_2646; lean_object* x_2647; lean_object* x_2648; lean_object* x_2649; lean_object* x_2650; lean_object* x_2651; lean_object* x_2652; lean_object* x_2653; lean_object* x_2654; lean_object* x_2655; lean_object* x_2656; lean_object* x_2657; lean_object* x_2658; lean_object* x_2659; lean_object* x_2660; lean_object* x_2661; lean_object* x_2662; lean_object* x_2663; lean_object* x_2664; lean_object* x_2665; lean_object* x_2666; lean_object* x_2667; lean_object* x_2668; lean_object* x_2669; lean_object* x_2670; lean_object* x_2671; lean_object* x_2672; lean_object* x_2673; lean_object* x_2674; 
@@ -11511,7 +11736,7 @@ if (lean_is_scalar(x_2653)) {
 }
 lean_ctor_set(x_2654, 0, x_2650);
 lean_ctor_set(x_2654, 1, x_2652);
-x_2655 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2655 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2656 = lean_array_push(x_2655, x_2654);
 x_2657 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2658 = lean_array_push(x_2656, x_2657);
@@ -11524,11 +11749,11 @@ x_2662 = lean_array_push(x_2648, x_2661);
 x_2663 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2663, 0, x_2650);
 lean_ctor_set(x_2663, 1, x_2662);
-x_2664 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2664 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2665 = lean_array_push(x_2664, x_2651);
 x_2666 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2667 = lean_array_push(x_2665, x_2666);
-x_2668 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2668 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2669 = lean_array_push(x_2667, x_2668);
 x_2670 = lean_array_push(x_2669, x_2663);
 x_2671 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -11681,7 +11906,7 @@ lean_inc(x_2702);
 x_2707 = l_Lean_Elab_Term_mkExplicitBinder(x_2702, x_2706);
 x_2708 = lean_array_push(x_4, x_2707);
 lean_inc(x_5);
-x_2709 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2705, x_2708, x_5, x_2703);
+x_2709 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2705, x_2708, x_5, x_2703);
 if (lean_obj_tag(x_2709) == 0)
 {
 lean_object* x_2710; lean_object* x_2711; lean_object* x_2712; lean_object* x_2713; lean_object* x_2714; lean_object* x_2715; lean_object* x_2716; lean_object* x_2717; lean_object* x_2718; lean_object* x_2719; lean_object* x_2720; lean_object* x_2721; lean_object* x_2722; lean_object* x_2723; lean_object* x_2724; lean_object* x_2725; lean_object* x_2726; lean_object* x_2727; lean_object* x_2728; lean_object* x_2729; lean_object* x_2730; lean_object* x_2731; lean_object* x_2732; lean_object* x_2733; lean_object* x_2734; lean_object* x_2735; lean_object* x_2736; lean_object* x_2737; lean_object* x_2738; lean_object* x_2739; lean_object* x_2740; lean_object* x_2741; lean_object* x_2742; lean_object* x_2743; lean_object* x_2744; lean_object* x_2745; 
@@ -11738,7 +11963,7 @@ if (lean_is_scalar(x_2724)) {
 }
 lean_ctor_set(x_2725, 0, x_2721);
 lean_ctor_set(x_2725, 1, x_2723);
-x_2726 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2726 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2727 = lean_array_push(x_2726, x_2725);
 x_2728 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2729 = lean_array_push(x_2727, x_2728);
@@ -11751,11 +11976,11 @@ x_2733 = lean_array_push(x_2719, x_2732);
 x_2734 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2734, 0, x_2721);
 lean_ctor_set(x_2734, 1, x_2733);
-x_2735 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2735 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2736 = lean_array_push(x_2735, x_2722);
 x_2737 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2738 = lean_array_push(x_2736, x_2737);
-x_2739 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2739 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2740 = lean_array_push(x_2738, x_2739);
 x_2741 = lean_array_push(x_2740, x_2734);
 x_2742 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -11826,7 +12051,7 @@ lean_dec(x_2751);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_2754 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_2754 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_2755 = l_Lean_Elab_Term_throwError___rarg(x_11, x_2754, x_5, x_6);
 x_2756 = lean_ctor_get(x_2755, 0);
 lean_inc(x_2756);
@@ -11923,7 +12148,7 @@ lean_inc(x_2775);
 x_2780 = l_Lean_Elab_Term_mkExplicitBinder(x_2775, x_2779);
 x_2781 = lean_array_push(x_4, x_2780);
 lean_inc(x_5);
-x_2782 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2778, x_2781, x_5, x_2776);
+x_2782 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2778, x_2781, x_5, x_2776);
 if (lean_obj_tag(x_2782) == 0)
 {
 lean_object* x_2783; lean_object* x_2784; lean_object* x_2785; lean_object* x_2786; lean_object* x_2787; lean_object* x_2788; lean_object* x_2789; lean_object* x_2790; lean_object* x_2791; lean_object* x_2792; lean_object* x_2793; lean_object* x_2794; lean_object* x_2795; lean_object* x_2796; lean_object* x_2797; lean_object* x_2798; lean_object* x_2799; lean_object* x_2800; lean_object* x_2801; lean_object* x_2802; lean_object* x_2803; lean_object* x_2804; lean_object* x_2805; lean_object* x_2806; lean_object* x_2807; lean_object* x_2808; lean_object* x_2809; lean_object* x_2810; lean_object* x_2811; lean_object* x_2812; lean_object* x_2813; lean_object* x_2814; lean_object* x_2815; lean_object* x_2816; lean_object* x_2817; lean_object* x_2818; 
@@ -11980,7 +12205,7 @@ if (lean_is_scalar(x_2797)) {
 }
 lean_ctor_set(x_2798, 0, x_2794);
 lean_ctor_set(x_2798, 1, x_2796);
-x_2799 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2799 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2800 = lean_array_push(x_2799, x_2798);
 x_2801 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2802 = lean_array_push(x_2800, x_2801);
@@ -11993,11 +12218,11 @@ x_2806 = lean_array_push(x_2792, x_2805);
 x_2807 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2807, 0, x_2794);
 lean_ctor_set(x_2807, 1, x_2806);
-x_2808 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2808 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2809 = lean_array_push(x_2808, x_2795);
 x_2810 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2811 = lean_array_push(x_2809, x_2810);
-x_2812 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2812 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2813 = lean_array_push(x_2811, x_2812);
 x_2814 = lean_array_push(x_2813, x_2807);
 x_2815 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -12069,7 +12294,7 @@ lean_dec(x_2824);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_2827 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_2827 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_2828 = l_Lean_Elab_Term_throwError___rarg(x_2772, x_2827, x_5, x_6);
 x_2829 = lean_ctor_get(x_2828, 0);
 lean_inc(x_2829);
@@ -12167,7 +12392,7 @@ lean_inc(x_2848);
 x_2853 = l_Lean_Elab_Term_mkExplicitBinder(x_2848, x_2852);
 x_2854 = lean_array_push(x_4, x_2853);
 lean_inc(x_5);
-x_2855 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2851, x_2854, x_5, x_2849);
+x_2855 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2851, x_2854, x_5, x_2849);
 if (lean_obj_tag(x_2855) == 0)
 {
 lean_object* x_2856; lean_object* x_2857; lean_object* x_2858; lean_object* x_2859; lean_object* x_2860; lean_object* x_2861; lean_object* x_2862; lean_object* x_2863; lean_object* x_2864; lean_object* x_2865; lean_object* x_2866; lean_object* x_2867; lean_object* x_2868; lean_object* x_2869; lean_object* x_2870; lean_object* x_2871; lean_object* x_2872; lean_object* x_2873; lean_object* x_2874; lean_object* x_2875; lean_object* x_2876; lean_object* x_2877; lean_object* x_2878; lean_object* x_2879; lean_object* x_2880; lean_object* x_2881; lean_object* x_2882; lean_object* x_2883; lean_object* x_2884; lean_object* x_2885; lean_object* x_2886; lean_object* x_2887; lean_object* x_2888; lean_object* x_2889; lean_object* x_2890; lean_object* x_2891; 
@@ -12224,7 +12449,7 @@ if (lean_is_scalar(x_2870)) {
 }
 lean_ctor_set(x_2871, 0, x_2867);
 lean_ctor_set(x_2871, 1, x_2869);
-x_2872 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2872 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2873 = lean_array_push(x_2872, x_2871);
 x_2874 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2875 = lean_array_push(x_2873, x_2874);
@@ -12237,11 +12462,11 @@ x_2879 = lean_array_push(x_2865, x_2878);
 x_2880 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2880, 0, x_2867);
 lean_ctor_set(x_2880, 1, x_2879);
-x_2881 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2881 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2882 = lean_array_push(x_2881, x_2868);
 x_2883 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2884 = lean_array_push(x_2882, x_2883);
-x_2885 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2885 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2886 = lean_array_push(x_2884, x_2885);
 x_2887 = lean_array_push(x_2886, x_2880);
 x_2888 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -12313,7 +12538,7 @@ lean_dec(x_2897);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_2900 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_2900 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_2901 = l_Lean_Elab_Term_throwError___rarg(x_2845, x_2900, x_5, x_6);
 x_2902 = lean_ctor_get(x_2901, 0);
 lean_inc(x_2902);
@@ -12416,7 +12641,7 @@ lean_inc(x_2923);
 x_2928 = l_Lean_Elab_Term_mkExplicitBinder(x_2923, x_2927);
 x_2929 = lean_array_push(x_4, x_2928);
 lean_inc(x_5);
-x_2930 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_2926, x_2929, x_5, x_2924);
+x_2930 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_2926, x_2929, x_5, x_2924);
 if (lean_obj_tag(x_2930) == 0)
 {
 lean_object* x_2931; lean_object* x_2932; lean_object* x_2933; lean_object* x_2934; lean_object* x_2935; lean_object* x_2936; lean_object* x_2937; lean_object* x_2938; lean_object* x_2939; lean_object* x_2940; lean_object* x_2941; lean_object* x_2942; lean_object* x_2943; lean_object* x_2944; lean_object* x_2945; lean_object* x_2946; lean_object* x_2947; lean_object* x_2948; lean_object* x_2949; lean_object* x_2950; lean_object* x_2951; lean_object* x_2952; lean_object* x_2953; lean_object* x_2954; lean_object* x_2955; lean_object* x_2956; lean_object* x_2957; lean_object* x_2958; lean_object* x_2959; lean_object* x_2960; lean_object* x_2961; lean_object* x_2962; lean_object* x_2963; lean_object* x_2964; lean_object* x_2965; lean_object* x_2966; 
@@ -12473,7 +12698,7 @@ if (lean_is_scalar(x_2945)) {
 }
 lean_ctor_set(x_2946, 0, x_2942);
 lean_ctor_set(x_2946, 1, x_2944);
-x_2947 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_2947 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_2948 = lean_array_push(x_2947, x_2946);
 x_2949 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_2950 = lean_array_push(x_2948, x_2949);
@@ -12486,11 +12711,11 @@ x_2954 = lean_array_push(x_2940, x_2953);
 x_2955 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_2955, 0, x_2942);
 lean_ctor_set(x_2955, 1, x_2954);
-x_2956 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_2956 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_2957 = lean_array_push(x_2956, x_2943);
 x_2958 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_2959 = lean_array_push(x_2957, x_2958);
-x_2960 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_2960 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_2961 = lean_array_push(x_2959, x_2960);
 x_2962 = lean_array_push(x_2961, x_2955);
 x_2963 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -12562,7 +12787,7 @@ lean_dec(x_2972);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_2975 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_2975 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_2976 = l_Lean_Elab_Term_throwError___rarg(x_2920, x_2975, x_5, x_6);
 x_2977 = lean_ctor_get(x_2976, 0);
 lean_inc(x_2977);
@@ -12653,7 +12878,7 @@ lean_inc(x_3003);
 x_3007 = l_Lean_Elab_Term_mkExplicitBinder(x_3003, x_3006);
 x_3008 = lean_array_push(x_4, x_3007);
 lean_inc(x_5);
-x_3009 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3005, x_3008, x_5, x_3004);
+x_3009 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3005, x_3008, x_5, x_3004);
 if (lean_obj_tag(x_3009) == 0)
 {
 lean_object* x_3010; lean_object* x_3011; lean_object* x_3012; lean_object* x_3013; lean_object* x_3014; lean_object* x_3015; lean_object* x_3016; lean_object* x_3017; lean_object* x_3018; lean_object* x_3019; lean_object* x_3020; lean_object* x_3021; lean_object* x_3022; lean_object* x_3023; lean_object* x_3024; lean_object* x_3025; lean_object* x_3026; lean_object* x_3027; lean_object* x_3028; lean_object* x_3029; lean_object* x_3030; lean_object* x_3031; lean_object* x_3032; lean_object* x_3033; lean_object* x_3034; lean_object* x_3035; lean_object* x_3036; lean_object* x_3037; lean_object* x_3038; lean_object* x_3039; lean_object* x_3040; lean_object* x_3041; lean_object* x_3042; lean_object* x_3043; lean_object* x_3044; lean_object* x_3045; 
@@ -12710,7 +12935,7 @@ if (lean_is_scalar(x_3024)) {
 }
 lean_ctor_set(x_3025, 0, x_3021);
 lean_ctor_set(x_3025, 1, x_3023);
-x_3026 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3026 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3027 = lean_array_push(x_3026, x_3025);
 x_3028 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3029 = lean_array_push(x_3027, x_3028);
@@ -12723,11 +12948,11 @@ x_3033 = lean_array_push(x_3019, x_3032);
 x_3034 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3034, 0, x_3021);
 lean_ctor_set(x_3034, 1, x_3033);
-x_3035 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3035 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3036 = lean_array_push(x_3035, x_3022);
 x_3037 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3038 = lean_array_push(x_3036, x_3037);
-x_3039 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3039 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3040 = lean_array_push(x_3038, x_3039);
 x_3041 = lean_array_push(x_3040, x_3034);
 x_3042 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -12783,7 +13008,7 @@ else
 lean_object* x_3050; lean_object* x_3051; lean_object* x_3052; 
 x_3050 = l_Lean_Syntax_getArg(x_2994, x_2987);
 lean_dec(x_2994);
-x_3051 = l___private_Init_Lean_Elab_TermBinders_8__getFunBinderIds_x3f(x_2991, x_5, x_6);
+x_3051 = l___private_Init_Lean_Elab_TermBinders_9__getFunBinderIds_x3f(x_2991, x_5, x_6);
 x_3052 = lean_ctor_get(x_3051, 0);
 lean_inc(x_3052);
 if (lean_obj_tag(x_3052) == 0)
@@ -12806,7 +13031,7 @@ lean_inc(x_3055);
 x_3059 = l_Lean_Elab_Term_mkExplicitBinder(x_3055, x_3058);
 x_3060 = lean_array_push(x_4, x_3059);
 lean_inc(x_5);
-x_3061 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3057, x_3060, x_5, x_3056);
+x_3061 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3057, x_3060, x_5, x_3056);
 if (lean_obj_tag(x_3061) == 0)
 {
 lean_object* x_3062; lean_object* x_3063; lean_object* x_3064; lean_object* x_3065; lean_object* x_3066; lean_object* x_3067; lean_object* x_3068; lean_object* x_3069; lean_object* x_3070; lean_object* x_3071; lean_object* x_3072; lean_object* x_3073; lean_object* x_3074; lean_object* x_3075; lean_object* x_3076; lean_object* x_3077; lean_object* x_3078; lean_object* x_3079; lean_object* x_3080; lean_object* x_3081; lean_object* x_3082; lean_object* x_3083; lean_object* x_3084; lean_object* x_3085; lean_object* x_3086; lean_object* x_3087; lean_object* x_3088; lean_object* x_3089; lean_object* x_3090; lean_object* x_3091; lean_object* x_3092; lean_object* x_3093; lean_object* x_3094; lean_object* x_3095; lean_object* x_3096; lean_object* x_3097; 
@@ -12863,7 +13088,7 @@ if (lean_is_scalar(x_3076)) {
 }
 lean_ctor_set(x_3077, 0, x_3073);
 lean_ctor_set(x_3077, 1, x_3075);
-x_3078 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3078 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3079 = lean_array_push(x_3078, x_3077);
 x_3080 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3081 = lean_array_push(x_3079, x_3080);
@@ -12876,11 +13101,11 @@ x_3085 = lean_array_push(x_3071, x_3084);
 x_3086 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3086, 0, x_3073);
 lean_ctor_set(x_3086, 1, x_3085);
-x_3087 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3087 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3088 = lean_array_push(x_3087, x_3074);
 x_3089 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3090 = lean_array_push(x_3088, x_3089);
-x_3091 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3091 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3092 = lean_array_push(x_3090, x_3091);
 x_3093 = lean_array_push(x_3092, x_3086);
 x_3094 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -12943,7 +13168,7 @@ lean_inc(x_3103);
 lean_dec(x_3052);
 x_3104 = lean_nat_add(x_3, x_2987);
 lean_dec(x_3);
-x_3105 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___spec__1(x_3050, x_2990, x_3103);
+x_3105 = l_Array_umapMAux___main___at___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___spec__1(x_3050, x_2990, x_3103);
 x_3106 = l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(x_3105, x_3105, x_2990, x_4);
 lean_dec(x_3105);
 x_3 = x_3104;
@@ -12971,7 +13196,7 @@ lean_inc(x_3109);
 x_3113 = l_Lean_Elab_Term_mkExplicitBinder(x_3109, x_3112);
 x_3114 = lean_array_push(x_4, x_3113);
 lean_inc(x_5);
-x_3115 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3111, x_3114, x_5, x_3110);
+x_3115 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3111, x_3114, x_5, x_3110);
 if (lean_obj_tag(x_3115) == 0)
 {
 lean_object* x_3116; lean_object* x_3117; lean_object* x_3118; lean_object* x_3119; lean_object* x_3120; lean_object* x_3121; lean_object* x_3122; lean_object* x_3123; lean_object* x_3124; lean_object* x_3125; lean_object* x_3126; lean_object* x_3127; lean_object* x_3128; lean_object* x_3129; lean_object* x_3130; lean_object* x_3131; lean_object* x_3132; lean_object* x_3133; lean_object* x_3134; lean_object* x_3135; lean_object* x_3136; lean_object* x_3137; lean_object* x_3138; lean_object* x_3139; lean_object* x_3140; lean_object* x_3141; lean_object* x_3142; lean_object* x_3143; lean_object* x_3144; lean_object* x_3145; lean_object* x_3146; lean_object* x_3147; lean_object* x_3148; lean_object* x_3149; lean_object* x_3150; lean_object* x_3151; 
@@ -13028,7 +13253,7 @@ if (lean_is_scalar(x_3130)) {
 }
 lean_ctor_set(x_3131, 0, x_3127);
 lean_ctor_set(x_3131, 1, x_3129);
-x_3132 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3132 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3133 = lean_array_push(x_3132, x_3131);
 x_3134 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3135 = lean_array_push(x_3133, x_3134);
@@ -13041,11 +13266,11 @@ x_3139 = lean_array_push(x_3125, x_3138);
 x_3140 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3140, 0, x_3127);
 lean_ctor_set(x_3140, 1, x_3139);
-x_3141 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3141 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3142 = lean_array_push(x_3141, x_3128);
 x_3143 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3144 = lean_array_push(x_3142, x_3143);
-x_3145 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3145 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3146 = lean_array_push(x_3144, x_3145);
 x_3147 = lean_array_push(x_3146, x_3140);
 x_3148 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13114,7 +13339,7 @@ lean_inc(x_3157);
 x_3161 = l_Lean_Elab_Term_mkExplicitBinder(x_3157, x_3160);
 x_3162 = lean_array_push(x_4, x_3161);
 lean_inc(x_5);
-x_3163 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3159, x_3162, x_5, x_3158);
+x_3163 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3159, x_3162, x_5, x_3158);
 if (lean_obj_tag(x_3163) == 0)
 {
 lean_object* x_3164; lean_object* x_3165; lean_object* x_3166; lean_object* x_3167; lean_object* x_3168; lean_object* x_3169; lean_object* x_3170; lean_object* x_3171; lean_object* x_3172; lean_object* x_3173; lean_object* x_3174; lean_object* x_3175; lean_object* x_3176; lean_object* x_3177; lean_object* x_3178; lean_object* x_3179; lean_object* x_3180; lean_object* x_3181; lean_object* x_3182; lean_object* x_3183; lean_object* x_3184; lean_object* x_3185; lean_object* x_3186; lean_object* x_3187; lean_object* x_3188; lean_object* x_3189; lean_object* x_3190; lean_object* x_3191; lean_object* x_3192; lean_object* x_3193; lean_object* x_3194; lean_object* x_3195; lean_object* x_3196; lean_object* x_3197; lean_object* x_3198; lean_object* x_3199; 
@@ -13171,7 +13396,7 @@ if (lean_is_scalar(x_3178)) {
 }
 lean_ctor_set(x_3179, 0, x_3175);
 lean_ctor_set(x_3179, 1, x_3177);
-x_3180 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3180 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3181 = lean_array_push(x_3180, x_3179);
 x_3182 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3183 = lean_array_push(x_3181, x_3182);
@@ -13184,11 +13409,11 @@ x_3187 = lean_array_push(x_3173, x_3186);
 x_3188 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3188, 0, x_3175);
 lean_ctor_set(x_3188, 1, x_3187);
-x_3189 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3189 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3190 = lean_array_push(x_3189, x_3176);
 x_3191 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3192 = lean_array_push(x_3190, x_3191);
-x_3193 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3193 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3194 = lean_array_push(x_3192, x_3193);
 x_3195 = lean_array_push(x_3194, x_3188);
 x_3196 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13296,7 +13521,7 @@ lean_inc(x_3214);
 x_3219 = l_Lean_Elab_Term_mkExplicitBinder(x_3214, x_3218);
 x_3220 = lean_array_push(x_4, x_3219);
 lean_inc(x_5);
-x_3221 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3217, x_3220, x_5, x_3215);
+x_3221 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3217, x_3220, x_5, x_3215);
 if (lean_obj_tag(x_3221) == 0)
 {
 lean_object* x_3222; lean_object* x_3223; uint8_t x_3224; 
@@ -13337,7 +13562,7 @@ x_3237 = lean_ctor_get(x_11, 0);
 lean_dec(x_3237);
 lean_ctor_set(x_11, 1, x_3234);
 lean_ctor_set(x_11, 0, x_3232);
-x_3238 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3238 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3239 = lean_array_push(x_3238, x_11);
 x_3240 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3241 = lean_array_push(x_3239, x_3240);
@@ -13350,11 +13575,11 @@ x_3245 = lean_array_push(x_3230, x_3244);
 x_3246 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3246, 0, x_3232);
 lean_ctor_set(x_3246, 1, x_3245);
-x_3247 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3247 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3248 = lean_array_push(x_3247, x_3233);
 x_3249 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3250 = lean_array_push(x_3248, x_3249);
-x_3251 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3251 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3252 = lean_array_push(x_3250, x_3251);
 x_3253 = lean_array_push(x_3252, x_3246);
 x_3254 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13372,7 +13597,7 @@ lean_dec(x_11);
 x_3256 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3256, 0, x_3232);
 lean_ctor_set(x_3256, 1, x_3234);
-x_3257 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3257 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3258 = lean_array_push(x_3257, x_3256);
 x_3259 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3260 = lean_array_push(x_3258, x_3259);
@@ -13385,11 +13610,11 @@ x_3264 = lean_array_push(x_3230, x_3263);
 x_3265 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3265, 0, x_3232);
 lean_ctor_set(x_3265, 1, x_3264);
-x_3266 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3266 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3267 = lean_array_push(x_3266, x_3233);
 x_3268 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3269 = lean_array_push(x_3267, x_3268);
-x_3270 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3270 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3271 = lean_array_push(x_3269, x_3270);
 x_3272 = lean_array_push(x_3271, x_3265);
 x_3273 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13430,7 +13655,7 @@ if (lean_is_scalar(x_3281)) {
 }
 lean_ctor_set(x_3282, 0, x_3278);
 lean_ctor_set(x_3282, 1, x_3280);
-x_3283 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3283 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3284 = lean_array_push(x_3283, x_3282);
 x_3285 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3286 = lean_array_push(x_3284, x_3285);
@@ -13443,11 +13668,11 @@ x_3290 = lean_array_push(x_3276, x_3289);
 x_3291 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3291, 0, x_3278);
 lean_ctor_set(x_3291, 1, x_3290);
-x_3292 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3292 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3293 = lean_array_push(x_3292, x_3279);
 x_3294 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3295 = lean_array_push(x_3293, x_3294);
-x_3296 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3296 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3297 = lean_array_push(x_3295, x_3296);
 x_3298 = lean_array_push(x_3297, x_3291);
 x_3299 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13505,7 +13730,7 @@ if (lean_is_scalar(x_3313)) {
 }
 lean_ctor_set(x_3314, 0, x_3310);
 lean_ctor_set(x_3314, 1, x_3312);
-x_3315 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3315 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3316 = lean_array_push(x_3315, x_3314);
 x_3317 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3318 = lean_array_push(x_3316, x_3317);
@@ -13518,11 +13743,11 @@ x_3322 = lean_array_push(x_3308, x_3321);
 x_3323 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3323, 0, x_3310);
 lean_ctor_set(x_3323, 1, x_3322);
-x_3324 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3324 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3325 = lean_array_push(x_3324, x_3311);
 x_3326 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3327 = lean_array_push(x_3325, x_3326);
-x_3328 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3328 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3329 = lean_array_push(x_3327, x_3328);
 x_3330 = lean_array_push(x_3329, x_3323);
 x_3331 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13588,7 +13813,7 @@ lean_dec(x_3340);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_3343 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_3343 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_3344 = l_Lean_Elab_Term_throwError___rarg(x_11, x_3343, x_5, x_6);
 x_3345 = !lean_is_exclusive(x_3344);
 if (x_3345 == 0)
@@ -13651,7 +13876,7 @@ lean_inc(x_3357);
 x_3362 = l_Lean_Elab_Term_mkExplicitBinder(x_3357, x_3361);
 x_3363 = lean_array_push(x_4, x_3362);
 lean_inc(x_5);
-x_3364 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3360, x_3363, x_5, x_3358);
+x_3364 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3360, x_3363, x_5, x_3358);
 if (lean_obj_tag(x_3364) == 0)
 {
 lean_object* x_3365; lean_object* x_3366; uint8_t x_3367; 
@@ -13692,7 +13917,7 @@ x_3380 = lean_ctor_get(x_11, 0);
 lean_dec(x_3380);
 lean_ctor_set(x_11, 1, x_3377);
 lean_ctor_set(x_11, 0, x_3375);
-x_3381 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3381 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3382 = lean_array_push(x_3381, x_11);
 x_3383 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3384 = lean_array_push(x_3382, x_3383);
@@ -13705,11 +13930,11 @@ x_3388 = lean_array_push(x_3373, x_3387);
 x_3389 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3389, 0, x_3375);
 lean_ctor_set(x_3389, 1, x_3388);
-x_3390 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3390 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3391 = lean_array_push(x_3390, x_3376);
 x_3392 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3393 = lean_array_push(x_3391, x_3392);
-x_3394 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3394 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3395 = lean_array_push(x_3393, x_3394);
 x_3396 = lean_array_push(x_3395, x_3389);
 x_3397 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13727,7 +13952,7 @@ lean_dec(x_11);
 x_3399 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3399, 0, x_3375);
 lean_ctor_set(x_3399, 1, x_3377);
-x_3400 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3400 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3401 = lean_array_push(x_3400, x_3399);
 x_3402 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3403 = lean_array_push(x_3401, x_3402);
@@ -13740,11 +13965,11 @@ x_3407 = lean_array_push(x_3373, x_3406);
 x_3408 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3408, 0, x_3375);
 lean_ctor_set(x_3408, 1, x_3407);
-x_3409 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3409 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3410 = lean_array_push(x_3409, x_3376);
 x_3411 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3412 = lean_array_push(x_3410, x_3411);
-x_3413 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3413 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3414 = lean_array_push(x_3412, x_3413);
 x_3415 = lean_array_push(x_3414, x_3408);
 x_3416 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13785,7 +14010,7 @@ if (lean_is_scalar(x_3424)) {
 }
 lean_ctor_set(x_3425, 0, x_3421);
 lean_ctor_set(x_3425, 1, x_3423);
-x_3426 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3426 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3427 = lean_array_push(x_3426, x_3425);
 x_3428 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3429 = lean_array_push(x_3427, x_3428);
@@ -13798,11 +14023,11 @@ x_3433 = lean_array_push(x_3419, x_3432);
 x_3434 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3434, 0, x_3421);
 lean_ctor_set(x_3434, 1, x_3433);
-x_3435 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3435 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3436 = lean_array_push(x_3435, x_3422);
 x_3437 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3438 = lean_array_push(x_3436, x_3437);
-x_3439 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3439 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3440 = lean_array_push(x_3438, x_3439);
 x_3441 = lean_array_push(x_3440, x_3434);
 x_3442 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13860,7 +14085,7 @@ if (lean_is_scalar(x_3456)) {
 }
 lean_ctor_set(x_3457, 0, x_3453);
 lean_ctor_set(x_3457, 1, x_3455);
-x_3458 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3458 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3459 = lean_array_push(x_3458, x_3457);
 x_3460 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3461 = lean_array_push(x_3459, x_3460);
@@ -13873,11 +14098,11 @@ x_3465 = lean_array_push(x_3451, x_3464);
 x_3466 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3466, 0, x_3453);
 lean_ctor_set(x_3466, 1, x_3465);
-x_3467 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3467 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3468 = lean_array_push(x_3467, x_3454);
 x_3469 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3470 = lean_array_push(x_3468, x_3469);
-x_3471 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3471 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3472 = lean_array_push(x_3470, x_3471);
 x_3473 = lean_array_push(x_3472, x_3466);
 x_3474 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -13943,7 +14168,7 @@ lean_dec(x_3483);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_3486 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_3486 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_3487 = l_Lean_Elab_Term_throwError___rarg(x_11, x_3486, x_5, x_6);
 x_3488 = !lean_is_exclusive(x_3487);
 if (x_3488 == 0)
@@ -14005,7 +14230,7 @@ lean_inc(x_3500);
 x_3505 = l_Lean_Elab_Term_mkExplicitBinder(x_3500, x_3504);
 x_3506 = lean_array_push(x_4, x_3505);
 lean_inc(x_5);
-x_3507 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3503, x_3506, x_5, x_3501);
+x_3507 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3503, x_3506, x_5, x_3501);
 if (lean_obj_tag(x_3507) == 0)
 {
 lean_object* x_3508; lean_object* x_3509; uint8_t x_3510; 
@@ -14046,7 +14271,7 @@ x_3523 = lean_ctor_get(x_11, 0);
 lean_dec(x_3523);
 lean_ctor_set(x_11, 1, x_3520);
 lean_ctor_set(x_11, 0, x_3518);
-x_3524 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3524 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3525 = lean_array_push(x_3524, x_11);
 x_3526 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3527 = lean_array_push(x_3525, x_3526);
@@ -14059,11 +14284,11 @@ x_3531 = lean_array_push(x_3516, x_3530);
 x_3532 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3532, 0, x_3518);
 lean_ctor_set(x_3532, 1, x_3531);
-x_3533 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3533 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3534 = lean_array_push(x_3533, x_3519);
 x_3535 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3536 = lean_array_push(x_3534, x_3535);
-x_3537 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3537 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3538 = lean_array_push(x_3536, x_3537);
 x_3539 = lean_array_push(x_3538, x_3532);
 x_3540 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14081,7 +14306,7 @@ lean_dec(x_11);
 x_3542 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3542, 0, x_3518);
 lean_ctor_set(x_3542, 1, x_3520);
-x_3543 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3543 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3544 = lean_array_push(x_3543, x_3542);
 x_3545 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3546 = lean_array_push(x_3544, x_3545);
@@ -14094,11 +14319,11 @@ x_3550 = lean_array_push(x_3516, x_3549);
 x_3551 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3551, 0, x_3518);
 lean_ctor_set(x_3551, 1, x_3550);
-x_3552 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3552 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3553 = lean_array_push(x_3552, x_3519);
 x_3554 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3555 = lean_array_push(x_3553, x_3554);
-x_3556 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3556 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3557 = lean_array_push(x_3555, x_3556);
 x_3558 = lean_array_push(x_3557, x_3551);
 x_3559 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14139,7 +14364,7 @@ if (lean_is_scalar(x_3567)) {
 }
 lean_ctor_set(x_3568, 0, x_3564);
 lean_ctor_set(x_3568, 1, x_3566);
-x_3569 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3569 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3570 = lean_array_push(x_3569, x_3568);
 x_3571 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3572 = lean_array_push(x_3570, x_3571);
@@ -14152,11 +14377,11 @@ x_3576 = lean_array_push(x_3562, x_3575);
 x_3577 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3577, 0, x_3564);
 lean_ctor_set(x_3577, 1, x_3576);
-x_3578 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3578 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3579 = lean_array_push(x_3578, x_3565);
 x_3580 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3581 = lean_array_push(x_3579, x_3580);
-x_3582 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3582 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3583 = lean_array_push(x_3581, x_3582);
 x_3584 = lean_array_push(x_3583, x_3577);
 x_3585 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14214,7 +14439,7 @@ if (lean_is_scalar(x_3599)) {
 }
 lean_ctor_set(x_3600, 0, x_3596);
 lean_ctor_set(x_3600, 1, x_3598);
-x_3601 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3601 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3602 = lean_array_push(x_3601, x_3600);
 x_3603 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3604 = lean_array_push(x_3602, x_3603);
@@ -14227,11 +14452,11 @@ x_3608 = lean_array_push(x_3594, x_3607);
 x_3609 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3609, 0, x_3596);
 lean_ctor_set(x_3609, 1, x_3608);
-x_3610 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3610 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3611 = lean_array_push(x_3610, x_3597);
 x_3612 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3613 = lean_array_push(x_3611, x_3612);
-x_3614 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3614 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3615 = lean_array_push(x_3613, x_3614);
 x_3616 = lean_array_push(x_3615, x_3609);
 x_3617 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14297,7 +14522,7 @@ lean_dec(x_3626);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_3629 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_3629 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_3630 = l_Lean_Elab_Term_throwError___rarg(x_11, x_3629, x_5, x_6);
 x_3631 = !lean_is_exclusive(x_3630);
 if (x_3631 == 0)
@@ -14358,7 +14583,7 @@ lean_inc(x_3643);
 x_3648 = l_Lean_Elab_Term_mkExplicitBinder(x_3643, x_3647);
 x_3649 = lean_array_push(x_4, x_3648);
 lean_inc(x_5);
-x_3650 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3646, x_3649, x_5, x_3644);
+x_3650 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3646, x_3649, x_5, x_3644);
 if (lean_obj_tag(x_3650) == 0)
 {
 lean_object* x_3651; lean_object* x_3652; uint8_t x_3653; 
@@ -14399,7 +14624,7 @@ x_3666 = lean_ctor_get(x_11, 0);
 lean_dec(x_3666);
 lean_ctor_set(x_11, 1, x_3663);
 lean_ctor_set(x_11, 0, x_3661);
-x_3667 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3667 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3668 = lean_array_push(x_3667, x_11);
 x_3669 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3670 = lean_array_push(x_3668, x_3669);
@@ -14412,11 +14637,11 @@ x_3674 = lean_array_push(x_3659, x_3673);
 x_3675 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3675, 0, x_3661);
 lean_ctor_set(x_3675, 1, x_3674);
-x_3676 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3676 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3677 = lean_array_push(x_3676, x_3662);
 x_3678 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3679 = lean_array_push(x_3677, x_3678);
-x_3680 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3680 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3681 = lean_array_push(x_3679, x_3680);
 x_3682 = lean_array_push(x_3681, x_3675);
 x_3683 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14434,7 +14659,7 @@ lean_dec(x_11);
 x_3685 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3685, 0, x_3661);
 lean_ctor_set(x_3685, 1, x_3663);
-x_3686 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3686 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3687 = lean_array_push(x_3686, x_3685);
 x_3688 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3689 = lean_array_push(x_3687, x_3688);
@@ -14447,11 +14672,11 @@ x_3693 = lean_array_push(x_3659, x_3692);
 x_3694 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3694, 0, x_3661);
 lean_ctor_set(x_3694, 1, x_3693);
-x_3695 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3695 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3696 = lean_array_push(x_3695, x_3662);
 x_3697 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3698 = lean_array_push(x_3696, x_3697);
-x_3699 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3699 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3700 = lean_array_push(x_3698, x_3699);
 x_3701 = lean_array_push(x_3700, x_3694);
 x_3702 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14492,7 +14717,7 @@ if (lean_is_scalar(x_3710)) {
 }
 lean_ctor_set(x_3711, 0, x_3707);
 lean_ctor_set(x_3711, 1, x_3709);
-x_3712 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3712 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3713 = lean_array_push(x_3712, x_3711);
 x_3714 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3715 = lean_array_push(x_3713, x_3714);
@@ -14505,11 +14730,11 @@ x_3719 = lean_array_push(x_3705, x_3718);
 x_3720 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3720, 0, x_3707);
 lean_ctor_set(x_3720, 1, x_3719);
-x_3721 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3721 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3722 = lean_array_push(x_3721, x_3708);
 x_3723 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3724 = lean_array_push(x_3722, x_3723);
-x_3725 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3725 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3726 = lean_array_push(x_3724, x_3725);
 x_3727 = lean_array_push(x_3726, x_3720);
 x_3728 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14567,7 +14792,7 @@ if (lean_is_scalar(x_3742)) {
 }
 lean_ctor_set(x_3743, 0, x_3739);
 lean_ctor_set(x_3743, 1, x_3741);
-x_3744 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3744 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3745 = lean_array_push(x_3744, x_3743);
 x_3746 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3747 = lean_array_push(x_3745, x_3746);
@@ -14580,11 +14805,11 @@ x_3751 = lean_array_push(x_3737, x_3750);
 x_3752 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3752, 0, x_3739);
 lean_ctor_set(x_3752, 1, x_3751);
-x_3753 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3753 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3754 = lean_array_push(x_3753, x_3740);
 x_3755 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3756 = lean_array_push(x_3754, x_3755);
-x_3757 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3757 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3758 = lean_array_push(x_3756, x_3757);
 x_3759 = lean_array_push(x_3758, x_3752);
 x_3760 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14650,7 +14875,7 @@ lean_dec(x_3769);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_3772 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_3772 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_3773 = l_Lean_Elab_Term_throwError___rarg(x_11, x_3772, x_5, x_6);
 x_3774 = !lean_is_exclusive(x_3773);
 if (x_3774 == 0)
@@ -14710,7 +14935,7 @@ lean_inc(x_3786);
 x_3791 = l_Lean_Elab_Term_mkExplicitBinder(x_3786, x_3790);
 x_3792 = lean_array_push(x_4, x_3791);
 lean_inc(x_5);
-x_3793 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3789, x_3792, x_5, x_3787);
+x_3793 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3789, x_3792, x_5, x_3787);
 if (lean_obj_tag(x_3793) == 0)
 {
 lean_object* x_3794; lean_object* x_3795; uint8_t x_3796; 
@@ -14751,7 +14976,7 @@ x_3809 = lean_ctor_get(x_11, 0);
 lean_dec(x_3809);
 lean_ctor_set(x_11, 1, x_3806);
 lean_ctor_set(x_11, 0, x_3804);
-x_3810 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3810 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3811 = lean_array_push(x_3810, x_11);
 x_3812 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3813 = lean_array_push(x_3811, x_3812);
@@ -14764,11 +14989,11 @@ x_3817 = lean_array_push(x_3802, x_3816);
 x_3818 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3818, 0, x_3804);
 lean_ctor_set(x_3818, 1, x_3817);
-x_3819 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3819 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3820 = lean_array_push(x_3819, x_3805);
 x_3821 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3822 = lean_array_push(x_3820, x_3821);
-x_3823 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3823 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3824 = lean_array_push(x_3822, x_3823);
 x_3825 = lean_array_push(x_3824, x_3818);
 x_3826 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14786,7 +15011,7 @@ lean_dec(x_11);
 x_3828 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3828, 0, x_3804);
 lean_ctor_set(x_3828, 1, x_3806);
-x_3829 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3829 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3830 = lean_array_push(x_3829, x_3828);
 x_3831 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3832 = lean_array_push(x_3830, x_3831);
@@ -14799,11 +15024,11 @@ x_3836 = lean_array_push(x_3802, x_3835);
 x_3837 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3837, 0, x_3804);
 lean_ctor_set(x_3837, 1, x_3836);
-x_3838 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3838 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3839 = lean_array_push(x_3838, x_3805);
 x_3840 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3841 = lean_array_push(x_3839, x_3840);
-x_3842 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3842 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3843 = lean_array_push(x_3841, x_3842);
 x_3844 = lean_array_push(x_3843, x_3837);
 x_3845 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14844,7 +15069,7 @@ if (lean_is_scalar(x_3853)) {
 }
 lean_ctor_set(x_3854, 0, x_3850);
 lean_ctor_set(x_3854, 1, x_3852);
-x_3855 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3855 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3856 = lean_array_push(x_3855, x_3854);
 x_3857 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3858 = lean_array_push(x_3856, x_3857);
@@ -14857,11 +15082,11 @@ x_3862 = lean_array_push(x_3848, x_3861);
 x_3863 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3863, 0, x_3850);
 lean_ctor_set(x_3863, 1, x_3862);
-x_3864 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3864 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3865 = lean_array_push(x_3864, x_3851);
 x_3866 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3867 = lean_array_push(x_3865, x_3866);
-x_3868 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3868 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3869 = lean_array_push(x_3867, x_3868);
 x_3870 = lean_array_push(x_3869, x_3863);
 x_3871 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -14919,7 +15144,7 @@ if (lean_is_scalar(x_3885)) {
 }
 lean_ctor_set(x_3886, 0, x_3882);
 lean_ctor_set(x_3886, 1, x_3884);
-x_3887 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3887 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3888 = lean_array_push(x_3887, x_3886);
 x_3889 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3890 = lean_array_push(x_3888, x_3889);
@@ -14932,11 +15157,11 @@ x_3894 = lean_array_push(x_3880, x_3893);
 x_3895 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3895, 0, x_3882);
 lean_ctor_set(x_3895, 1, x_3894);
-x_3896 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3896 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3897 = lean_array_push(x_3896, x_3883);
 x_3898 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3899 = lean_array_push(x_3897, x_3898);
-x_3900 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3900 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3901 = lean_array_push(x_3899, x_3900);
 x_3902 = lean_array_push(x_3901, x_3895);
 x_3903 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -15002,7 +15227,7 @@ lean_dec(x_3912);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_3915 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_3915 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_3916 = l_Lean_Elab_Term_throwError___rarg(x_11, x_3915, x_5, x_6);
 x_3917 = !lean_is_exclusive(x_3916);
 if (x_3917 == 0)
@@ -15061,7 +15286,7 @@ lean_inc(x_3929);
 x_3934 = l_Lean_Elab_Term_mkExplicitBinder(x_3929, x_3933);
 x_3935 = lean_array_push(x_4, x_3934);
 lean_inc(x_5);
-x_3936 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3932, x_3935, x_5, x_3930);
+x_3936 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3932, x_3935, x_5, x_3930);
 if (lean_obj_tag(x_3936) == 0)
 {
 lean_object* x_3937; lean_object* x_3938; uint8_t x_3939; 
@@ -15103,7 +15328,7 @@ lean_dec(x_3952);
 lean_ctor_set_tag(x_11, 1);
 lean_ctor_set(x_11, 1, x_3949);
 lean_ctor_set(x_11, 0, x_3947);
-x_3953 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3953 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3954 = lean_array_push(x_3953, x_11);
 x_3955 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3956 = lean_array_push(x_3954, x_3955);
@@ -15116,11 +15341,11 @@ x_3960 = lean_array_push(x_3945, x_3959);
 x_3961 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3961, 0, x_3947);
 lean_ctor_set(x_3961, 1, x_3960);
-x_3962 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3962 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3963 = lean_array_push(x_3962, x_3948);
 x_3964 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3965 = lean_array_push(x_3963, x_3964);
-x_3966 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3966 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3967 = lean_array_push(x_3965, x_3966);
 x_3968 = lean_array_push(x_3967, x_3961);
 x_3969 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -15138,7 +15363,7 @@ lean_dec(x_11);
 x_3971 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3971, 0, x_3947);
 lean_ctor_set(x_3971, 1, x_3949);
-x_3972 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3972 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3973 = lean_array_push(x_3972, x_3971);
 x_3974 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_3975 = lean_array_push(x_3973, x_3974);
@@ -15151,11 +15376,11 @@ x_3979 = lean_array_push(x_3945, x_3978);
 x_3980 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3980, 0, x_3947);
 lean_ctor_set(x_3980, 1, x_3979);
-x_3981 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_3981 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_3982 = lean_array_push(x_3981, x_3948);
 x_3983 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_3984 = lean_array_push(x_3982, x_3983);
-x_3985 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_3985 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_3986 = lean_array_push(x_3984, x_3985);
 x_3987 = lean_array_push(x_3986, x_3980);
 x_3988 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -15197,7 +15422,7 @@ if (lean_is_scalar(x_3996)) {
 }
 lean_ctor_set(x_3997, 0, x_3993);
 lean_ctor_set(x_3997, 1, x_3995);
-x_3998 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_3998 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_3999 = lean_array_push(x_3998, x_3997);
 x_4000 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_4001 = lean_array_push(x_3999, x_4000);
@@ -15210,11 +15435,11 @@ x_4005 = lean_array_push(x_3991, x_4004);
 x_4006 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_4006, 0, x_3993);
 lean_ctor_set(x_4006, 1, x_4005);
-x_4007 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_4007 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_4008 = lean_array_push(x_4007, x_3994);
 x_4009 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_4010 = lean_array_push(x_4008, x_4009);
-x_4011 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_4011 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_4012 = lean_array_push(x_4010, x_4011);
 x_4013 = lean_array_push(x_4012, x_4006);
 x_4014 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -15273,7 +15498,7 @@ if (lean_is_scalar(x_4028)) {
 }
 lean_ctor_set(x_4029, 0, x_4025);
 lean_ctor_set(x_4029, 1, x_4027);
-x_4030 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_4030 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_4031 = lean_array_push(x_4030, x_4029);
 x_4032 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_4033 = lean_array_push(x_4031, x_4032);
@@ -15286,11 +15511,11 @@ x_4037 = lean_array_push(x_4023, x_4036);
 x_4038 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_4038, 0, x_4025);
 lean_ctor_set(x_4038, 1, x_4037);
-x_4039 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_4039 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_4040 = lean_array_push(x_4039, x_4026);
 x_4041 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_4042 = lean_array_push(x_4040, x_4041);
-x_4043 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_4043 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_4044 = lean_array_push(x_4042, x_4043);
 x_4045 = lean_array_push(x_4044, x_4038);
 x_4046 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -15356,7 +15581,7 @@ lean_dec(x_4055);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_4058 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_4058 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_4059 = l_Lean_Elab_Term_throwError___rarg(x_11, x_4058, x_5, x_6);
 x_4060 = !lean_is_exclusive(x_4059);
 if (x_4060 == 0)
@@ -15414,7 +15639,7 @@ lean_inc(x_4072);
 x_4077 = l_Lean_Elab_Term_mkExplicitBinder(x_4072, x_4076);
 x_4078 = lean_array_push(x_4, x_4077);
 lean_inc(x_5);
-x_4079 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_4075, x_4078, x_5, x_4073);
+x_4079 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_4075, x_4078, x_5, x_4073);
 if (lean_obj_tag(x_4079) == 0)
 {
 lean_object* x_4080; lean_object* x_4081; uint8_t x_4082; 
@@ -15447,7 +15672,7 @@ x_4092 = lean_array_push(x_4088, x_11);
 x_4093 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_4093, 0, x_4090);
 lean_ctor_set(x_4093, 1, x_4092);
-x_4094 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_4094 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_4095 = lean_array_push(x_4094, x_4093);
 x_4096 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_4097 = lean_array_push(x_4095, x_4096);
@@ -15460,11 +15685,11 @@ x_4101 = lean_array_push(x_4088, x_4100);
 x_4102 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_4102, 0, x_4090);
 lean_ctor_set(x_4102, 1, x_4101);
-x_4103 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_4103 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_4104 = lean_array_push(x_4103, x_4091);
 x_4105 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_4106 = lean_array_push(x_4104, x_4105);
-x_4107 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_4107 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_4108 = lean_array_push(x_4106, x_4107);
 x_4109 = lean_array_push(x_4108, x_4102);
 x_4110 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -15491,7 +15716,7 @@ x_4117 = lean_array_push(x_4113, x_11);
 x_4118 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_4118, 0, x_4115);
 lean_ctor_set(x_4118, 1, x_4117);
-x_4119 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_4119 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_4120 = lean_array_push(x_4119, x_4118);
 x_4121 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_4122 = lean_array_push(x_4120, x_4121);
@@ -15504,11 +15729,11 @@ x_4126 = lean_array_push(x_4113, x_4125);
 x_4127 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_4127, 0, x_4115);
 lean_ctor_set(x_4127, 1, x_4126);
-x_4128 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_4128 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_4129 = lean_array_push(x_4128, x_4116);
 x_4130 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_4131 = lean_array_push(x_4129, x_4130);
-x_4132 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_4132 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_4133 = lean_array_push(x_4131, x_4132);
 x_4134 = lean_array_push(x_4133, x_4127);
 x_4135 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -15553,7 +15778,7 @@ x_4148 = lean_array_push(x_4144, x_11);
 x_4149 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_4149, 0, x_4146);
 lean_ctor_set(x_4149, 1, x_4148);
-x_4150 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6;
+x_4150 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 x_4151 = lean_array_push(x_4150, x_4149);
 x_4152 = l_Lean_Elab_Term_expandCDot_x3f___closed__2;
 x_4153 = lean_array_push(x_4151, x_4152);
@@ -15566,11 +15791,11 @@ x_4157 = lean_array_push(x_4144, x_4156);
 x_4158 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_4158, 0, x_4146);
 lean_ctor_set(x_4158, 1, x_4157);
-x_4159 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7;
+x_4159 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7;
 x_4160 = lean_array_push(x_4159, x_4147);
 x_4161 = l___private_Init_Lean_Elab_Term_8__expandCDot___closed__5;
 x_4162 = lean_array_push(x_4160, x_4161);
-x_4163 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3;
+x_4163 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3;
 x_4164 = lean_array_push(x_4162, x_4163);
 x_4165 = lean_array_push(x_4164, x_4158);
 x_4166 = l_Lean_Parser_Term_match___elambda__1___closed__2;
@@ -15636,7 +15861,7 @@ lean_dec(x_4175);
 lean_dec(x_4);
 lean_dec(x_3);
 lean_dec(x_2);
-x_4178 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10;
+x_4178 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10;
 x_4179 = l_Lean_Elab_Term_throwError___rarg(x_11, x_4178, x_5, x_6);
 x_4180 = !lean_is_exclusive(x_4179);
 if (x_4180 == 0)
@@ -15677,47 +15902,47 @@ goto _start;
 }
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_1);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux(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* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_3, x_4, x_5, x_6);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_1);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBinders(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_11__expandFunBinders(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; lean_object* x_6; lean_object* x_7; 
 x_5 = lean_unsigned_to_nat(0u);
 x_6 = l_Array_empty___closed__1;
-x_7 = l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main(x_1, x_2, x_5, x_6, x_3, x_4);
+x_7 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main(x_1, x_2, x_5, x_6, x_3, x_4);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBinders___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_11__expandFunBinders___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
-x_5 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBinders(x_1, x_2, x_3, x_4);
+x_5 = l___private_Init_Lean_Elab_TermBinders_11__expandFunBinders(x_1, x_2, x_3, x_4);
 lean_dec(x_1);
 return x_5;
 }
@@ -15770,62 +15995,58 @@ return x_15;
 lean_object* l_Lean_Elab_Term_elabFun(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_5 = lean_ctor_get(x_1, 1);
-lean_inc(x_5);
-x_6 = l_Lean_stxInh;
-x_7 = lean_unsigned_to_nat(1u);
-x_8 = lean_array_get(x_6, x_5, x_7);
-x_9 = l_Lean_Syntax_getArgs(x_8);
-lean_dec(x_8);
-x_10 = lean_unsigned_to_nat(3u);
-x_11 = lean_array_get(x_6, x_5, x_10);
-lean_dec(x_5);
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_5 = lean_unsigned_to_nat(1u);
+x_6 = l_Lean_Syntax_getArg(x_1, x_5);
+x_7 = l_Lean_Syntax_getArgs(x_6);
+lean_dec(x_6);
+x_8 = lean_unsigned_to_nat(3u);
+x_9 = l_Lean_Syntax_getArg(x_1, x_8);
 lean_inc(x_3);
-x_12 = l___private_Init_Lean_Elab_TermBinders_10__expandFunBinders(x_9, x_11, x_3, x_4);
-lean_dec(x_9);
-if (lean_obj_tag(x_12) == 0)
+x_10 = l___private_Init_Lean_Elab_TermBinders_11__expandFunBinders(x_7, x_9, x_3, x_4);
+lean_dec(x_7);
+if (lean_obj_tag(x_10) == 0)
 {
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_13 = lean_ctor_get(x_12, 0);
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+lean_dec(x_10);
+x_13 = lean_ctor_get(x_11, 0);
 lean_inc(x_13);
-x_14 = lean_ctor_get(x_12, 1);
+x_14 = lean_ctor_get(x_11, 1);
 lean_inc(x_14);
-lean_dec(x_12);
-x_15 = lean_ctor_get(x_13, 0);
-lean_inc(x_15);
-x_16 = lean_ctor_get(x_13, 1);
-lean_inc(x_16);
+lean_dec(x_11);
+x_15 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabFun___lambda__1___boxed), 5, 2);
+lean_closure_set(x_15, 0, x_14);
+lean_closure_set(x_15, 1, x_1);
+x_16 = l_Lean_Elab_Term_elabBinders___rarg(x_13, x_15, x_3, x_12);
 lean_dec(x_13);
-x_17 = lean_alloc_closure((void*)(l_Lean_Elab_Term_elabFun___lambda__1___boxed), 5, 2);
-lean_closure_set(x_17, 0, x_16);
-lean_closure_set(x_17, 1, x_1);
-x_18 = l_Lean_Elab_Term_elabBinders___rarg(x_15, x_17, x_3, x_14);
-lean_dec(x_15);
-return x_18;
+return x_16;
 }
 else
 {
-uint8_t x_19; 
+uint8_t x_17; 
 lean_dec(x_3);
 lean_dec(x_1);
-x_19 = !lean_is_exclusive(x_12);
-if (x_19 == 0)
+x_17 = !lean_is_exclusive(x_10);
+if (x_17 == 0)
 {
-return x_12;
+return x_10;
 }
 else
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; 
-x_20 = lean_ctor_get(x_12, 0);
-x_21 = lean_ctor_get(x_12, 1);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_dec(x_12);
-x_22 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_22, 0, x_20);
-lean_ctor_set(x_22, 1, x_21);
-return x_22;
+lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_18 = lean_ctor_get(x_10, 0);
+x_19 = lean_ctor_get(x_10, 1);
+lean_inc(x_19);
+lean_inc(x_18);
+lean_dec(x_10);
+x_20 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_20, 0, x_18);
+lean_ctor_set(x_20, 1, x_19);
+return x_20;
 }
 }
 }
@@ -16738,7 +16959,7 @@ lean_object* l_Lean_Elab_Term_elabLetEqnsDecl___rarg(lean_object* x_1, lean_obje
 _start:
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3;
+x_6 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3;
 x_7 = l_Lean_Elab_Term_throwError___rarg(x_1, x_6, x_4, x_5);
 return x_7;
 }
@@ -16774,7 +16995,7 @@ lean_object* l_Lean_Elab_Term_elabLetPatDecl___rarg(lean_object* x_1, lean_objec
 _start:
 {
 lean_object* x_6; lean_object* x_7; 
-x_6 = l___private_Init_Lean_Elab_Term_16__synthesizeSyntheticMVar___closed__3;
+x_6 = l___private_Init_Lean_Elab_Term_17__synthesizeSyntheticMVar___closed__3;
 x_7 = l_Lean_Elab_Term_throwError___rarg(x_1, x_6, x_4, x_5);
 return x_7;
 }
@@ -16837,70 +17058,66 @@ return x_2;
 lean_object* l_Lean_Elab_Term_elabLet(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; lean_object* x_12; lean_object* x_13; 
-x_5 = lean_ctor_get(x_1, 1);
-lean_inc(x_5);
-x_6 = l_Lean_stxInh;
-x_7 = lean_unsigned_to_nat(1u);
-x_8 = lean_array_get(x_6, x_5, x_7);
-lean_inc(x_8);
-x_9 = l_Lean_Syntax_getKind(x_8);
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
+x_5 = lean_unsigned_to_nat(1u);
+x_6 = l_Lean_Syntax_getArg(x_1, x_5);
+x_7 = lean_unsigned_to_nat(3u);
+x_8 = l_Lean_Syntax_getArg(x_1, x_7);
+lean_inc(x_6);
+x_9 = l_Lean_Syntax_getKind(x_6);
 x_10 = l_Lean_Parser_Term_letIdDecl___elambda__1___closed__2;
 x_11 = lean_name_eq(x_9, x_10);
-x_12 = lean_unsigned_to_nat(3u);
-x_13 = lean_array_get(x_6, x_5, x_12);
-lean_dec(x_5);
 if (x_11 == 0)
 {
+lean_object* x_12; uint8_t x_13; 
+x_12 = l_Lean_Parser_Term_letEqns___elambda__1___closed__2;
+x_13 = lean_name_eq(x_9, x_12);
+if (x_13 == 0)
+{
 lean_object* x_14; uint8_t x_15; 
-x_14 = l_Lean_Parser_Term_letEqns___elambda__1___closed__2;
+x_14 = l_Lean_Parser_Term_letPatDecl___elambda__1___closed__2;
 x_15 = lean_name_eq(x_9, x_14);
+lean_dec(x_9);
 if (x_15 == 0)
 {
-lean_object* x_16; uint8_t x_17; 
-x_16 = l_Lean_Parser_Term_letPatDecl___elambda__1___closed__2;
-x_17 = lean_name_eq(x_9, x_16);
-lean_dec(x_9);
-if (x_17 == 0)
-{
-lean_object* x_18; lean_object* x_19; 
-lean_dec(x_13);
+lean_object* x_16; lean_object* x_17; 
 lean_dec(x_8);
+lean_dec(x_6);
 lean_dec(x_2);
-x_18 = l_Lean_Elab_Term_elabLet___closed__3;
-x_19 = l_Lean_Elab_Term_throwError___rarg(x_1, x_18, x_3, x_4);
+x_16 = l_Lean_Elab_Term_elabLet___closed__3;
+x_17 = l_Lean_Elab_Term_throwError___rarg(x_1, x_16, x_3, x_4);
+return x_17;
+}
+else
+{
+lean_object* x_18; 
+lean_dec(x_1);
+x_18 = l_Lean_Elab_Term_elabLetPatDecl___rarg(x_6, x_8, x_2, x_3, x_4);
+lean_dec(x_2);
+lean_dec(x_8);
+return x_18;
+}
+}
+else
+{
+lean_object* x_19; 
+lean_dec(x_9);
+lean_dec(x_1);
+x_19 = l_Lean_Elab_Term_elabLetEqnsDecl___rarg(x_6, x_8, x_2, x_3, x_4);
+lean_dec(x_2);
+lean_dec(x_8);
 return x_19;
 }
+}
 else
 {
 lean_object* x_20; 
-lean_dec(x_1);
-x_20 = l_Lean_Elab_Term_elabLetPatDecl___rarg(x_8, x_13, x_2, x_3, x_4);
-lean_dec(x_2);
-lean_dec(x_13);
+lean_dec(x_9);
+x_20 = l_Lean_Elab_Term_elabLetIdDecl(x_1, x_6, x_8, x_2, x_3, x_4);
+lean_dec(x_6);
 return x_20;
 }
 }
-else
-{
-lean_object* x_21; 
-lean_dec(x_9);
-lean_dec(x_1);
-x_21 = l_Lean_Elab_Term_elabLetEqnsDecl___rarg(x_8, x_13, x_2, x_3, x_4);
-lean_dec(x_2);
-lean_dec(x_13);
-return x_21;
-}
-}
-else
-{
-lean_object* x_22; 
-lean_dec(x_9);
-x_22 = l_Lean_Elab_Term_elabLetIdDecl(x_1, x_8, x_13, x_2, x_3, x_4);
-lean_dec(x_8);
-return x_22;
-}
-}
 }
 lean_object* _init_l___regBuiltinTermElab_Lean_Elab_Term_elabLet___closed__1() {
 _start:
@@ -16939,7 +17156,7 @@ x_5 = l_Lean_Elab_Term_addBuiltinTermElab(x_2, x_3, x_4, x_1);
 return x_5;
 }
 }
-lean_object* l___private_Init_Lean_Elab_TermBinders_11__regTraceClasses(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Elab_TermBinders_12__regTraceClasses(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -17004,14 +17221,20 @@ _G_initialized = true;
 res = initialize_Init_Lean_Elab_Term(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__1 = _init_l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__1);
-l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__2 = _init_l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__2);
-l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__3 = _init_l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_4__matchBinder___closed__3);
-l_Lean_Elab_Term_elabForall___closed__1 = _init_l_Lean_Elab_Term_elabForall___closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_elabForall___closed__1);
+l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__1 = _init_l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__1);
+l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__2 = _init_l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__2);
+l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__3 = _init_l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__3);
+l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__4 = _init_l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__4();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__4);
+l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__1 = _init_l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__1);
+l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__2 = _init_l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__2);
+l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__3 = _init_l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_5__matchBinder___closed__3);
 l___regBuiltinTermElab_Lean_Elab_Term_elabForall___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabForall___closed__1();
 lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabForall___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabForall___closed__2 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabForall___closed__2();
@@ -17037,8 +17260,6 @@ l_Lean_Elab_Term_elabArrow___lambda__1___closed__7 = _init_l_Lean_Elab_Term_elab
 lean_mark_persistent(l_Lean_Elab_Term_elabArrow___lambda__1___closed__7);
 l_Lean_Elab_Term_elabArrow___lambda__1___closed__8 = _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__8();
 lean_mark_persistent(l_Lean_Elab_Term_elabArrow___lambda__1___closed__8);
-l_Lean_Elab_Term_elabArrow___lambda__1___closed__9 = _init_l_Lean_Elab_Term_elabArrow___lambda__1___closed__9();
-lean_mark_persistent(l_Lean_Elab_Term_elabArrow___lambda__1___closed__9);
 l_Lean_Elab_Term_elabArrow___closed__1 = _init_l_Lean_Elab_Term_elabArrow___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_elabArrow___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabArrow___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabArrow___closed__1();
@@ -17059,26 +17280,26 @@ lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabDepArrow___closed
 res = l___regBuiltinTermElab_Lean_Elab_Term_elabDepArrow(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__1 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__1);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__2 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__2);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__3);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__4 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__4();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__4);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__5 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__5();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__5);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__6);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__7);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__8 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__8();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__8);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__9 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__9();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__9);
-l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10 = _init_l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10();
-lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_9__expandFunBindersAux___main___closed__10);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__1 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__1);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__2 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__2);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__3);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__4);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__5 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__5();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__5);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__7);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__8 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__8();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__8);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__9 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__9();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__9);
+l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10 = _init_l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10();
+lean_mark_persistent(l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__10);
 l___regBuiltinTermElab_Lean_Elab_Term_elabFun___closed__1 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabFun___closed__1();
 lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabFun___closed__1);
 l___regBuiltinTermElab_Lean_Elab_Term_elabFun___closed__2 = _init_l___regBuiltinTermElab_Lean_Elab_Term_elabFun___closed__2();
@@ -17109,7 +17330,7 @@ lean_mark_persistent(l___regBuiltinTermElab_Lean_Elab_Term_elabLet___closed__3);
 res = l___regBuiltinTermElab_Lean_Elab_Term_elabLet(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = l___private_Init_Lean_Elab_TermBinders_11__regTraceClasses(lean_io_mk_world());
+res = l___private_Init_Lean_Elab_TermBinders_12__regTraceClasses(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_mk_io_result(lean_box(0));
diff --git a/stage0/stdlib/Init/Lean/Elab/Util.c b/stage0/stdlib/Init/Lean/Elab/Util.c
index dc9062155d..bad8133066 100644
--- a/stage0/stdlib/Init/Lean/Elab/Util.c
+++ b/stage0/stdlib/Init/Lean/Elab/Util.c
@@ -13,64 +13,76 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_reverse___rarg(lean_object*);
 extern lean_object* l_Lean_Name_toString___closed__1;
 lean_object* l_PersistentHashMap_empty___at_Lean_Elab_ElabAttribute_inhabited___spec__3(lean_object*);
-lean_object* l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__10(lean_object*);
-lean_object* l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__8___rarg(lean_object*, lean_object*);
 lean_object* l_mkHashMap___at_Lean_Elab_ElabAttributeExtensionState_inhabited___spec__2___rarg(lean_object*);
 size_t l_USize_add(size_t, size_t);
+lean_object* l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__30(lean_object*);
+lean_object* l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__29(lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_6__ElabAttribute_add___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Lean_Environment_8__persistentEnvExtensionsRef;
+lean_object* l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg___boxed(lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__13___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__20___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_2__throwUnexpectedElabType(lean_object*);
-lean_object* l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__6(lean_object*);
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__2;
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22(lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
 lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__1;
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13___rarg(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_ElabFnTable_insert___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_mkElabAttribute___spec__4___closed__2;
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__12(lean_object*);
 extern size_t l_PersistentHashMap_insertAux___main___rarg___closed__2;
-lean_object* l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__10___rarg(lean_object*, lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(lean_object*, size_t, size_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg___closed__4;
+uint8_t l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg(lean_object*, lean_object*);
 size_t l_USize_sub(size_t, size_t);
+lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__25(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_Elab_mkElabAttribute___spec__1(lean_object*);
 lean_object* lean_environment_find(lean_object*, lean_object*);
+lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__14___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_ElabFnTable_insert___spec__4(lean_object*);
+lean_object* l_Lean_Elab_ElabFnTable_insert___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__17(lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* lean_io_ref_get(lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__2(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses(lean_object*);
 lean_object* lean_get_namespaces(lean_object*);
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7(lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg___closed__1;
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers(lean_object*);
 lean_object* l_Lean_registerAttribute(lean_object*, lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6___rarg(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_1__ElabAttribute_mkInitial___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttribute_inhabited___spec__1___closed__2;
 extern lean_object* l_String_splitAux___main___closed__1;
+lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__2___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_2__throwUnexpectedElabType___rarg(lean_object*, lean_object*);
 size_t l_USize_shiftRight(size_t, size_t);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Elab_mkElabAttribute___spec__3(lean_object*);
-lean_object* l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__11___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__20(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__3;
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_mkElabAttribute___spec__4___closed__1;
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg(lean_object*, size_t, size_t, lean_object*, lean_object*);
+lean_object* l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19(lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg___closed__3;
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__5(lean_object*);
 extern lean_object* l_Lean_LocalContext_Inhabited___closed__1;
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24___rarg(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_AttributeImpl_inhabited___closed__2;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___main(lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3(lean_object*);
+lean_object* l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__29___rarg(lean_object*, lean_object*);
+lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__14(lean_object*);
 lean_object* l_IO_ofExcept___at___private_Init_Lean_Elab_Util_6__ElabAttribute_add___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg___lambda__2(lean_object*);
 lean_object* l_Lean_Elab_ElabAttribute_inhabited___closed__6;
@@ -80,22 +92,20 @@ lean_object* l_Lean_Elab_checkSyntaxNodeKind___closed__2;
 lean_object* l___private_Init_Lean_Elab_Util_3__mkElabFnOfConstantUnsafe___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Elab_mkElabAttribute___spec__3___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_ElabAttribute_inhabited___closed__5;
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__13(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry(lean_object*);
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg(lean_object*, size_t, size_t, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttributeExtensionState_inhabited___spec__1(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_6__ElabAttribute_add(lean_object*);
 lean_object* l_PersistentHashMap_empty___at_Lean_Elab_ElabAttributeExtensionState_inhabited___spec__3(lean_object*);
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__4(lean_object*);
 extern lean_object* l_Lean_EnvExtension_Inhabited___rarg___closed__1;
 lean_object* l_EStateM_bind___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__6___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Elab_mkElabAttribute___spec__3___rarg___closed__3;
-lean_object* l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__2(lean_object*);
+lean_object* l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__16(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_7__regTraceClasses___closed__4;
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam___closed__2;
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1(lean_object*);
+lean_object* l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__16___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Name_append___main(lean_object*, lean_object*);
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__2;
 lean_object* l___private_Init_Lean_Elab_Util_2__throwUnexpectedElabType___rarg___closed__3;
@@ -103,135 +113,152 @@ lean_object* l_Lean_Elab_ElabAttributeExtensionState_inhabited___closed__1;
 lean_object* l_Array_anyRangeMAux___main___at_Lean_Elab_mkElabAttribute___spec__2(lean_object*);
 lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg___lambda__2___boxed(lean_object*);
+lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
+uint8_t l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15___rarg(lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_mkParserOfConstant___closed__1;
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_lengthAux___main___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__1___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__5___rarg(lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__2___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg___closed__2;
 lean_object* l___private_Init_Lean_Elab_Util_3__mkElabFnOfConstantUnsafe(lean_object*);
 size_t l_Lean_Name_hash(lean_object*);
 lean_object* l_Nat_repr(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__9(lean_object*);
 extern lean_object* l_Char_HasRepr___closed__1;
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_mkHashMap___at_Lean_Elab_mkElabAttribute___spec__5___rarg(lean_object*);
 extern lean_object* l_PersistentHashMap_insertAux___main___rarg___closed__3;
 uint8_t l_Array_anyRangeMAux___main___at_Lean_Elab_mkElabAttribute___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__8(lean_object*);
-lean_object* l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__1___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6___rarg___boxed(lean_object*, lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
-lean_object* l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7(lean_object*);
-lean_object* l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__6___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_eval_const(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttributeExtensionState_inhabited___spec__1___closed__1;
 lean_object* l_Lean_Elab_mkElabAttribute___rarg___lambda__1(lean_object*);
 lean_object* l_Lean_Elab_ElabAttribute_inhabited___closed__4;
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__6(lean_object*);
 lean_object* l_Lean_attrParamSyntaxToIdentifier(lean_object*);
+lean_object* l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15(lean_object*);
+lean_object* l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__21(lean_object*);
 size_t lean_usize_modn(size_t, lean_object*);
 extern lean_object* l___private_Init_Lean_Environment_5__envExtensionsRef;
 extern lean_object* l_Lean_registerEnvExtensionUnsafe___rarg___closed__1;
 lean_object* l_Lean_Elab_mkElabFnOfConstant(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_mkHashMap___at_Lean_Elab_ElabAttribute_inhabited___spec__2(lean_object*);
+lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__28(lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__1(lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__13___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_mul(size_t, size_t);
-lean_object* l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7(lean_object*);
 lean_object* l_List_redLength___main___rarg(lean_object*);
 lean_object* l_mkHashMapImp___rarg(lean_object*);
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam___closed__3;
 lean_object* l_mkHashMap___at_Lean_Elab_ElabAttributeExtensionState_inhabited___spec__2(lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__12___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___rarg(lean_object*, lean_object*);
-lean_object* l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__10___rarg(lean_object*, lean_object*);
-lean_object* l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_Elab_ElabFnTable_insert(lean_object*);
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8(lean_object*);
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__3;
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_Elab_mkElabAttribute___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__9___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__28___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_mkElabAttribute___spec__4(lean_object*);
-lean_object* l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__9___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_ElabFnTable_insert___spec__3___rarg(lean_object*, size_t, lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_addEntry___rarg(lean_object*, lean_object*, lean_object*);
 size_t l_USize_land(size_t, size_t);
 lean_object* l_mkHashMap___at_Lean_Elab_mkElabAttribute___spec__5(lean_object*);
+lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_ElabFnTable_insert___spec__3(lean_object*);
 lean_object* l_Lean_Elab_ElabAttributeExtensionState_inhabited___closed__2;
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3(lean_object*);
+lean_object* l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__10(lean_object*);
+lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__17___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__27___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__1___rarg(lean_object*, lean_object*);
 extern lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed__3;
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_2__throwUnexpectedElabType___rarg___closed__2;
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam___closed__1;
 lean_object* l___private_Init_Lean_Elab_Util_1__ElabAttribute_mkInitial(lean_object*);
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed__1;
-lean_object* l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__9(lean_object*);
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_ElabAttribute_inhabited___closed__3;
-lean_object* l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__2___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2(lean_object*);
 extern lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___lambda__4___closed__2;
 lean_object* l___private_Init_Lean_Elab_Util_6__ElabAttribute_add___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_checkSyntaxNodeKind___closed__1;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 uint8_t l_USize_decLe(size_t, size_t);
+lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__25___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute(lean_object*);
+lean_object* l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__18___rarg(lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Parser_isValidSyntaxNodeKind(lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__23___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_2__throwUnexpectedElabType___rarg___closed__1;
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg(lean_object*, size_t, size_t, lean_object*, lean_object*);
 extern lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed__4;
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttribute_inhabited___spec__1___closed__1;
+lean_object* l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__30___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_ElabAttribute_inhabited(lean_object*);
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__5___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__5(lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttributeExtensionState_inhabited___spec__1___closed__3;
-lean_object* l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__11(lean_object*);
 lean_object* l_Lean_Elab_ElabAttribute_inhabited___closed__1;
+lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_ElabFnTable_insert___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_ElabAttribute_inhabited___closed__2;
 lean_object* lean_io_ref_reset(lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__10___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_registerEnvExtensionUnsafe___rarg___closed__2;
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_mul(lean_object*, lean_object*);
-lean_object* l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__11(lean_object*);
-uint8_t l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7___rarg(lean_object*, lean_object*);
+lean_object* l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15___rarg___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_1__ElabAttribute_mkInitial___rarg(lean_object*, lean_object*);
 lean_object* lean_io_ref_set(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__9(lean_object*);
 lean_object* l_PersistentHashMap_getCollisionNodeSize___rarg(lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__5___rarg(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_array(lean_object*, lean_object*);
-lean_object* l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__10(lean_object*);
 lean_object* lean_io_initializing(lean_object*);
 extern lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed__2;
-lean_object* l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_checkSyntaxNodeKind___boxed(lean_object*, lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__5(lean_object*);
+lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__23(lean_object*);
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13(lean_object*);
+lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__9___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_checkSyntaxNodeKind(lean_object*, lean_object*);
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_mkHashMap___at_Lean_Elab_ElabAttribute_inhabited___spec__2___rarg(lean_object*);
 lean_object* l_PersistentHashMap_empty___at_Lean_Elab_mkElabAttribute___spec__6(lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__12___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__8(lean_object*);
+lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_ElabFnTable_insert___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26(lean_object*);
 lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___main___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__18(lean_object*);
 lean_object* l_List_toArrayAux___main___rarg(lean_object*, lean_object*);
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7___rarg(lean_object*, lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_ElabAttributeExtensionState_inhabited(lean_object*);
 lean_object* l_Lean_Name_toStringWithSep___main(lean_object*, lean_object*);
-lean_object* l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2(lean_object*);
 lean_object* lean_usize_to_nat(size_t);
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__1(lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttribute_inhabited___spec__1___closed__3;
-lean_object* l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__11___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttributeExtensionState_inhabited___spec__1___closed__2;
 extern lean_object* l_Lean_Parser_mkParserOfConstantUnsafe___closed__3;
 lean_object* l_IO_ofExcept___at___private_Init_Lean_Elab_Util_6__ElabAttribute_add___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_Elab_ElabAttribute_inhabited___spec__1(lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__5___rarg(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__4;
-lean_object* l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__8___rarg(lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24(lean_object*);
 lean_object* l_Lean_Elab_syntaxNodeKindOfAttrParam(lean_object*, lean_object*, lean_object*);
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__4(lean_object*);
-lean_object* l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Elab_mkElabAttribute___spec__3___rarg___closed__2;
-uint8_t l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1(lean_object*);
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6(lean_object*);
+lean_object* l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__27(lean_object*);
 lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_Elab_mkElabAttribute___spec__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkElabFnOfConstant___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Elab_mkElabAttribute___spec__3___rarg___closed__1;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__12___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__21___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__12(lean_object*);
 lean_object* _init_l_Lean_Elab_checkSyntaxNodeKind___closed__1() {
 _start:
 {
@@ -502,6 +529,2405 @@ lean_dec(x_2);
 return x_4;
 }
 }
+lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_ElabFnTable_insert___spec__4___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; uint8_t x_7; 
+x_6 = lean_array_get_size(x_1);
+x_7 = lean_nat_dec_lt(x_4, x_6);
+lean_dec(x_6);
+if (x_7 == 0)
+{
+lean_object* x_8; 
+lean_dec(x_4);
+x_8 = lean_box(0);
+return x_8;
+}
+else
+{
+lean_object* x_9; uint8_t x_10; 
+x_9 = lean_array_fget(x_1, x_4);
+x_10 = lean_name_eq(x_5, x_9);
+lean_dec(x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_unsigned_to_nat(1u);
+x_12 = lean_nat_add(x_4, x_11);
+lean_dec(x_4);
+x_3 = lean_box(0);
+x_4 = x_12;
+goto _start;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = lean_array_fget(x_2, x_4);
+lean_dec(x_4);
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_14);
+return x_15;
+}
+}
+}
+}
+lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_ElabFnTable_insert___spec__4(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_findAtAux___main___at_Lean_Elab_ElabFnTable_insert___spec__4___rarg___boxed), 5, 0);
+return x_2;
+}
+}
+lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_ElabFnTable_insert___spec__3___rarg(lean_object* x_1, size_t x_2, lean_object* x_3) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_4; size_t x_5; size_t x_6; size_t x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_4 = lean_ctor_get(x_1, 0);
+lean_inc(x_4);
+lean_dec(x_1);
+x_5 = 5;
+x_6 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
+x_7 = x_2 & x_6;
+x_8 = lean_usize_to_nat(x_7);
+x_9 = lean_box(2);
+x_10 = lean_array_get(x_9, x_4, x_8);
+lean_dec(x_8);
+lean_dec(x_4);
+switch (lean_obj_tag(x_10)) {
+case 0:
+{
+lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_10, 1);
+lean_inc(x_12);
+lean_dec(x_10);
+x_13 = lean_name_eq(x_3, x_11);
+lean_dec(x_11);
+if (x_13 == 0)
+{
+lean_object* x_14; 
+lean_dec(x_12);
+x_14 = lean_box(0);
+return x_14;
+}
+else
+{
+lean_object* x_15; 
+x_15 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_15, 0, x_12);
+return x_15;
+}
+}
+case 1:
+{
+lean_object* x_16; size_t x_17; 
+x_16 = lean_ctor_get(x_10, 0);
+lean_inc(x_16);
+lean_dec(x_10);
+x_17 = x_2 >> x_5;
+x_1 = x_16;
+x_2 = x_17;
+goto _start;
+}
+default: 
+{
+lean_object* x_19; 
+x_19 = lean_box(0);
+return x_19;
+}
+}
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; 
+x_20 = lean_ctor_get(x_1, 0);
+lean_inc(x_20);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_dec(x_1);
+x_22 = lean_unsigned_to_nat(0u);
+x_23 = l_PersistentHashMap_findAtAux___main___at_Lean_Elab_ElabFnTable_insert___spec__4___rarg(x_20, x_21, lean_box(0), x_22, x_3);
+lean_dec(x_21);
+lean_dec(x_20);
+return x_23;
+}
+}
+}
+lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_ElabFnTable_insert___spec__3(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_findAux___main___at_Lean_Elab_ElabFnTable_insert___spec__3___rarg___boxed), 3, 0);
+return x_2;
+}
+}
+lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__2___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; size_t x_4; lean_object* x_5; 
+x_3 = lean_ctor_get(x_1, 0);
+lean_inc(x_3);
+lean_dec(x_1);
+x_4 = l_Lean_Name_hash(x_2);
+x_5 = l_PersistentHashMap_findAux___main___at_Lean_Elab_ElabFnTable_insert___spec__3___rarg(x_3, x_4, x_2);
+return x_5;
+}
+}
+lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__2(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__2___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+lean_object* x_3; 
+x_3 = lean_box(0);
+return x_3;
+}
+else
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 1);
+x_6 = lean_ctor_get(x_2, 2);
+x_7 = lean_name_eq(x_4, x_1);
+if (x_7 == 0)
+{
+x_2 = x_6;
+goto _start;
+}
+else
+{
+lean_object* x_9; 
+lean_inc(x_5);
+x_9 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_9, 0, x_5);
+return x_9;
+}
+}
+}
+}
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__5___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
+x_3 = lean_ctor_get(x_1, 1);
+x_4 = lean_array_get_size(x_3);
+x_5 = l_Lean_Name_hash(x_2);
+x_6 = lean_usize_modn(x_5, x_4);
+lean_dec(x_4);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6___rarg(x_2, x_7);
+lean_dec(x_7);
+return x_8;
+}
+}
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__5(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__5___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+lean_object* x_3; 
+x_3 = lean_box(0);
+return x_3;
+}
+else
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; uint8_t x_7; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 1);
+x_6 = lean_ctor_get(x_2, 2);
+x_7 = lean_name_eq(x_4, x_1);
+if (x_7 == 0)
+{
+x_2 = x_6;
+goto _start;
+}
+else
+{
+lean_object* x_9; 
+lean_inc(x_5);
+x_9 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_9, 0, x_5);
+return x_9;
+}
+}
+}
+}
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; size_t x_5; size_t x_6; lean_object* x_7; lean_object* x_8; 
+x_3 = lean_ctor_get(x_1, 1);
+x_4 = lean_array_get_size(x_3);
+x_5 = l_Lean_Name_hash(x_2);
+x_6 = lean_usize_modn(x_5, x_4);
+lean_dec(x_4);
+x_7 = lean_array_uget(x_3, x_6);
+x_8 = l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8___rarg(x_2, x_7);
+lean_dec(x_7);
+return x_8;
+}
+}
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__1___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; 
+x_3 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
+if (x_3 == 0)
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_4 = lean_ctor_get(x_1, 0);
+lean_inc(x_4);
+x_5 = lean_ctor_get(x_1, 1);
+lean_inc(x_5);
+lean_dec(x_1);
+x_6 = l_PersistentHashMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__2___rarg(x_5, x_2);
+if (lean_obj_tag(x_6) == 0)
+{
+lean_object* x_7; 
+x_7 = l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__5___rarg(x_4, x_2);
+lean_dec(x_4);
+return x_7;
+}
+else
+{
+lean_dec(x_4);
+return x_6;
+}
+}
+else
+{
+lean_object* x_8; lean_object* x_9; 
+x_8 = lean_ctor_get(x_1, 0);
+lean_inc(x_8);
+lean_dec(x_1);
+x_9 = l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7___rarg(x_8, x_2);
+lean_dec(x_8);
+return x_9;
+}
+}
+}
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_SMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__1___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__12___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
+x_5 = lean_ctor_get(x_1, 0);
+lean_inc(x_5);
+x_6 = lean_ctor_get(x_1, 1);
+lean_inc(x_6);
+x_7 = lean_array_get_size(x_5);
+x_8 = lean_nat_dec_lt(x_2, x_7);
+lean_dec(x_7);
+if (x_8 == 0)
+{
+uint8_t x_9; 
+lean_dec(x_2);
+x_9 = !lean_is_exclusive(x_1);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_10 = lean_ctor_get(x_1, 1);
+lean_dec(x_10);
+x_11 = lean_ctor_get(x_1, 0);
+lean_dec(x_11);
+x_12 = lean_array_push(x_5, x_3);
+x_13 = lean_array_push(x_6, x_4);
+lean_ctor_set(x_1, 1, x_13);
+lean_ctor_set(x_1, 0, x_12);
+return x_1;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+lean_dec(x_1);
+x_14 = lean_array_push(x_5, x_3);
+x_15 = lean_array_push(x_6, x_4);
+x_16 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_16, 1, x_15);
+return x_16;
+}
+}
+else
+{
+lean_object* x_17; uint8_t x_18; 
+x_17 = lean_array_fget(x_5, x_2);
+x_18 = lean_name_eq(x_3, x_17);
+lean_dec(x_17);
+if (x_18 == 0)
+{
+lean_object* x_19; lean_object* x_20; 
+lean_dec(x_6);
+lean_dec(x_5);
+x_19 = lean_unsigned_to_nat(1u);
+x_20 = lean_nat_add(x_2, x_19);
+lean_dec(x_2);
+x_2 = x_20;
+goto _start;
+}
+else
+{
+uint8_t x_22; 
+x_22 = !lean_is_exclusive(x_1);
+if (x_22 == 0)
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_23 = lean_ctor_get(x_1, 1);
+lean_dec(x_23);
+x_24 = lean_ctor_get(x_1, 0);
+lean_dec(x_24);
+x_25 = lean_array_fset(x_5, x_2, x_3);
+x_26 = lean_array_fset(x_6, x_2, x_4);
+lean_dec(x_2);
+lean_ctor_set(x_1, 1, x_26);
+lean_ctor_set(x_1, 0, x_25);
+return x_1;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_dec(x_1);
+x_27 = lean_array_fset(x_5, x_2, x_3);
+x_28 = lean_array_fset(x_6, x_2, x_4);
+lean_dec(x_2);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+return x_29;
+}
+}
+}
+}
+}
+lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__12(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__12___rarg), 4, 0);
+return x_2;
+}
+}
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13___rarg(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; uint8_t x_8; 
+x_7 = lean_array_get_size(x_4);
+x_8 = lean_nat_dec_lt(x_5, x_7);
+lean_dec(x_7);
+if (x_8 == 0)
+{
+lean_dec(x_5);
+return x_6;
+}
+else
+{
+lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; size_t x_13; size_t x_14; size_t x_15; size_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_9 = lean_array_fget(x_4, x_5);
+x_10 = lean_array_fget(x_3, x_5);
+x_11 = l_Lean_Name_hash(x_9);
+x_12 = 1;
+x_13 = x_1 - x_12;
+x_14 = 5;
+x_15 = x_14 * x_13;
+x_16 = x_11 >> x_15;
+x_17 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg(x_6, x_16, x_1, x_9, x_10);
+x_18 = lean_unsigned_to_nat(1u);
+x_19 = lean_nat_add(x_5, x_18);
+lean_dec(x_5);
+x_5 = x_19;
+x_6 = x_17;
+goto _start;
+}
+}
+}
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13___rarg___boxed), 6, 0);
+return x_2;
+}
+}
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+uint8_t x_6; 
+x_6 = !lean_is_exclusive(x_1);
+if (x_6 == 0)
+{
+lean_object* x_7; size_t x_8; size_t x_9; size_t x_10; size_t x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_7 = lean_ctor_get(x_1, 0);
+x_8 = 1;
+x_9 = 5;
+x_10 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
+x_11 = x_2 & x_10;
+x_12 = lean_usize_to_nat(x_11);
+x_13 = lean_array_get_size(x_7);
+x_14 = lean_nat_dec_lt(x_12, x_13);
+lean_dec(x_13);
+if (x_14 == 0)
+{
+lean_dec(x_12);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_1;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_array_fget(x_7, x_12);
+x_16 = lean_box(2);
+x_17 = lean_array_fset(x_7, x_12, x_16);
+switch (lean_obj_tag(x_15)) {
+case 0:
+{
+uint8_t x_18; 
+x_18 = !lean_is_exclusive(x_15);
+if (x_18 == 0)
+{
+lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+x_19 = lean_ctor_get(x_15, 0);
+x_20 = lean_ctor_get(x_15, 1);
+x_21 = lean_name_eq(x_4, x_19);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_free_object(x_15);
+x_22 = l_PersistentHashMap_mkCollisionNode___rarg(x_19, x_20, x_4, x_5);
+x_23 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_23, 0, x_22);
+x_24 = lean_array_fset(x_17, x_12, x_23);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_24);
+return x_1;
+}
+else
+{
+lean_object* x_25; 
+lean_dec(x_20);
+lean_dec(x_19);
+lean_ctor_set(x_15, 1, x_5);
+lean_ctor_set(x_15, 0, x_4);
+x_25 = lean_array_fset(x_17, x_12, x_15);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_25);
+return x_1;
+}
+}
+else
+{
+lean_object* x_26; lean_object* x_27; uint8_t x_28; 
+x_26 = lean_ctor_get(x_15, 0);
+x_27 = lean_ctor_get(x_15, 1);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_dec(x_15);
+x_28 = lean_name_eq(x_4, x_26);
+if (x_28 == 0)
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_29 = l_PersistentHashMap_mkCollisionNode___rarg(x_26, x_27, x_4, x_5);
+x_30 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_30, 0, x_29);
+x_31 = lean_array_fset(x_17, x_12, x_30);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_31);
+return x_1;
+}
+else
+{
+lean_object* x_32; lean_object* x_33; 
+lean_dec(x_27);
+lean_dec(x_26);
+x_32 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_32, 0, x_4);
+lean_ctor_set(x_32, 1, x_5);
+x_33 = lean_array_fset(x_17, x_12, x_32);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_33);
+return x_1;
+}
+}
+}
+case 1:
+{
+uint8_t x_34; 
+x_34 = !lean_is_exclusive(x_15);
+if (x_34 == 0)
+{
+lean_object* x_35; size_t x_36; size_t x_37; lean_object* x_38; lean_object* x_39; 
+x_35 = lean_ctor_get(x_15, 0);
+x_36 = x_2 >> x_9;
+x_37 = x_3 + x_8;
+x_38 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg(x_35, x_36, x_37, x_4, x_5);
+lean_ctor_set(x_15, 0, x_38);
+x_39 = lean_array_fset(x_17, x_12, x_15);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_39);
+return x_1;
+}
+else
+{
+lean_object* x_40; size_t x_41; size_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_40 = lean_ctor_get(x_15, 0);
+lean_inc(x_40);
+lean_dec(x_15);
+x_41 = x_2 >> x_9;
+x_42 = x_3 + x_8;
+x_43 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg(x_40, x_41, x_42, x_4, x_5);
+x_44 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_44, 0, x_43);
+x_45 = lean_array_fset(x_17, x_12, x_44);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_45);
+return x_1;
+}
+}
+default: 
+{
+lean_object* x_46; lean_object* x_47; 
+x_46 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_46, 0, x_4);
+lean_ctor_set(x_46, 1, x_5);
+x_47 = lean_array_fset(x_17, x_12, x_46);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_47);
+return x_1;
+}
+}
+}
+}
+else
+{
+lean_object* x_48; size_t x_49; size_t x_50; size_t x_51; size_t x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
+x_48 = lean_ctor_get(x_1, 0);
+lean_inc(x_48);
+lean_dec(x_1);
+x_49 = 1;
+x_50 = 5;
+x_51 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
+x_52 = x_2 & x_51;
+x_53 = lean_usize_to_nat(x_52);
+x_54 = lean_array_get_size(x_48);
+x_55 = lean_nat_dec_lt(x_53, x_54);
+lean_dec(x_54);
+if (x_55 == 0)
+{
+lean_object* x_56; 
+lean_dec(x_53);
+lean_dec(x_5);
+lean_dec(x_4);
+x_56 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_56, 0, x_48);
+return x_56;
+}
+else
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_array_fget(x_48, x_53);
+x_58 = lean_box(2);
+x_59 = lean_array_fset(x_48, x_53, x_58);
+switch (lean_obj_tag(x_57)) {
+case 0:
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
+x_60 = lean_ctor_get(x_57, 0);
+lean_inc(x_60);
+x_61 = lean_ctor_get(x_57, 1);
+lean_inc(x_61);
+if (lean_is_exclusive(x_57)) {
+ lean_ctor_release(x_57, 0);
+ lean_ctor_release(x_57, 1);
+ x_62 = x_57;
+} else {
+ lean_dec_ref(x_57);
+ x_62 = lean_box(0);
+}
+x_63 = lean_name_eq(x_4, x_60);
+if (x_63 == 0)
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+lean_dec(x_62);
+x_64 = l_PersistentHashMap_mkCollisionNode___rarg(x_60, x_61, x_4, x_5);
+x_65 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_65, 0, x_64);
+x_66 = lean_array_fset(x_59, x_53, x_65);
+lean_dec(x_53);
+x_67 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_67, 0, x_66);
+return x_67;
+}
+else
+{
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+lean_dec(x_61);
+lean_dec(x_60);
+if (lean_is_scalar(x_62)) {
+ x_68 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_68 = x_62;
+}
+lean_ctor_set(x_68, 0, x_4);
+lean_ctor_set(x_68, 1, x_5);
+x_69 = lean_array_fset(x_59, x_53, x_68);
+lean_dec(x_53);
+x_70 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_70, 0, x_69);
+return x_70;
+}
+}
+case 1:
+{
+lean_object* x_71; lean_object* x_72; size_t x_73; size_t x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_71 = lean_ctor_get(x_57, 0);
+lean_inc(x_71);
+if (lean_is_exclusive(x_57)) {
+ lean_ctor_release(x_57, 0);
+ x_72 = x_57;
+} else {
+ lean_dec_ref(x_57);
+ x_72 = lean_box(0);
+}
+x_73 = x_2 >> x_50;
+x_74 = x_3 + x_49;
+x_75 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg(x_71, x_73, x_74, x_4, x_5);
+if (lean_is_scalar(x_72)) {
+ x_76 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_76 = x_72;
+}
+lean_ctor_set(x_76, 0, x_75);
+x_77 = lean_array_fset(x_59, x_53, x_76);
+lean_dec(x_53);
+x_78 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_78, 0, x_77);
+return x_78;
+}
+default: 
+{
+lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_79 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_79, 0, x_4);
+lean_ctor_set(x_79, 1, x_5);
+x_80 = lean_array_fset(x_59, x_53, x_79);
+lean_dec(x_53);
+x_81 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_81, 0, x_80);
+return x_81;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_82; lean_object* x_83; size_t x_84; uint8_t x_85; 
+x_82 = lean_unsigned_to_nat(0u);
+x_83 = l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__12___rarg(x_1, x_82, x_4, x_5);
+x_84 = 7;
+x_85 = x_84 <= x_3;
+if (x_85 == 0)
+{
+lean_object* x_86; lean_object* x_87; uint8_t x_88; 
+x_86 = l_PersistentHashMap_getCollisionNodeSize___rarg(x_83);
+x_87 = lean_unsigned_to_nat(4u);
+x_88 = lean_nat_dec_lt(x_86, x_87);
+lean_dec(x_86);
+if (x_88 == 0)
+{
+lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_89 = lean_ctor_get(x_83, 0);
+lean_inc(x_89);
+x_90 = lean_ctor_get(x_83, 1);
+lean_inc(x_90);
+lean_dec(x_83);
+x_91 = l_PersistentHashMap_insertAux___main___rarg___closed__3;
+x_92 = l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13___rarg(x_3, x_89, x_90, x_89, x_82, x_91);
+lean_dec(x_90);
+lean_dec(x_89);
+return x_92;
+}
+else
+{
+return x_83;
+}
+}
+else
+{
+return x_83;
+}
+}
+}
+}
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg___boxed), 5, 0);
+return x_2;
+}
+}
+lean_object* l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__10___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_1);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = l_Lean_Name_hash(x_2);
+x_8 = 1;
+x_9 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg(x_5, x_7, x_8, x_2, x_3);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_6, x_10);
+lean_dec(x_6);
+lean_ctor_set(x_1, 1, x_11);
+lean_ctor_set(x_1, 0, x_9);
+return x_1;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_12 = lean_ctor_get(x_1, 0);
+x_13 = lean_ctor_get(x_1, 1);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_dec(x_1);
+x_14 = l_Lean_Name_hash(x_2);
+x_15 = 1;
+x_16 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg(x_12, x_14, x_15, x_2, x_3);
+x_17 = lean_unsigned_to_nat(1u);
+x_18 = lean_nat_add(x_13, x_17);
+lean_dec(x_13);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_16);
+lean_ctor_set(x_19, 1, x_18);
+return x_19;
+}
+}
+}
+lean_object* l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__10(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__10___rarg), 3, 0);
+return x_2;
+}
+}
+uint8_t l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+uint8_t x_3; 
+x_3 = 0;
+return x_3;
+}
+else
+{
+lean_object* x_4; lean_object* x_5; uint8_t x_6; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 2);
+x_6 = lean_name_eq(x_4, x_1);
+if (x_6 == 0)
+{
+x_2 = x_5;
+goto _start;
+}
+else
+{
+uint8_t x_8; 
+x_8 = 1;
+return x_8;
+}
+}
+}
+}
+lean_object* l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__18___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+return x_1;
+}
+else
+{
+uint8_t x_3; 
+x_3 = !lean_is_exclusive(x_2);
+if (x_3 == 0)
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 2);
+x_6 = lean_array_get_size(x_1);
+x_7 = l_Lean_Name_hash(x_4);
+x_8 = lean_usize_modn(x_7, x_6);
+lean_dec(x_6);
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
+x_2 = x_5;
+goto _start;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_dec(x_2);
+x_15 = lean_array_get_size(x_1);
+x_16 = l_Lean_Name_hash(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
+goto _start;
+}
+}
+}
+}
+lean_object* l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__18(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__18___rarg), 2, 0);
+return x_2;
+}
+}
+lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__17___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; uint8_t x_5; 
+x_4 = lean_array_get_size(x_2);
+x_5 = lean_nat_dec_lt(x_1, x_4);
+lean_dec(x_4);
+if (x_5 == 0)
+{
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+else
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_6 = lean_array_fget(x_2, x_1);
+x_7 = lean_box(0);
+x_8 = lean_array_fset(x_2, x_1, x_7);
+x_9 = l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__18___rarg(x_3, x_6);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_1, x_10);
+lean_dec(x_1);
+x_1 = x_11;
+x_2 = x_8;
+x_3 = x_9;
+goto _start;
+}
+}
+}
+lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__17(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__17___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__16___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_3 = lean_array_get_size(x_2);
+x_4 = lean_unsigned_to_nat(2u);
+x_5 = lean_nat_mul(x_3, x_4);
+lean_dec(x_3);
+x_6 = lean_box(0);
+x_7 = lean_mk_array(x_5, x_6);
+x_8 = lean_unsigned_to_nat(0u);
+x_9 = l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__17___rarg(x_8, x_2, x_7);
+x_10 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_10, 0, x_1);
+lean_ctor_set(x_10, 1, x_9);
+return x_10;
+}
+}
+lean_object* l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__16(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__16___rarg), 2, 0);
+return x_2;
+}
+}
+lean_object* l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+if (lean_obj_tag(x_3) == 0)
+{
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+else
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_3);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
+x_5 = lean_ctor_get(x_3, 0);
+x_6 = lean_ctor_get(x_3, 1);
+x_7 = lean_ctor_get(x_3, 2);
+x_8 = lean_name_eq(x_5, x_1);
+if (x_8 == 0)
+{
+lean_object* x_9; 
+x_9 = l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19___rarg(x_1, x_2, x_7);
+lean_ctor_set(x_3, 2, x_9);
+return x_3;
+}
+else
+{
+lean_dec(x_6);
+lean_dec(x_5);
+lean_ctor_set(x_3, 1, x_2);
+lean_ctor_set(x_3, 0, x_1);
+return x_3;
+}
+}
+else
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_10 = lean_ctor_get(x_3, 0);
+x_11 = lean_ctor_get(x_3, 1);
+x_12 = lean_ctor_get(x_3, 2);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_dec(x_3);
+x_13 = lean_name_eq(x_10, x_1);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19___rarg(x_1, x_2, x_12);
+x_15 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_15, 0, x_10);
+lean_ctor_set(x_15, 1, x_11);
+lean_ctor_set(x_15, 2, x_14);
+return x_15;
+}
+else
+{
+lean_object* x_16; 
+lean_dec(x_11);
+lean_dec(x_10);
+x_16 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_16, 0, x_1);
+lean_ctor_set(x_16, 1, x_2);
+lean_ctor_set(x_16, 2, x_12);
+return x_16;
+}
+}
+}
+}
+}
+lean_object* l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__14___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_1);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = lean_array_get_size(x_6);
+x_8 = l_Lean_Name_hash(x_2);
+x_9 = lean_usize_modn(x_8, x_7);
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15___rarg(x_2, x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
+lean_dec(x_5);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
+lean_dec(x_7);
+if (x_16 == 0)
+{
+lean_object* x_17; 
+lean_free_object(x_1);
+x_17 = l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__16___rarg(x_13, x_15);
+return x_17;
+}
+else
+{
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
+return x_1;
+}
+}
+else
+{
+lean_object* x_18; lean_object* x_19; 
+lean_dec(x_7);
+x_18 = l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19___rarg(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
+return x_1;
+}
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
+lean_dec(x_1);
+x_22 = lean_array_get_size(x_21);
+x_23 = l_Lean_Name_hash(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15___rarg(x_2, x_25);
+if (x_26 == 0)
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
+{
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__16___rarg(x_28, x_30);
+return x_32;
+}
+else
+{
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
+}
+}
+else
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__19___rarg(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
+}
+}
+}
+}
+lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__14(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__14___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__9___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
+if (x_4 == 0)
+{
+uint8_t x_5; 
+x_5 = !lean_is_exclusive(x_1);
+if (x_5 == 0)
+{
+lean_object* x_6; lean_object* x_7; 
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__10___rarg(x_6, x_2, x_3);
+lean_ctor_set(x_1, 1, x_7);
+return x_1;
+}
+else
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_8 = lean_ctor_get(x_1, 0);
+x_9 = lean_ctor_get(x_1, 1);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_dec(x_1);
+x_10 = l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__10___rarg(x_9, x_2, x_3);
+x_11 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_11, 0, x_8);
+lean_ctor_set(x_11, 1, x_10);
+lean_ctor_set_uint8(x_11, sizeof(void*)*2, x_4);
+return x_11;
+}
+}
+else
+{
+uint8_t x_12; 
+x_12 = !lean_is_exclusive(x_1);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_ctor_get(x_1, 0);
+x_14 = l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__14___rarg(x_13, x_2, x_3);
+lean_ctor_set(x_1, 0, x_14);
+return x_1;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_15 = lean_ctor_get(x_1, 0);
+x_16 = lean_ctor_get(x_1, 1);
+lean_inc(x_16);
+lean_inc(x_15);
+lean_dec(x_1);
+x_17 = l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__14___rarg(x_15, x_2, x_3);
+x_18 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_16);
+lean_ctor_set_uint8(x_18, sizeof(void*)*2, x_4);
+return x_18;
+}
+}
+}
+}
+lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__9(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__9___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__23___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
+x_5 = lean_ctor_get(x_1, 0);
+lean_inc(x_5);
+x_6 = lean_ctor_get(x_1, 1);
+lean_inc(x_6);
+x_7 = lean_array_get_size(x_5);
+x_8 = lean_nat_dec_lt(x_2, x_7);
+lean_dec(x_7);
+if (x_8 == 0)
+{
+uint8_t x_9; 
+lean_dec(x_2);
+x_9 = !lean_is_exclusive(x_1);
+if (x_9 == 0)
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_10 = lean_ctor_get(x_1, 1);
+lean_dec(x_10);
+x_11 = lean_ctor_get(x_1, 0);
+lean_dec(x_11);
+x_12 = lean_array_push(x_5, x_3);
+x_13 = lean_array_push(x_6, x_4);
+lean_ctor_set(x_1, 1, x_13);
+lean_ctor_set(x_1, 0, x_12);
+return x_1;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+lean_dec(x_1);
+x_14 = lean_array_push(x_5, x_3);
+x_15 = lean_array_push(x_6, x_4);
+x_16 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_16, 1, x_15);
+return x_16;
+}
+}
+else
+{
+lean_object* x_17; uint8_t x_18; 
+x_17 = lean_array_fget(x_5, x_2);
+x_18 = lean_name_eq(x_3, x_17);
+lean_dec(x_17);
+if (x_18 == 0)
+{
+lean_object* x_19; lean_object* x_20; 
+lean_dec(x_6);
+lean_dec(x_5);
+x_19 = lean_unsigned_to_nat(1u);
+x_20 = lean_nat_add(x_2, x_19);
+lean_dec(x_2);
+x_2 = x_20;
+goto _start;
+}
+else
+{
+uint8_t x_22; 
+x_22 = !lean_is_exclusive(x_1);
+if (x_22 == 0)
+{
+lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_23 = lean_ctor_get(x_1, 1);
+lean_dec(x_23);
+x_24 = lean_ctor_get(x_1, 0);
+lean_dec(x_24);
+x_25 = lean_array_fset(x_5, x_2, x_3);
+x_26 = lean_array_fset(x_6, x_2, x_4);
+lean_dec(x_2);
+lean_ctor_set(x_1, 1, x_26);
+lean_ctor_set(x_1, 0, x_25);
+return x_1;
+}
+else
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+lean_dec(x_1);
+x_27 = lean_array_fset(x_5, x_2, x_3);
+x_28 = lean_array_fset(x_6, x_2, x_4);
+lean_dec(x_2);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+return x_29;
+}
+}
+}
+}
+}
+lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__23(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__23___rarg), 4, 0);
+return x_2;
+}
+}
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24___rarg(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+lean_object* x_7; uint8_t x_8; 
+x_7 = lean_array_get_size(x_4);
+x_8 = lean_nat_dec_lt(x_5, x_7);
+lean_dec(x_7);
+if (x_8 == 0)
+{
+lean_dec(x_5);
+return x_6;
+}
+else
+{
+lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; size_t x_13; size_t x_14; size_t x_15; size_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_9 = lean_array_fget(x_4, x_5);
+x_10 = lean_array_fget(x_3, x_5);
+x_11 = l_Lean_Name_hash(x_9);
+x_12 = 1;
+x_13 = x_1 - x_12;
+x_14 = 5;
+x_15 = x_14 * x_13;
+x_16 = x_11 >> x_15;
+x_17 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(x_6, x_16, x_1, x_9, x_10);
+x_18 = lean_unsigned_to_nat(1u);
+x_19 = lean_nat_add(x_5, x_18);
+lean_dec(x_5);
+x_5 = x_19;
+x_6 = x_17;
+goto _start;
+}
+}
+}
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24___rarg___boxed), 6, 0);
+return x_2;
+}
+}
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+uint8_t x_6; 
+x_6 = !lean_is_exclusive(x_1);
+if (x_6 == 0)
+{
+lean_object* x_7; size_t x_8; size_t x_9; size_t x_10; size_t x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+x_7 = lean_ctor_get(x_1, 0);
+x_8 = 1;
+x_9 = 5;
+x_10 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
+x_11 = x_2 & x_10;
+x_12 = lean_usize_to_nat(x_11);
+x_13 = lean_array_get_size(x_7);
+x_14 = lean_nat_dec_lt(x_12, x_13);
+lean_dec(x_13);
+if (x_14 == 0)
+{
+lean_dec(x_12);
+lean_dec(x_5);
+lean_dec(x_4);
+return x_1;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_array_fget(x_7, x_12);
+x_16 = lean_box(2);
+x_17 = lean_array_fset(x_7, x_12, x_16);
+switch (lean_obj_tag(x_15)) {
+case 0:
+{
+uint8_t x_18; 
+x_18 = !lean_is_exclusive(x_15);
+if (x_18 == 0)
+{
+lean_object* x_19; lean_object* x_20; uint8_t x_21; 
+x_19 = lean_ctor_get(x_15, 0);
+x_20 = lean_ctor_get(x_15, 1);
+x_21 = lean_name_eq(x_4, x_19);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+lean_free_object(x_15);
+x_22 = l_PersistentHashMap_mkCollisionNode___rarg(x_19, x_20, x_4, x_5);
+x_23 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_23, 0, x_22);
+x_24 = lean_array_fset(x_17, x_12, x_23);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_24);
+return x_1;
+}
+else
+{
+lean_object* x_25; 
+lean_dec(x_20);
+lean_dec(x_19);
+lean_ctor_set(x_15, 1, x_5);
+lean_ctor_set(x_15, 0, x_4);
+x_25 = lean_array_fset(x_17, x_12, x_15);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_25);
+return x_1;
+}
+}
+else
+{
+lean_object* x_26; lean_object* x_27; uint8_t x_28; 
+x_26 = lean_ctor_get(x_15, 0);
+x_27 = lean_ctor_get(x_15, 1);
+lean_inc(x_27);
+lean_inc(x_26);
+lean_dec(x_15);
+x_28 = lean_name_eq(x_4, x_26);
+if (x_28 == 0)
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_29 = l_PersistentHashMap_mkCollisionNode___rarg(x_26, x_27, x_4, x_5);
+x_30 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_30, 0, x_29);
+x_31 = lean_array_fset(x_17, x_12, x_30);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_31);
+return x_1;
+}
+else
+{
+lean_object* x_32; lean_object* x_33; 
+lean_dec(x_27);
+lean_dec(x_26);
+x_32 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_32, 0, x_4);
+lean_ctor_set(x_32, 1, x_5);
+x_33 = lean_array_fset(x_17, x_12, x_32);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_33);
+return x_1;
+}
+}
+}
+case 1:
+{
+uint8_t x_34; 
+x_34 = !lean_is_exclusive(x_15);
+if (x_34 == 0)
+{
+lean_object* x_35; size_t x_36; size_t x_37; lean_object* x_38; lean_object* x_39; 
+x_35 = lean_ctor_get(x_15, 0);
+x_36 = x_2 >> x_9;
+x_37 = x_3 + x_8;
+x_38 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(x_35, x_36, x_37, x_4, x_5);
+lean_ctor_set(x_15, 0, x_38);
+x_39 = lean_array_fset(x_17, x_12, x_15);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_39);
+return x_1;
+}
+else
+{
+lean_object* x_40; size_t x_41; size_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_40 = lean_ctor_get(x_15, 0);
+lean_inc(x_40);
+lean_dec(x_15);
+x_41 = x_2 >> x_9;
+x_42 = x_3 + x_8;
+x_43 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(x_40, x_41, x_42, x_4, x_5);
+x_44 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_44, 0, x_43);
+x_45 = lean_array_fset(x_17, x_12, x_44);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_45);
+return x_1;
+}
+}
+default: 
+{
+lean_object* x_46; lean_object* x_47; 
+x_46 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_46, 0, x_4);
+lean_ctor_set(x_46, 1, x_5);
+x_47 = lean_array_fset(x_17, x_12, x_46);
+lean_dec(x_12);
+lean_ctor_set(x_1, 0, x_47);
+return x_1;
+}
+}
+}
+}
+else
+{
+lean_object* x_48; size_t x_49; size_t x_50; size_t x_51; size_t x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
+x_48 = lean_ctor_get(x_1, 0);
+lean_inc(x_48);
+lean_dec(x_1);
+x_49 = 1;
+x_50 = 5;
+x_51 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
+x_52 = x_2 & x_51;
+x_53 = lean_usize_to_nat(x_52);
+x_54 = lean_array_get_size(x_48);
+x_55 = lean_nat_dec_lt(x_53, x_54);
+lean_dec(x_54);
+if (x_55 == 0)
+{
+lean_object* x_56; 
+lean_dec(x_53);
+lean_dec(x_5);
+lean_dec(x_4);
+x_56 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_56, 0, x_48);
+return x_56;
+}
+else
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_array_fget(x_48, x_53);
+x_58 = lean_box(2);
+x_59 = lean_array_fset(x_48, x_53, x_58);
+switch (lean_obj_tag(x_57)) {
+case 0:
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
+x_60 = lean_ctor_get(x_57, 0);
+lean_inc(x_60);
+x_61 = lean_ctor_get(x_57, 1);
+lean_inc(x_61);
+if (lean_is_exclusive(x_57)) {
+ lean_ctor_release(x_57, 0);
+ lean_ctor_release(x_57, 1);
+ x_62 = x_57;
+} else {
+ lean_dec_ref(x_57);
+ x_62 = lean_box(0);
+}
+x_63 = lean_name_eq(x_4, x_60);
+if (x_63 == 0)
+{
+lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
+lean_dec(x_62);
+x_64 = l_PersistentHashMap_mkCollisionNode___rarg(x_60, x_61, x_4, x_5);
+x_65 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_65, 0, x_64);
+x_66 = lean_array_fset(x_59, x_53, x_65);
+lean_dec(x_53);
+x_67 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_67, 0, x_66);
+return x_67;
+}
+else
+{
+lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+lean_dec(x_61);
+lean_dec(x_60);
+if (lean_is_scalar(x_62)) {
+ x_68 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_68 = x_62;
+}
+lean_ctor_set(x_68, 0, x_4);
+lean_ctor_set(x_68, 1, x_5);
+x_69 = lean_array_fset(x_59, x_53, x_68);
+lean_dec(x_53);
+x_70 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_70, 0, x_69);
+return x_70;
+}
+}
+case 1:
+{
+lean_object* x_71; lean_object* x_72; size_t x_73; size_t x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_71 = lean_ctor_get(x_57, 0);
+lean_inc(x_71);
+if (lean_is_exclusive(x_57)) {
+ lean_ctor_release(x_57, 0);
+ x_72 = x_57;
+} else {
+ lean_dec_ref(x_57);
+ x_72 = lean_box(0);
+}
+x_73 = x_2 >> x_50;
+x_74 = x_3 + x_49;
+x_75 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(x_71, x_73, x_74, x_4, x_5);
+if (lean_is_scalar(x_72)) {
+ x_76 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_76 = x_72;
+}
+lean_ctor_set(x_76, 0, x_75);
+x_77 = lean_array_fset(x_59, x_53, x_76);
+lean_dec(x_53);
+x_78 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_78, 0, x_77);
+return x_78;
+}
+default: 
+{
+lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_79 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_79, 0, x_4);
+lean_ctor_set(x_79, 1, x_5);
+x_80 = lean_array_fset(x_59, x_53, x_79);
+lean_dec(x_53);
+x_81 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_81, 0, x_80);
+return x_81;
+}
+}
+}
+}
+}
+else
+{
+lean_object* x_82; lean_object* x_83; size_t x_84; uint8_t x_85; 
+x_82 = lean_unsigned_to_nat(0u);
+x_83 = l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__23___rarg(x_1, x_82, x_4, x_5);
+x_84 = 7;
+x_85 = x_84 <= x_3;
+if (x_85 == 0)
+{
+lean_object* x_86; lean_object* x_87; uint8_t x_88; 
+x_86 = l_PersistentHashMap_getCollisionNodeSize___rarg(x_83);
+x_87 = lean_unsigned_to_nat(4u);
+x_88 = lean_nat_dec_lt(x_86, x_87);
+lean_dec(x_86);
+if (x_88 == 0)
+{
+lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_89 = lean_ctor_get(x_83, 0);
+lean_inc(x_89);
+x_90 = lean_ctor_get(x_83, 1);
+lean_inc(x_90);
+lean_dec(x_83);
+x_91 = l_PersistentHashMap_insertAux___main___rarg___closed__3;
+x_92 = l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24___rarg(x_3, x_89, x_90, x_89, x_82, x_91);
+lean_dec(x_90);
+lean_dec(x_89);
+return x_92;
+}
+else
+{
+return x_83;
+}
+}
+else
+{
+return x_83;
+}
+}
+}
+}
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg___boxed), 5, 0);
+return x_2;
+}
+}
+lean_object* l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__21___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_1);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = l_Lean_Name_hash(x_2);
+x_8 = 1;
+x_9 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(x_5, x_7, x_8, x_2, x_3);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_6, x_10);
+lean_dec(x_6);
+lean_ctor_set(x_1, 1, x_11);
+lean_ctor_set(x_1, 0, x_9);
+return x_1;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_12 = lean_ctor_get(x_1, 0);
+x_13 = lean_ctor_get(x_1, 1);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_dec(x_1);
+x_14 = l_Lean_Name_hash(x_2);
+x_15 = 1;
+x_16 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(x_12, x_14, x_15, x_2, x_3);
+x_17 = lean_unsigned_to_nat(1u);
+x_18 = lean_nat_add(x_13, x_17);
+lean_dec(x_13);
+x_19 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_19, 0, x_16);
+lean_ctor_set(x_19, 1, x_18);
+return x_19;
+}
+}
+}
+lean_object* l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__21(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__21___rarg), 3, 0);
+return x_2;
+}
+}
+uint8_t l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+uint8_t x_3; 
+x_3 = 0;
+return x_3;
+}
+else
+{
+lean_object* x_4; lean_object* x_5; uint8_t x_6; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 2);
+x_6 = lean_name_eq(x_4, x_1);
+if (x_6 == 0)
+{
+x_2 = x_5;
+goto _start;
+}
+else
+{
+uint8_t x_8; 
+x_8 = 1;
+return x_8;
+}
+}
+}
+}
+lean_object* l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg___boxed), 2, 0);
+return x_2;
+}
+}
+lean_object* l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__29___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+return x_1;
+}
+else
+{
+uint8_t x_3; 
+x_3 = !lean_is_exclusive(x_2);
+if (x_3 == 0)
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_ctor_get(x_2, 2);
+x_6 = lean_array_get_size(x_1);
+x_7 = l_Lean_Name_hash(x_4);
+x_8 = lean_usize_modn(x_7, x_6);
+lean_dec(x_6);
+x_9 = lean_array_uget(x_1, x_8);
+lean_ctor_set(x_2, 2, x_9);
+x_10 = lean_array_uset(x_1, x_8, x_2);
+x_1 = x_10;
+x_2 = x_5;
+goto _start;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = lean_ctor_get(x_2, 2);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_inc(x_12);
+lean_dec(x_2);
+x_15 = lean_array_get_size(x_1);
+x_16 = l_Lean_Name_hash(x_12);
+x_17 = lean_usize_modn(x_16, x_15);
+lean_dec(x_15);
+x_18 = lean_array_uget(x_1, x_17);
+x_19 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_19, 0, x_12);
+lean_ctor_set(x_19, 1, x_13);
+lean_ctor_set(x_19, 2, x_18);
+x_20 = lean_array_uset(x_1, x_17, x_19);
+x_1 = x_20;
+x_2 = x_14;
+goto _start;
+}
+}
+}
+}
+lean_object* l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__29(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__29___rarg), 2, 0);
+return x_2;
+}
+}
+lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__28___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; uint8_t x_5; 
+x_4 = lean_array_get_size(x_2);
+x_5 = lean_nat_dec_lt(x_1, x_4);
+lean_dec(x_4);
+if (x_5 == 0)
+{
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+else
+{
+lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_6 = lean_array_fget(x_2, x_1);
+x_7 = lean_box(0);
+x_8 = lean_array_fset(x_2, x_1, x_7);
+x_9 = l_AssocList_foldlM___main___at_Lean_Elab_ElabFnTable_insert___spec__29___rarg(x_3, x_6);
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_1, x_10);
+lean_dec(x_1);
+x_1 = x_11;
+x_2 = x_8;
+x_3 = x_9;
+goto _start;
+}
+}
+}
+lean_object* l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__28(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__28___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__27___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_3 = lean_array_get_size(x_2);
+x_4 = lean_unsigned_to_nat(2u);
+x_5 = lean_nat_mul(x_3, x_4);
+lean_dec(x_3);
+x_6 = lean_box(0);
+x_7 = lean_mk_array(x_5, x_6);
+x_8 = lean_unsigned_to_nat(0u);
+x_9 = l_HashMapImp_moveEntries___main___at_Lean_Elab_ElabFnTable_insert___spec__28___rarg(x_8, x_2, x_7);
+x_10 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_10, 0, x_1);
+lean_ctor_set(x_10, 1, x_9);
+return x_10;
+}
+}
+lean_object* l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__27(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__27___rarg), 2, 0);
+return x_2;
+}
+}
+lean_object* l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__30___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+if (lean_obj_tag(x_3) == 0)
+{
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+else
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_3);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
+x_5 = lean_ctor_get(x_3, 0);
+x_6 = lean_ctor_get(x_3, 1);
+x_7 = lean_ctor_get(x_3, 2);
+x_8 = lean_name_eq(x_5, x_1);
+if (x_8 == 0)
+{
+lean_object* x_9; 
+x_9 = l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__30___rarg(x_1, x_2, x_7);
+lean_ctor_set(x_3, 2, x_9);
+return x_3;
+}
+else
+{
+lean_dec(x_6);
+lean_dec(x_5);
+lean_ctor_set(x_3, 1, x_2);
+lean_ctor_set(x_3, 0, x_1);
+return x_3;
+}
+}
+else
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_10 = lean_ctor_get(x_3, 0);
+x_11 = lean_ctor_get(x_3, 1);
+x_12 = lean_ctor_get(x_3, 2);
+lean_inc(x_12);
+lean_inc(x_11);
+lean_inc(x_10);
+lean_dec(x_3);
+x_13 = lean_name_eq(x_10, x_1);
+if (x_13 == 0)
+{
+lean_object* x_14; lean_object* x_15; 
+x_14 = l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__30___rarg(x_1, x_2, x_12);
+x_15 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_15, 0, x_10);
+lean_ctor_set(x_15, 1, x_11);
+lean_ctor_set(x_15, 2, x_14);
+return x_15;
+}
+else
+{
+lean_object* x_16; 
+lean_dec(x_11);
+lean_dec(x_10);
+x_16 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_16, 0, x_1);
+lean_ctor_set(x_16, 1, x_2);
+lean_ctor_set(x_16, 2, x_12);
+return x_16;
+}
+}
+}
+}
+}
+lean_object* l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__30(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__30___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__25___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_1);
+if (x_4 == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = lean_array_get_size(x_6);
+x_8 = l_Lean_Name_hash(x_2);
+x_9 = lean_usize_modn(x_8, x_7);
+x_10 = lean_array_uget(x_6, x_9);
+x_11 = l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg(x_2, x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
+x_12 = lean_unsigned_to_nat(1u);
+x_13 = lean_nat_add(x_5, x_12);
+lean_dec(x_5);
+x_14 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_14, 0, x_2);
+lean_ctor_set(x_14, 1, x_3);
+lean_ctor_set(x_14, 2, x_10);
+x_15 = lean_array_uset(x_6, x_9, x_14);
+x_16 = lean_nat_dec_le(x_13, x_7);
+lean_dec(x_7);
+if (x_16 == 0)
+{
+lean_object* x_17; 
+lean_free_object(x_1);
+x_17 = l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__27___rarg(x_13, x_15);
+return x_17;
+}
+else
+{
+lean_ctor_set(x_1, 1, x_15);
+lean_ctor_set(x_1, 0, x_13);
+return x_1;
+}
+}
+else
+{
+lean_object* x_18; lean_object* x_19; 
+lean_dec(x_7);
+x_18 = l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__30___rarg(x_2, x_3, x_10);
+x_19 = lean_array_uset(x_6, x_9, x_18);
+lean_ctor_set(x_1, 1, x_19);
+return x_1;
+}
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
+lean_dec(x_1);
+x_22 = lean_array_get_size(x_21);
+x_23 = l_Lean_Name_hash(x_2);
+x_24 = lean_usize_modn(x_23, x_22);
+x_25 = lean_array_uget(x_21, x_24);
+x_26 = l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg(x_2, x_25);
+if (x_26 == 0)
+{
+lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
+x_27 = lean_unsigned_to_nat(1u);
+x_28 = lean_nat_add(x_20, x_27);
+lean_dec(x_20);
+x_29 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_29, 0, x_2);
+lean_ctor_set(x_29, 1, x_3);
+lean_ctor_set(x_29, 2, x_25);
+x_30 = lean_array_uset(x_21, x_24, x_29);
+x_31 = lean_nat_dec_le(x_28, x_22);
+lean_dec(x_22);
+if (x_31 == 0)
+{
+lean_object* x_32; 
+x_32 = l_HashMapImp_expand___at_Lean_Elab_ElabFnTable_insert___spec__27___rarg(x_28, x_30);
+return x_32;
+}
+else
+{
+lean_object* x_33; 
+x_33 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_33, 0, x_28);
+lean_ctor_set(x_33, 1, x_30);
+return x_33;
+}
+}
+else
+{
+lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+lean_dec(x_22);
+x_34 = l_AssocList_replace___main___at_Lean_Elab_ElabFnTable_insert___spec__30___rarg(x_2, x_3, x_25);
+x_35 = lean_array_uset(x_21, x_24, x_34);
+x_36 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_36, 0, x_20);
+lean_ctor_set(x_36, 1, x_35);
+return x_36;
+}
+}
+}
+}
+lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__25(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__25___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__20___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+uint8_t x_4; 
+x_4 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
+if (x_4 == 0)
+{
+uint8_t x_5; 
+x_5 = !lean_is_exclusive(x_1);
+if (x_5 == 0)
+{
+lean_object* x_6; lean_object* x_7; 
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__21___rarg(x_6, x_2, x_3);
+lean_ctor_set(x_1, 1, x_7);
+return x_1;
+}
+else
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_8 = lean_ctor_get(x_1, 0);
+x_9 = lean_ctor_get(x_1, 1);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_dec(x_1);
+x_10 = l_PersistentHashMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__21___rarg(x_9, x_2, x_3);
+x_11 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_11, 0, x_8);
+lean_ctor_set(x_11, 1, x_10);
+lean_ctor_set_uint8(x_11, sizeof(void*)*2, x_4);
+return x_11;
+}
+}
+else
+{
+uint8_t x_12; 
+x_12 = !lean_is_exclusive(x_1);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_ctor_get(x_1, 0);
+x_14 = l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__25___rarg(x_13, x_2, x_3);
+lean_ctor_set(x_1, 0, x_14);
+return x_1;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_15 = lean_ctor_get(x_1, 0);
+x_16 = lean_ctor_get(x_1, 1);
+lean_inc(x_16);
+lean_inc(x_15);
+lean_dec(x_1);
+x_17 = l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__25___rarg(x_15, x_2, x_3);
+x_18 = lean_alloc_ctor(0, 2, 1);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_16);
+lean_ctor_set_uint8(x_18, sizeof(void*)*2, x_4);
+return x_18;
+}
+}
+}
+}
+lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__20(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__20___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_Lean_Elab_ElabFnTable_insert___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+lean_inc(x_1);
+x_4 = l_Lean_SMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__1___rarg(x_1, x_2);
+if (lean_obj_tag(x_4) == 0)
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_box(0);
+x_6 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_6, 0, x_3);
+lean_ctor_set(x_6, 1, x_5);
+x_7 = l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__9___rarg(x_1, x_2, x_6);
+return x_7;
+}
+else
+{
+lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+x_8 = lean_ctor_get(x_4, 0);
+lean_inc(x_8);
+lean_dec(x_4);
+x_9 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_9, 0, x_3);
+lean_ctor_set(x_9, 1, x_8);
+x_10 = l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__20___rarg(x_1, x_2, x_9);
+return x_10;
+}
+}
+}
+lean_object* l_Lean_Elab_ElabFnTable_insert(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Elab_ElabFnTable_insert___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_ElabFnTable_insert___spec__4___rarg___boxed(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; 
+x_6 = l_PersistentHashMap_findAtAux___main___at_Lean_Elab_ElabFnTable_insert___spec__4___rarg(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_5);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_6;
+}
+}
+lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_ElabFnTable_insert___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+size_t x_4; lean_object* x_5; 
+x_4 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_5 = l_PersistentHashMap_findAux___main___at_Lean_Elab_ElabFnTable_insert___spec__3___rarg(x_1, x_4, x_3);
+lean_dec(x_3);
+return x_5;
+}
+}
+lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_PersistentHashMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__2___rarg(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__6___rarg(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__5___rarg(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8___rarg(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7___rarg(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Lean_SMap_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__1___rarg(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+size_t x_7; lean_object* x_8; 
+x_7 = lean_unbox_usize(x_1);
+lean_dec(x_1);
+x_8 = l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13___rarg(x_7, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_8;
+}
+}
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+size_t x_6; size_t x_7; lean_object* x_8; 
+x_6 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_7 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_8 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__11___rarg(x_1, x_6, x_7, x_4, x_5);
+return x_8;
+}
+}
+lean_object* l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__15___rarg(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+_start:
+{
+size_t x_7; lean_object* x_8; 
+x_7 = lean_unbox_usize(x_1);
+lean_dec(x_1);
+x_8 = l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24___rarg(x_7, x_2, x_3, x_4, x_5, x_6);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_8;
+}
+}
+lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+size_t x_6; size_t x_7; lean_object* x_8; 
+x_6 = lean_unbox_usize(x_2);
+lean_dec(x_2);
+x_7 = lean_unbox_usize(x_3);
+lean_dec(x_3);
+x_8 = l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(x_1, x_6, x_7, x_4, x_5);
+return x_8;
+}
+}
+lean_object* l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
 lean_object* l_mkHashMap___at_Lean_Elab_ElabAttributeExtensionState_inhabited___spec__2___rarg(lean_object* x_1) {
 _start:
 {
@@ -970,947 +3396,7 @@ lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__4___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_5 = lean_ctor_get(x_1, 0);
-lean_inc(x_5);
-x_6 = lean_ctor_get(x_1, 1);
-lean_inc(x_6);
-x_7 = lean_array_get_size(x_5);
-x_8 = lean_nat_dec_lt(x_2, x_7);
-lean_dec(x_7);
-if (x_8 == 0)
-{
-uint8_t x_9; 
-lean_dec(x_2);
-x_9 = !lean_is_exclusive(x_1);
-if (x_9 == 0)
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_10 = lean_ctor_get(x_1, 1);
-lean_dec(x_10);
-x_11 = lean_ctor_get(x_1, 0);
-lean_dec(x_11);
-x_12 = lean_array_push(x_5, x_3);
-x_13 = lean_array_push(x_6, x_4);
-lean_ctor_set(x_1, 1, x_13);
-lean_ctor_set(x_1, 0, x_12);
-return x_1;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-lean_dec(x_1);
-x_14 = lean_array_push(x_5, x_3);
-x_15 = lean_array_push(x_6, x_4);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_14);
-lean_ctor_set(x_16, 1, x_15);
-return x_16;
-}
-}
-else
-{
-lean_object* x_17; uint8_t x_18; 
-x_17 = lean_array_fget(x_5, x_2);
-x_18 = lean_name_eq(x_3, x_17);
-lean_dec(x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; 
-lean_dec(x_6);
-lean_dec(x_5);
-x_19 = lean_unsigned_to_nat(1u);
-x_20 = lean_nat_add(x_2, x_19);
-lean_dec(x_2);
-x_2 = x_20;
-goto _start;
-}
-else
-{
-uint8_t x_22; 
-x_22 = !lean_is_exclusive(x_1);
-if (x_22 == 0)
-{
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_23 = lean_ctor_get(x_1, 1);
-lean_dec(x_23);
-x_24 = lean_ctor_get(x_1, 0);
-lean_dec(x_24);
-x_25 = lean_array_fset(x_5, x_2, x_3);
-x_26 = lean_array_fset(x_6, x_2, x_4);
-lean_dec(x_2);
-lean_ctor_set(x_1, 1, x_26);
-lean_ctor_set(x_1, 0, x_25);
-return x_1;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-lean_dec(x_1);
-x_27 = lean_array_fset(x_5, x_2, x_3);
-x_28 = lean_array_fset(x_6, x_2, x_4);
-lean_dec(x_2);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
-}
-}
-}
-}
-}
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__4(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__4___rarg), 4, 0);
-return x_2;
-}
-}
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__5___rarg(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; uint8_t x_8; 
-x_7 = lean_array_get_size(x_4);
-x_8 = lean_nat_dec_lt(x_5, x_7);
-lean_dec(x_7);
-if (x_8 == 0)
-{
-lean_dec(x_5);
-return x_6;
-}
-else
-{
-lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; size_t x_13; size_t x_14; size_t x_15; size_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_9 = lean_array_fget(x_4, x_5);
-x_10 = lean_array_fget(x_3, x_5);
-x_11 = l_Lean_Name_hash(x_9);
-x_12 = 1;
-x_13 = x_1 - x_12;
-x_14 = 5;
-x_15 = x_14 * x_13;
-x_16 = x_11 >> x_15;
-x_17 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg(x_6, x_16, x_1, x_9, x_10);
-x_18 = lean_unsigned_to_nat(1u);
-x_19 = lean_nat_add(x_5, x_18);
-lean_dec(x_5);
-x_5 = x_19;
-x_6 = x_17;
-goto _start;
-}
-}
-}
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__5(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__5___rarg___boxed), 6, 0);
-return x_2;
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-if (lean_obj_tag(x_1) == 0)
-{
-uint8_t x_6; 
-x_6 = !lean_is_exclusive(x_1);
-if (x_6 == 0)
-{
-lean_object* x_7; size_t x_8; size_t x_9; size_t x_10; size_t x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
-x_7 = lean_ctor_get(x_1, 0);
-x_8 = 1;
-x_9 = 5;
-x_10 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
-x_11 = x_2 & x_10;
-x_12 = lean_usize_to_nat(x_11);
-x_13 = lean_array_get_size(x_7);
-x_14 = lean_nat_dec_lt(x_12, x_13);
-lean_dec(x_13);
-if (x_14 == 0)
-{
-lean_dec(x_12);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_1;
-}
-else
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_15 = lean_array_fget(x_7, x_12);
-x_16 = lean_box(2);
-x_17 = lean_array_fset(x_7, x_12, x_16);
-switch (lean_obj_tag(x_15)) {
-case 0:
-{
-uint8_t x_18; 
-x_18 = !lean_is_exclusive(x_15);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; uint8_t x_21; 
-x_19 = lean_ctor_get(x_15, 0);
-x_20 = lean_ctor_get(x_15, 1);
-x_21 = lean_name_eq(x_4, x_19);
-if (x_21 == 0)
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-lean_free_object(x_15);
-x_22 = l_PersistentHashMap_mkCollisionNode___rarg(x_19, x_20, x_4, x_5);
-x_23 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_23, 0, x_22);
-x_24 = lean_array_fset(x_17, x_12, x_23);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_24);
-return x_1;
-}
-else
-{
-lean_object* x_25; 
-lean_dec(x_20);
-lean_dec(x_19);
-lean_ctor_set(x_15, 1, x_5);
-lean_ctor_set(x_15, 0, x_4);
-x_25 = lean_array_fset(x_17, x_12, x_15);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_25);
-return x_1;
-}
-}
-else
-{
-lean_object* x_26; lean_object* x_27; uint8_t x_28; 
-x_26 = lean_ctor_get(x_15, 0);
-x_27 = lean_ctor_get(x_15, 1);
-lean_inc(x_27);
-lean_inc(x_26);
-lean_dec(x_15);
-x_28 = lean_name_eq(x_4, x_26);
-if (x_28 == 0)
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = l_PersistentHashMap_mkCollisionNode___rarg(x_26, x_27, x_4, x_5);
-x_30 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_30, 0, x_29);
-x_31 = lean_array_fset(x_17, x_12, x_30);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_31);
-return x_1;
-}
-else
-{
-lean_object* x_32; lean_object* x_33; 
-lean_dec(x_27);
-lean_dec(x_26);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_4);
-lean_ctor_set(x_32, 1, x_5);
-x_33 = lean_array_fset(x_17, x_12, x_32);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_33);
-return x_1;
-}
-}
-}
-case 1:
-{
-uint8_t x_34; 
-x_34 = !lean_is_exclusive(x_15);
-if (x_34 == 0)
-{
-lean_object* x_35; size_t x_36; size_t x_37; lean_object* x_38; lean_object* x_39; 
-x_35 = lean_ctor_get(x_15, 0);
-x_36 = x_2 >> x_9;
-x_37 = x_3 + x_8;
-x_38 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg(x_35, x_36, x_37, x_4, x_5);
-lean_ctor_set(x_15, 0, x_38);
-x_39 = lean_array_fset(x_17, x_12, x_15);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_39);
-return x_1;
-}
-else
-{
-lean_object* x_40; size_t x_41; size_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_40 = lean_ctor_get(x_15, 0);
-lean_inc(x_40);
-lean_dec(x_15);
-x_41 = x_2 >> x_9;
-x_42 = x_3 + x_8;
-x_43 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg(x_40, x_41, x_42, x_4, x_5);
-x_44 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_44, 0, x_43);
-x_45 = lean_array_fset(x_17, x_12, x_44);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_45);
-return x_1;
-}
-}
-default: 
-{
-lean_object* x_46; lean_object* x_47; 
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_4);
-lean_ctor_set(x_46, 1, x_5);
-x_47 = lean_array_fset(x_17, x_12, x_46);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_47);
-return x_1;
-}
-}
-}
-}
-else
-{
-lean_object* x_48; size_t x_49; size_t x_50; size_t x_51; size_t x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
-x_48 = lean_ctor_get(x_1, 0);
-lean_inc(x_48);
-lean_dec(x_1);
-x_49 = 1;
-x_50 = 5;
-x_51 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
-x_52 = x_2 & x_51;
-x_53 = lean_usize_to_nat(x_52);
-x_54 = lean_array_get_size(x_48);
-x_55 = lean_nat_dec_lt(x_53, x_54);
-lean_dec(x_54);
-if (x_55 == 0)
-{
-lean_object* x_56; 
-lean_dec(x_53);
-lean_dec(x_5);
-lean_dec(x_4);
-x_56 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_56, 0, x_48);
-return x_56;
-}
-else
-{
-lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_57 = lean_array_fget(x_48, x_53);
-x_58 = lean_box(2);
-x_59 = lean_array_fset(x_48, x_53, x_58);
-switch (lean_obj_tag(x_57)) {
-case 0:
-{
-lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
-x_60 = lean_ctor_get(x_57, 0);
-lean_inc(x_60);
-x_61 = lean_ctor_get(x_57, 1);
-lean_inc(x_61);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- lean_ctor_release(x_57, 1);
- x_62 = x_57;
-} else {
- lean_dec_ref(x_57);
- x_62 = lean_box(0);
-}
-x_63 = lean_name_eq(x_4, x_60);
-if (x_63 == 0)
-{
-lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-lean_dec(x_62);
-x_64 = l_PersistentHashMap_mkCollisionNode___rarg(x_60, x_61, x_4, x_5);
-x_65 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_65, 0, x_64);
-x_66 = lean_array_fset(x_59, x_53, x_65);
-lean_dec(x_53);
-x_67 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_67, 0, x_66);
-return x_67;
-}
-else
-{
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-lean_dec(x_61);
-lean_dec(x_60);
-if (lean_is_scalar(x_62)) {
- x_68 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_68 = x_62;
-}
-lean_ctor_set(x_68, 0, x_4);
-lean_ctor_set(x_68, 1, x_5);
-x_69 = lean_array_fset(x_59, x_53, x_68);
-lean_dec(x_53);
-x_70 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_70, 0, x_69);
-return x_70;
-}
-}
-case 1:
-{
-lean_object* x_71; lean_object* x_72; size_t x_73; size_t x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_71 = lean_ctor_get(x_57, 0);
-lean_inc(x_71);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- x_72 = x_57;
-} else {
- lean_dec_ref(x_57);
- x_72 = lean_box(0);
-}
-x_73 = x_2 >> x_50;
-x_74 = x_3 + x_49;
-x_75 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg(x_71, x_73, x_74, x_4, x_5);
-if (lean_is_scalar(x_72)) {
- x_76 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_76 = x_72;
-}
-lean_ctor_set(x_76, 0, x_75);
-x_77 = lean_array_fset(x_59, x_53, x_76);
-lean_dec(x_53);
-x_78 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_78, 0, x_77);
-return x_78;
-}
-default: 
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_4);
-lean_ctor_set(x_79, 1, x_5);
-x_80 = lean_array_fset(x_59, x_53, x_79);
-lean_dec(x_53);
-x_81 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_81, 0, x_80);
-return x_81;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_82; lean_object* x_83; size_t x_84; uint8_t x_85; 
-x_82 = lean_unsigned_to_nat(0u);
-x_83 = l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__4___rarg(x_1, x_82, x_4, x_5);
-x_84 = 7;
-x_85 = x_84 <= x_3;
-if (x_85 == 0)
-{
-lean_object* x_86; lean_object* x_87; uint8_t x_88; 
-x_86 = l_PersistentHashMap_getCollisionNodeSize___rarg(x_83);
-x_87 = lean_unsigned_to_nat(4u);
-x_88 = lean_nat_dec_lt(x_86, x_87);
-lean_dec(x_86);
-if (x_88 == 0)
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_89 = lean_ctor_get(x_83, 0);
-lean_inc(x_89);
-x_90 = lean_ctor_get(x_83, 1);
-lean_inc(x_90);
-lean_dec(x_83);
-x_91 = l_PersistentHashMap_insertAux___main___rarg___closed__3;
-x_92 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__5___rarg(x_3, x_89, x_90, x_89, x_82, x_91);
-lean_dec(x_90);
-lean_dec(x_89);
-return x_92;
-}
-else
-{
-return x_83;
-}
-}
-else
-{
-return x_83;
-}
-}
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg___boxed), 5, 0);
-return x_2;
-}
-}
-lean_object* l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_1);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = l_Lean_Name_hash(x_2);
-x_8 = 1;
-x_9 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg(x_5, x_7, x_8, x_2, x_3);
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_nat_add(x_6, x_10);
-lean_dec(x_6);
-lean_ctor_set(x_1, 1, x_11);
-lean_ctor_set(x_1, 0, x_9);
-return x_1;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_12 = lean_ctor_get(x_1, 0);
-x_13 = lean_ctor_get(x_1, 1);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_dec(x_1);
-x_14 = l_Lean_Name_hash(x_2);
-x_15 = 1;
-x_16 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg(x_12, x_14, x_15, x_2, x_3);
-x_17 = lean_unsigned_to_nat(1u);
-x_18 = lean_nat_add(x_13, x_17);
-lean_dec(x_13);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_16);
-lean_ctor_set(x_19, 1, x_18);
-return x_19;
-}
-}
-}
-lean_object* l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg), 3, 0);
-return x_2;
-}
-}
-uint8_t l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7___rarg(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-uint8_t x_3; 
-x_3 = 0;
-return x_3;
-}
-else
-{
-lean_object* x_4; lean_object* x_5; uint8_t x_6; 
-x_4 = lean_ctor_get(x_2, 0);
-x_5 = lean_ctor_get(x_2, 2);
-x_6 = lean_name_eq(x_4, x_1);
-if (x_6 == 0)
-{
-x_2 = x_5;
-goto _start;
-}
-else
-{
-uint8_t x_8; 
-x_8 = 1;
-return x_8;
-}
-}
-}
-}
-lean_object* l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7___rarg___boxed), 2, 0);
-return x_2;
-}
-}
-lean_object* l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__10___rarg(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-return x_1;
-}
-else
-{
-uint8_t x_3; 
-x_3 = !lean_is_exclusive(x_2);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
-x_4 = lean_ctor_get(x_2, 0);
-x_5 = lean_ctor_get(x_2, 2);
-x_6 = lean_array_get_size(x_1);
-x_7 = l_Lean_Name_hash(x_4);
-x_8 = lean_usize_modn(x_7, x_6);
-lean_dec(x_6);
-x_9 = lean_array_uget(x_1, x_8);
-lean_ctor_set(x_2, 2, x_9);
-x_10 = lean_array_uset(x_1, x_8, x_2);
-x_1 = x_10;
-x_2 = x_5;
-goto _start;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_12 = lean_ctor_get(x_2, 0);
-x_13 = lean_ctor_get(x_2, 1);
-x_14 = lean_ctor_get(x_2, 2);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_dec(x_2);
-x_15 = lean_array_get_size(x_1);
-x_16 = l_Lean_Name_hash(x_12);
-x_17 = lean_usize_modn(x_16, x_15);
-lean_dec(x_15);
-x_18 = lean_array_uget(x_1, x_17);
-x_19 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_19, 0, x_12);
-lean_ctor_set(x_19, 1, x_13);
-lean_ctor_set(x_19, 2, x_18);
-x_20 = lean_array_uset(x_1, x_17, x_19);
-x_1 = x_20;
-x_2 = x_14;
-goto _start;
-}
-}
-}
-}
-lean_object* l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__10(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__10___rarg), 2, 0);
-return x_2;
-}
-}
-lean_object* l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__9___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; uint8_t x_5; 
-x_4 = lean_array_get_size(x_2);
-x_5 = lean_nat_dec_lt(x_1, x_4);
-lean_dec(x_4);
-if (x_5 == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_3;
-}
-else
-{
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_6 = lean_array_fget(x_2, x_1);
-x_7 = lean_box(0);
-x_8 = lean_array_fset(x_2, x_1, x_7);
-x_9 = l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__10___rarg(x_3, x_6);
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_nat_add(x_1, x_10);
-lean_dec(x_1);
-x_1 = x_11;
-x_2 = x_8;
-x_3 = x_9;
-goto _start;
-}
-}
-}
-lean_object* l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__9(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__9___rarg), 3, 0);
-return x_2;
-}
-}
-lean_object* l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__8___rarg(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_3 = lean_array_get_size(x_2);
-x_4 = lean_unsigned_to_nat(2u);
-x_5 = lean_nat_mul(x_3, x_4);
-lean_dec(x_3);
-x_6 = lean_box(0);
-x_7 = lean_mk_array(x_5, x_6);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__9___rarg(x_8, x_2, x_7);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_1);
-lean_ctor_set(x_10, 1, x_9);
-return x_10;
-}
-}
-lean_object* l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__8(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__8___rarg), 2, 0);
-return x_2;
-}
-}
-lean_object* l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__11___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-if (lean_obj_tag(x_3) == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_3;
-}
-else
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_3);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_5 = lean_ctor_get(x_3, 0);
-x_6 = lean_ctor_get(x_3, 1);
-x_7 = lean_ctor_get(x_3, 2);
-x_8 = lean_name_eq(x_5, x_1);
-if (x_8 == 0)
-{
-lean_object* x_9; 
-x_9 = l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__11___rarg(x_1, x_2, x_7);
-lean_ctor_set(x_3, 2, x_9);
-return x_3;
-}
-else
-{
-lean_dec(x_6);
-lean_dec(x_5);
-lean_ctor_set(x_3, 1, x_2);
-lean_ctor_set(x_3, 0, x_1);
-return x_3;
-}
-}
-else
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
-x_10 = lean_ctor_get(x_3, 0);
-x_11 = lean_ctor_get(x_3, 1);
-x_12 = lean_ctor_get(x_3, 2);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_dec(x_3);
-x_13 = lean_name_eq(x_10, x_1);
-if (x_13 == 0)
-{
-lean_object* x_14; lean_object* x_15; 
-x_14 = l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__11___rarg(x_1, x_2, x_12);
-x_15 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_15, 0, x_10);
-lean_ctor_set(x_15, 1, x_11);
-lean_ctor_set(x_15, 2, x_14);
-return x_15;
-}
-else
-{
-lean_object* x_16; 
-lean_dec(x_11);
-lean_dec(x_10);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_1);
-lean_ctor_set(x_16, 1, x_2);
-lean_ctor_set(x_16, 2, x_12);
-return x_16;
-}
-}
-}
-}
-}
-lean_object* l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__11(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__11___rarg), 3, 0);
-return x_2;
-}
-}
-lean_object* l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__6___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_1);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = lean_array_get_size(x_6);
-x_8 = l_Lean_Name_hash(x_2);
-x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_array_uget(x_6, x_9);
-x_11 = l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7___rarg(x_2, x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
-x_12 = lean_unsigned_to_nat(1u);
-x_13 = lean_nat_add(x_5, x_12);
-lean_dec(x_5);
-x_14 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_14, 0, x_2);
-lean_ctor_set(x_14, 1, x_3);
-lean_ctor_set(x_14, 2, x_10);
-x_15 = lean_array_uset(x_6, x_9, x_14);
-x_16 = lean_nat_dec_le(x_13, x_7);
-lean_dec(x_7);
-if (x_16 == 0)
-{
-lean_object* x_17; 
-lean_free_object(x_1);
-x_17 = l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__8___rarg(x_13, x_15);
-return x_17;
-}
-else
-{
-lean_ctor_set(x_1, 1, x_15);
-lean_ctor_set(x_1, 0, x_13);
-return x_1;
-}
-}
-else
-{
-lean_object* x_18; lean_object* x_19; 
-lean_dec(x_7);
-x_18 = l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__11___rarg(x_2, x_3, x_10);
-x_19 = lean_array_uset(x_6, x_9, x_18);
-lean_ctor_set(x_1, 1, x_19);
-return x_1;
-}
-}
-else
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
-x_20 = lean_ctor_get(x_1, 0);
-x_21 = lean_ctor_get(x_1, 1);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_dec(x_1);
-x_22 = lean_array_get_size(x_21);
-x_23 = l_Lean_Name_hash(x_2);
-x_24 = lean_usize_modn(x_23, x_22);
-x_25 = lean_array_uget(x_21, x_24);
-x_26 = l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7___rarg(x_2, x_25);
-if (x_26 == 0)
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_27 = lean_unsigned_to_nat(1u);
-x_28 = lean_nat_add(x_20, x_27);
-lean_dec(x_20);
-x_29 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_29, 0, x_2);
-lean_ctor_set(x_29, 1, x_3);
-lean_ctor_set(x_29, 2, x_25);
-x_30 = lean_array_uset(x_21, x_24, x_29);
-x_31 = lean_nat_dec_le(x_28, x_22);
-lean_dec(x_22);
-if (x_31 == 0)
-{
-lean_object* x_32; 
-x_32 = l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__8___rarg(x_28, x_30);
-return x_32;
-}
-else
-{
-lean_object* x_33; 
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_28);
-lean_ctor_set(x_33, 1, x_30);
-return x_33;
-}
-}
-else
-{
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-lean_dec(x_22);
-x_34 = l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__11___rarg(x_2, x_3, x_25);
-x_35 = lean_array_uset(x_21, x_24, x_34);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_20);
-lean_ctor_set(x_36, 1, x_35);
-return x_36;
-}
-}
-}
-}
-lean_object* l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__6(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__6___rarg), 3, 0);
-return x_2;
-}
-}
-lean_object* l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
-if (x_4 == 0)
-{
-uint8_t x_5; 
-x_5 = !lean_is_exclusive(x_1);
-if (x_5 == 0)
-{
-lean_object* x_6; lean_object* x_7; 
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg(x_6, x_2, x_3);
-lean_ctor_set(x_1, 1, x_7);
-return x_1;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_8 = lean_ctor_get(x_1, 0);
-x_9 = lean_ctor_get(x_1, 1);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_dec(x_1);
-x_10 = l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg(x_9, x_2, x_3);
-x_11 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_11, 0, x_8);
-lean_ctor_set(x_11, 1, x_10);
-lean_ctor_set_uint8(x_11, sizeof(void*)*2, x_4);
-return x_11;
-}
-}
-else
-{
-uint8_t x_12; 
-x_12 = !lean_is_exclusive(x_1);
-if (x_12 == 0)
-{
-lean_object* x_13; lean_object* x_14; 
-x_13 = lean_ctor_get(x_1, 0);
-x_14 = l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__6___rarg(x_13, x_2, x_3);
-lean_ctor_set(x_1, 0, x_14);
-return x_1;
-}
-else
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_15 = lean_ctor_get(x_1, 0);
-x_16 = lean_ctor_get(x_1, 1);
-lean_inc(x_16);
-lean_inc(x_15);
-lean_dec(x_1);
-x_17 = l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__6___rarg(x_15, x_2, x_3);
-x_18 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_16);
-lean_ctor_set_uint8(x_18, sizeof(void*)*2, x_4);
-return x_18;
-}
-}
-}
-}
-lean_object* l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg), 3, 0);
-return x_2;
-}
-}
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__12___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; 
@@ -1965,7 +3451,7 @@ lean_dec(x_15);
 x_19 = lean_ctor_get(x_11, 0);
 lean_inc(x_19);
 lean_dec(x_11);
-x_20 = l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg(x_6, x_19, x_18);
+x_20 = l_Lean_Elab_ElabFnTable_insert___rarg(x_6, x_19, x_18);
 x_5 = x_13;
 x_6 = x_20;
 goto _start;
@@ -1973,15 +3459,15 @@ goto _start;
 }
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__12(lean_object* x_1) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__12___rarg___boxed), 7, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg___boxed), 7, 0);
 return x_2;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__13___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; 
@@ -2009,7 +3495,7 @@ lean_dec(x_5);
 x_14 = lean_unsigned_to_nat(0u);
 lean_inc(x_2);
 lean_inc(x_1);
-x_15 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__12___rarg(x_1, x_2, x_11, x_11, x_14, x_6, x_7);
+x_15 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg(x_1, x_2, x_11, x_11, x_14, x_6, x_7);
 lean_dec(x_11);
 if (lean_obj_tag(x_15) == 0)
 {
@@ -2052,11 +3538,11 @@ return x_22;
 }
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__13(lean_object* x_1) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__13___rarg___boxed), 7, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg___boxed), 7, 0);
 return x_2;
 }
 }
@@ -2074,7 +3560,7 @@ x_8 = lean_ctor_get(x_6, 1);
 lean_inc(x_8);
 lean_dec(x_6);
 x_9 = lean_unsigned_to_nat(0u);
-x_10 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__13___rarg(x_1, x_3, x_4, x_4, x_9, x_7, x_8);
+x_10 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg(x_1, x_3, x_4, x_4, x_9, x_7, x_8);
 if (lean_obj_tag(x_10) == 0)
 {
 uint8_t x_11; 
@@ -2165,57 +3651,21 @@ x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_Util_4__ElabAttribut
 return x_2;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-size_t x_7; lean_object* x_8; 
-x_7 = lean_unbox_usize(x_1);
-lean_dec(x_1);
-x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__5___rarg(x_7, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-return x_8;
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-size_t x_6; size_t x_7; lean_object* x_8; 
-x_6 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_7 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_8 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__3___rarg(x_1, x_6, x_7, x_4, x_5);
-return x_8;
-}
-}
-lean_object* l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7___rarg___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; lean_object* x_4; 
-x_3 = l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__7___rarg(x_1, x_2);
-lean_dec(x_2);
-lean_dec(x_1);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__12___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__12___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_4);
 lean_dec(x_3);
 return x_8;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__13___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__13___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___spec__2___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_4);
 lean_dec(x_3);
 return x_8;
@@ -2231,946 +3681,6 @@ lean_dec(x_2);
 return x_6;
 }
 }
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__4___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_5 = lean_ctor_get(x_1, 0);
-lean_inc(x_5);
-x_6 = lean_ctor_get(x_1, 1);
-lean_inc(x_6);
-x_7 = lean_array_get_size(x_5);
-x_8 = lean_nat_dec_lt(x_2, x_7);
-lean_dec(x_7);
-if (x_8 == 0)
-{
-uint8_t x_9; 
-lean_dec(x_2);
-x_9 = !lean_is_exclusive(x_1);
-if (x_9 == 0)
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_10 = lean_ctor_get(x_1, 1);
-lean_dec(x_10);
-x_11 = lean_ctor_get(x_1, 0);
-lean_dec(x_11);
-x_12 = lean_array_push(x_5, x_3);
-x_13 = lean_array_push(x_6, x_4);
-lean_ctor_set(x_1, 1, x_13);
-lean_ctor_set(x_1, 0, x_12);
-return x_1;
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-lean_dec(x_1);
-x_14 = lean_array_push(x_5, x_3);
-x_15 = lean_array_push(x_6, x_4);
-x_16 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_16, 0, x_14);
-lean_ctor_set(x_16, 1, x_15);
-return x_16;
-}
-}
-else
-{
-lean_object* x_17; uint8_t x_18; 
-x_17 = lean_array_fget(x_5, x_2);
-x_18 = lean_name_eq(x_3, x_17);
-lean_dec(x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; 
-lean_dec(x_6);
-lean_dec(x_5);
-x_19 = lean_unsigned_to_nat(1u);
-x_20 = lean_nat_add(x_2, x_19);
-lean_dec(x_2);
-x_2 = x_20;
-goto _start;
-}
-else
-{
-uint8_t x_22; 
-x_22 = !lean_is_exclusive(x_1);
-if (x_22 == 0)
-{
-lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_23 = lean_ctor_get(x_1, 1);
-lean_dec(x_23);
-x_24 = lean_ctor_get(x_1, 0);
-lean_dec(x_24);
-x_25 = lean_array_fset(x_5, x_2, x_3);
-x_26 = lean_array_fset(x_6, x_2, x_4);
-lean_dec(x_2);
-lean_ctor_set(x_1, 1, x_26);
-lean_ctor_set(x_1, 0, x_25);
-return x_1;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-lean_dec(x_1);
-x_27 = lean_array_fset(x_5, x_2, x_3);
-x_28 = lean_array_fset(x_6, x_2, x_4);
-lean_dec(x_2);
-x_29 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_29, 0, x_27);
-lean_ctor_set(x_29, 1, x_28);
-return x_29;
-}
-}
-}
-}
-}
-lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__4(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__4___rarg), 4, 0);
-return x_2;
-}
-}
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__5___rarg(size_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-lean_object* x_7; uint8_t x_8; 
-x_7 = lean_array_get_size(x_4);
-x_8 = lean_nat_dec_lt(x_5, x_7);
-lean_dec(x_7);
-if (x_8 == 0)
-{
-lean_dec(x_5);
-return x_6;
-}
-else
-{
-lean_object* x_9; lean_object* x_10; size_t x_11; size_t x_12; size_t x_13; size_t x_14; size_t x_15; size_t x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_9 = lean_array_fget(x_4, x_5);
-x_10 = lean_array_fget(x_3, x_5);
-x_11 = l_Lean_Name_hash(x_9);
-x_12 = 1;
-x_13 = x_1 - x_12;
-x_14 = 5;
-x_15 = x_14 * x_13;
-x_16 = x_11 >> x_15;
-x_17 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg(x_6, x_16, x_1, x_9, x_10);
-x_18 = lean_unsigned_to_nat(1u);
-x_19 = lean_nat_add(x_5, x_18);
-lean_dec(x_5);
-x_5 = x_19;
-x_6 = x_17;
-goto _start;
-}
-}
-}
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__5(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__5___rarg___boxed), 6, 0);
-return x_2;
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-if (lean_obj_tag(x_1) == 0)
-{
-uint8_t x_6; 
-x_6 = !lean_is_exclusive(x_1);
-if (x_6 == 0)
-{
-lean_object* x_7; size_t x_8; size_t x_9; size_t x_10; size_t x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
-x_7 = lean_ctor_get(x_1, 0);
-x_8 = 1;
-x_9 = 5;
-x_10 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
-x_11 = x_2 & x_10;
-x_12 = lean_usize_to_nat(x_11);
-x_13 = lean_array_get_size(x_7);
-x_14 = lean_nat_dec_lt(x_12, x_13);
-lean_dec(x_13);
-if (x_14 == 0)
-{
-lean_dec(x_12);
-lean_dec(x_5);
-lean_dec(x_4);
-return x_1;
-}
-else
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; 
-x_15 = lean_array_fget(x_7, x_12);
-x_16 = lean_box(2);
-x_17 = lean_array_fset(x_7, x_12, x_16);
-switch (lean_obj_tag(x_15)) {
-case 0:
-{
-uint8_t x_18; 
-x_18 = !lean_is_exclusive(x_15);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; uint8_t x_21; 
-x_19 = lean_ctor_get(x_15, 0);
-x_20 = lean_ctor_get(x_15, 1);
-x_21 = lean_name_eq(x_4, x_19);
-if (x_21 == 0)
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-lean_free_object(x_15);
-x_22 = l_PersistentHashMap_mkCollisionNode___rarg(x_19, x_20, x_4, x_5);
-x_23 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_23, 0, x_22);
-x_24 = lean_array_fset(x_17, x_12, x_23);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_24);
-return x_1;
-}
-else
-{
-lean_object* x_25; 
-lean_dec(x_20);
-lean_dec(x_19);
-lean_ctor_set(x_15, 1, x_5);
-lean_ctor_set(x_15, 0, x_4);
-x_25 = lean_array_fset(x_17, x_12, x_15);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_25);
-return x_1;
-}
-}
-else
-{
-lean_object* x_26; lean_object* x_27; uint8_t x_28; 
-x_26 = lean_ctor_get(x_15, 0);
-x_27 = lean_ctor_get(x_15, 1);
-lean_inc(x_27);
-lean_inc(x_26);
-lean_dec(x_15);
-x_28 = lean_name_eq(x_4, x_26);
-if (x_28 == 0)
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = l_PersistentHashMap_mkCollisionNode___rarg(x_26, x_27, x_4, x_5);
-x_30 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_30, 0, x_29);
-x_31 = lean_array_fset(x_17, x_12, x_30);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_31);
-return x_1;
-}
-else
-{
-lean_object* x_32; lean_object* x_33; 
-lean_dec(x_27);
-lean_dec(x_26);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_4);
-lean_ctor_set(x_32, 1, x_5);
-x_33 = lean_array_fset(x_17, x_12, x_32);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_33);
-return x_1;
-}
-}
-}
-case 1:
-{
-uint8_t x_34; 
-x_34 = !lean_is_exclusive(x_15);
-if (x_34 == 0)
-{
-lean_object* x_35; size_t x_36; size_t x_37; lean_object* x_38; lean_object* x_39; 
-x_35 = lean_ctor_get(x_15, 0);
-x_36 = x_2 >> x_9;
-x_37 = x_3 + x_8;
-x_38 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg(x_35, x_36, x_37, x_4, x_5);
-lean_ctor_set(x_15, 0, x_38);
-x_39 = lean_array_fset(x_17, x_12, x_15);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_39);
-return x_1;
-}
-else
-{
-lean_object* x_40; size_t x_41; size_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-x_40 = lean_ctor_get(x_15, 0);
-lean_inc(x_40);
-lean_dec(x_15);
-x_41 = x_2 >> x_9;
-x_42 = x_3 + x_8;
-x_43 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg(x_40, x_41, x_42, x_4, x_5);
-x_44 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_44, 0, x_43);
-x_45 = lean_array_fset(x_17, x_12, x_44);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_45);
-return x_1;
-}
-}
-default: 
-{
-lean_object* x_46; lean_object* x_47; 
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_4);
-lean_ctor_set(x_46, 1, x_5);
-x_47 = lean_array_fset(x_17, x_12, x_46);
-lean_dec(x_12);
-lean_ctor_set(x_1, 0, x_47);
-return x_1;
-}
-}
-}
-}
-else
-{
-lean_object* x_48; size_t x_49; size_t x_50; size_t x_51; size_t x_52; lean_object* x_53; lean_object* x_54; uint8_t x_55; 
-x_48 = lean_ctor_get(x_1, 0);
-lean_inc(x_48);
-lean_dec(x_1);
-x_49 = 1;
-x_50 = 5;
-x_51 = l_PersistentHashMap_insertAux___main___rarg___closed__2;
-x_52 = x_2 & x_51;
-x_53 = lean_usize_to_nat(x_52);
-x_54 = lean_array_get_size(x_48);
-x_55 = lean_nat_dec_lt(x_53, x_54);
-lean_dec(x_54);
-if (x_55 == 0)
-{
-lean_object* x_56; 
-lean_dec(x_53);
-lean_dec(x_5);
-lean_dec(x_4);
-x_56 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_56, 0, x_48);
-return x_56;
-}
-else
-{
-lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_57 = lean_array_fget(x_48, x_53);
-x_58 = lean_box(2);
-x_59 = lean_array_fset(x_48, x_53, x_58);
-switch (lean_obj_tag(x_57)) {
-case 0:
-{
-lean_object* x_60; lean_object* x_61; lean_object* x_62; uint8_t x_63; 
-x_60 = lean_ctor_get(x_57, 0);
-lean_inc(x_60);
-x_61 = lean_ctor_get(x_57, 1);
-lean_inc(x_61);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- lean_ctor_release(x_57, 1);
- x_62 = x_57;
-} else {
- lean_dec_ref(x_57);
- x_62 = lean_box(0);
-}
-x_63 = lean_name_eq(x_4, x_60);
-if (x_63 == 0)
-{
-lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; 
-lean_dec(x_62);
-x_64 = l_PersistentHashMap_mkCollisionNode___rarg(x_60, x_61, x_4, x_5);
-x_65 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_65, 0, x_64);
-x_66 = lean_array_fset(x_59, x_53, x_65);
-lean_dec(x_53);
-x_67 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_67, 0, x_66);
-return x_67;
-}
-else
-{
-lean_object* x_68; lean_object* x_69; lean_object* x_70; 
-lean_dec(x_61);
-lean_dec(x_60);
-if (lean_is_scalar(x_62)) {
- x_68 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_68 = x_62;
-}
-lean_ctor_set(x_68, 0, x_4);
-lean_ctor_set(x_68, 1, x_5);
-x_69 = lean_array_fset(x_59, x_53, x_68);
-lean_dec(x_53);
-x_70 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_70, 0, x_69);
-return x_70;
-}
-}
-case 1:
-{
-lean_object* x_71; lean_object* x_72; size_t x_73; size_t x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-x_71 = lean_ctor_get(x_57, 0);
-lean_inc(x_71);
-if (lean_is_exclusive(x_57)) {
- lean_ctor_release(x_57, 0);
- x_72 = x_57;
-} else {
- lean_dec_ref(x_57);
- x_72 = lean_box(0);
-}
-x_73 = x_2 >> x_50;
-x_74 = x_3 + x_49;
-x_75 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg(x_71, x_73, x_74, x_4, x_5);
-if (lean_is_scalar(x_72)) {
- x_76 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_76 = x_72;
-}
-lean_ctor_set(x_76, 0, x_75);
-x_77 = lean_array_fset(x_59, x_53, x_76);
-lean_dec(x_53);
-x_78 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_78, 0, x_77);
-return x_78;
-}
-default: 
-{
-lean_object* x_79; lean_object* x_80; lean_object* x_81; 
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_4);
-lean_ctor_set(x_79, 1, x_5);
-x_80 = lean_array_fset(x_59, x_53, x_79);
-lean_dec(x_53);
-x_81 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_81, 0, x_80);
-return x_81;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_82; lean_object* x_83; size_t x_84; uint8_t x_85; 
-x_82 = lean_unsigned_to_nat(0u);
-x_83 = l_PersistentHashMap_insertAtCollisionNodeAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__4___rarg(x_1, x_82, x_4, x_5);
-x_84 = 7;
-x_85 = x_84 <= x_3;
-if (x_85 == 0)
-{
-lean_object* x_86; lean_object* x_87; uint8_t x_88; 
-x_86 = l_PersistentHashMap_getCollisionNodeSize___rarg(x_83);
-x_87 = lean_unsigned_to_nat(4u);
-x_88 = lean_nat_dec_lt(x_86, x_87);
-lean_dec(x_86);
-if (x_88 == 0)
-{
-lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_89 = lean_ctor_get(x_83, 0);
-lean_inc(x_89);
-x_90 = lean_ctor_get(x_83, 1);
-lean_inc(x_90);
-lean_dec(x_83);
-x_91 = l_PersistentHashMap_insertAux___main___rarg___closed__3;
-x_92 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__5___rarg(x_3, x_89, x_90, x_89, x_82, x_91);
-lean_dec(x_90);
-lean_dec(x_89);
-return x_92;
-}
-else
-{
-return x_83;
-}
-}
-else
-{
-return x_83;
-}
-}
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg___boxed), 5, 0);
-return x_2;
-}
-}
-lean_object* l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_1);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = l_Lean_Name_hash(x_2);
-x_8 = 1;
-x_9 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg(x_5, x_7, x_8, x_2, x_3);
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_nat_add(x_6, x_10);
-lean_dec(x_6);
-lean_ctor_set(x_1, 1, x_11);
-lean_ctor_set(x_1, 0, x_9);
-return x_1;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_12 = lean_ctor_get(x_1, 0);
-x_13 = lean_ctor_get(x_1, 1);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_dec(x_1);
-x_14 = l_Lean_Name_hash(x_2);
-x_15 = 1;
-x_16 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg(x_12, x_14, x_15, x_2, x_3);
-x_17 = lean_unsigned_to_nat(1u);
-x_18 = lean_nat_add(x_13, x_17);
-lean_dec(x_13);
-x_19 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_19, 0, x_16);
-lean_ctor_set(x_19, 1, x_18);
-return x_19;
-}
-}
-}
-lean_object* l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__2(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__2___rarg), 3, 0);
-return x_2;
-}
-}
-uint8_t l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7___rarg(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-uint8_t x_3; 
-x_3 = 0;
-return x_3;
-}
-else
-{
-lean_object* x_4; lean_object* x_5; uint8_t x_6; 
-x_4 = lean_ctor_get(x_2, 0);
-x_5 = lean_ctor_get(x_2, 2);
-x_6 = lean_name_eq(x_4, x_1);
-if (x_6 == 0)
-{
-x_2 = x_5;
-goto _start;
-}
-else
-{
-uint8_t x_8; 
-x_8 = 1;
-return x_8;
-}
-}
-}
-}
-lean_object* l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7___rarg___boxed), 2, 0);
-return x_2;
-}
-}
-lean_object* l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__10___rarg(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-if (lean_obj_tag(x_2) == 0)
-{
-return x_1;
-}
-else
-{
-uint8_t x_3; 
-x_3 = !lean_is_exclusive(x_2);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; size_t x_7; size_t x_8; lean_object* x_9; lean_object* x_10; 
-x_4 = lean_ctor_get(x_2, 0);
-x_5 = lean_ctor_get(x_2, 2);
-x_6 = lean_array_get_size(x_1);
-x_7 = l_Lean_Name_hash(x_4);
-x_8 = lean_usize_modn(x_7, x_6);
-lean_dec(x_6);
-x_9 = lean_array_uget(x_1, x_8);
-lean_ctor_set(x_2, 2, x_9);
-x_10 = lean_array_uset(x_1, x_8, x_2);
-x_1 = x_10;
-x_2 = x_5;
-goto _start;
-}
-else
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_12 = lean_ctor_get(x_2, 0);
-x_13 = lean_ctor_get(x_2, 1);
-x_14 = lean_ctor_get(x_2, 2);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_inc(x_12);
-lean_dec(x_2);
-x_15 = lean_array_get_size(x_1);
-x_16 = l_Lean_Name_hash(x_12);
-x_17 = lean_usize_modn(x_16, x_15);
-lean_dec(x_15);
-x_18 = lean_array_uget(x_1, x_17);
-x_19 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_19, 0, x_12);
-lean_ctor_set(x_19, 1, x_13);
-lean_ctor_set(x_19, 2, x_18);
-x_20 = lean_array_uset(x_1, x_17, x_19);
-x_1 = x_20;
-x_2 = x_14;
-goto _start;
-}
-}
-}
-}
-lean_object* l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__10(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__10___rarg), 2, 0);
-return x_2;
-}
-}
-lean_object* l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__9___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; uint8_t x_5; 
-x_4 = lean_array_get_size(x_2);
-x_5 = lean_nat_dec_lt(x_1, x_4);
-lean_dec(x_4);
-if (x_5 == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_3;
-}
-else
-{
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_6 = lean_array_fget(x_2, x_1);
-x_7 = lean_box(0);
-x_8 = lean_array_fset(x_2, x_1, x_7);
-x_9 = l_AssocList_foldlM___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__10___rarg(x_3, x_6);
-x_10 = lean_unsigned_to_nat(1u);
-x_11 = lean_nat_add(x_1, x_10);
-lean_dec(x_1);
-x_1 = x_11;
-x_2 = x_8;
-x_3 = x_9;
-goto _start;
-}
-}
-}
-lean_object* l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__9(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__9___rarg), 3, 0);
-return x_2;
-}
-}
-lean_object* l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__8___rarg(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_3 = lean_array_get_size(x_2);
-x_4 = lean_unsigned_to_nat(2u);
-x_5 = lean_nat_mul(x_3, x_4);
-lean_dec(x_3);
-x_6 = lean_box(0);
-x_7 = lean_mk_array(x_5, x_6);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = l_HashMapImp_moveEntries___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__9___rarg(x_8, x_2, x_7);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_1);
-lean_ctor_set(x_10, 1, x_9);
-return x_10;
-}
-}
-lean_object* l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__8(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__8___rarg), 2, 0);
-return x_2;
-}
-}
-lean_object* l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__11___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-if (lean_obj_tag(x_3) == 0)
-{
-lean_dec(x_2);
-lean_dec(x_1);
-return x_3;
-}
-else
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_3);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_5 = lean_ctor_get(x_3, 0);
-x_6 = lean_ctor_get(x_3, 1);
-x_7 = lean_ctor_get(x_3, 2);
-x_8 = lean_name_eq(x_5, x_1);
-if (x_8 == 0)
-{
-lean_object* x_9; 
-x_9 = l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__11___rarg(x_1, x_2, x_7);
-lean_ctor_set(x_3, 2, x_9);
-return x_3;
-}
-else
-{
-lean_dec(x_6);
-lean_dec(x_5);
-lean_ctor_set(x_3, 1, x_2);
-lean_ctor_set(x_3, 0, x_1);
-return x_3;
-}
-}
-else
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; uint8_t x_13; 
-x_10 = lean_ctor_get(x_3, 0);
-x_11 = lean_ctor_get(x_3, 1);
-x_12 = lean_ctor_get(x_3, 2);
-lean_inc(x_12);
-lean_inc(x_11);
-lean_inc(x_10);
-lean_dec(x_3);
-x_13 = lean_name_eq(x_10, x_1);
-if (x_13 == 0)
-{
-lean_object* x_14; lean_object* x_15; 
-x_14 = l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__11___rarg(x_1, x_2, x_12);
-x_15 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_15, 0, x_10);
-lean_ctor_set(x_15, 1, x_11);
-lean_ctor_set(x_15, 2, x_14);
-return x_15;
-}
-else
-{
-lean_object* x_16; 
-lean_dec(x_11);
-lean_dec(x_10);
-x_16 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_16, 0, x_1);
-lean_ctor_set(x_16, 1, x_2);
-lean_ctor_set(x_16, 2, x_12);
-return x_16;
-}
-}
-}
-}
-}
-lean_object* l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__11(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__11___rarg), 3, 0);
-return x_2;
-}
-}
-lean_object* l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__6___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_1);
-if (x_4 == 0)
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; size_t x_8; size_t x_9; lean_object* x_10; uint8_t x_11; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = lean_array_get_size(x_6);
-x_8 = l_Lean_Name_hash(x_2);
-x_9 = lean_usize_modn(x_8, x_7);
-x_10 = lean_array_uget(x_6, x_9);
-x_11 = l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7___rarg(x_2, x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
-x_12 = lean_unsigned_to_nat(1u);
-x_13 = lean_nat_add(x_5, x_12);
-lean_dec(x_5);
-x_14 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_14, 0, x_2);
-lean_ctor_set(x_14, 1, x_3);
-lean_ctor_set(x_14, 2, x_10);
-x_15 = lean_array_uset(x_6, x_9, x_14);
-x_16 = lean_nat_dec_le(x_13, x_7);
-lean_dec(x_7);
-if (x_16 == 0)
-{
-lean_object* x_17; 
-lean_free_object(x_1);
-x_17 = l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__8___rarg(x_13, x_15);
-return x_17;
-}
-else
-{
-lean_ctor_set(x_1, 1, x_15);
-lean_ctor_set(x_1, 0, x_13);
-return x_1;
-}
-}
-else
-{
-lean_object* x_18; lean_object* x_19; 
-lean_dec(x_7);
-x_18 = l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__11___rarg(x_2, x_3, x_10);
-x_19 = lean_array_uset(x_6, x_9, x_18);
-lean_ctor_set(x_1, 1, x_19);
-return x_1;
-}
-}
-else
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; size_t x_23; size_t x_24; lean_object* x_25; uint8_t x_26; 
-x_20 = lean_ctor_get(x_1, 0);
-x_21 = lean_ctor_get(x_1, 1);
-lean_inc(x_21);
-lean_inc(x_20);
-lean_dec(x_1);
-x_22 = lean_array_get_size(x_21);
-x_23 = l_Lean_Name_hash(x_2);
-x_24 = lean_usize_modn(x_23, x_22);
-x_25 = lean_array_uget(x_21, x_24);
-x_26 = l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7___rarg(x_2, x_25);
-if (x_26 == 0)
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; uint8_t x_31; 
-x_27 = lean_unsigned_to_nat(1u);
-x_28 = lean_nat_add(x_20, x_27);
-lean_dec(x_20);
-x_29 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_29, 0, x_2);
-lean_ctor_set(x_29, 1, x_3);
-lean_ctor_set(x_29, 2, x_25);
-x_30 = lean_array_uset(x_21, x_24, x_29);
-x_31 = lean_nat_dec_le(x_28, x_22);
-lean_dec(x_22);
-if (x_31 == 0)
-{
-lean_object* x_32; 
-x_32 = l_HashMapImp_expand___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__8___rarg(x_28, x_30);
-return x_32;
-}
-else
-{
-lean_object* x_33; 
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_28);
-lean_ctor_set(x_33, 1, x_30);
-return x_33;
-}
-}
-else
-{
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-lean_dec(x_22);
-x_34 = l_AssocList_replace___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__11___rarg(x_2, x_3, x_25);
-x_35 = lean_array_uset(x_21, x_24, x_34);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_20);
-lean_ctor_set(x_36, 1, x_35);
-return x_36;
-}
-}
-}
-}
-lean_object* l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__6(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__6___rarg), 3, 0);
-return x_2;
-}
-}
-lean_object* l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-uint8_t x_4; 
-x_4 = lean_ctor_get_uint8(x_1, sizeof(void*)*2);
-if (x_4 == 0)
-{
-uint8_t x_5; 
-x_5 = !lean_is_exclusive(x_1);
-if (x_5 == 0)
-{
-lean_object* x_6; lean_object* x_7; 
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__2___rarg(x_6, x_2, x_3);
-lean_ctor_set(x_1, 1, x_7);
-return x_1;
-}
-else
-{
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_8 = lean_ctor_get(x_1, 0);
-x_9 = lean_ctor_get(x_1, 1);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_dec(x_1);
-x_10 = l_PersistentHashMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__2___rarg(x_9, x_2, x_3);
-x_11 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_11, 0, x_8);
-lean_ctor_set(x_11, 1, x_10);
-lean_ctor_set_uint8(x_11, sizeof(void*)*2, x_4);
-return x_11;
-}
-}
-else
-{
-uint8_t x_12; 
-x_12 = !lean_is_exclusive(x_1);
-if (x_12 == 0)
-{
-lean_object* x_13; lean_object* x_14; 
-x_13 = lean_ctor_get(x_1, 0);
-x_14 = l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__6___rarg(x_13, x_2, x_3);
-lean_ctor_set(x_1, 0, x_14);
-return x_1;
-}
-else
-{
-lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_15 = lean_ctor_get(x_1, 0);
-x_16 = lean_ctor_get(x_1, 1);
-lean_inc(x_16);
-lean_inc(x_15);
-lean_dec(x_1);
-x_17 = l_HashMapImp_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__6___rarg(x_15, x_2, x_3);
-x_18 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_16);
-lean_ctor_set_uint8(x_18, sizeof(void*)*2, x_4);
-return x_18;
-}
-}
-}
-}
-lean_object* l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__1(lean_object* x_1) {
-_start:
-{
-lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__1___rarg), 3, 0);
-return x_2;
-}
-}
 lean_object* l___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -3192,7 +3702,7 @@ lean_dec(x_1);
 x_8 = lean_ctor_get(x_3, 0);
 lean_inc(x_8);
 lean_dec(x_3);
-x_9 = l_Lean_SMap_insert___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__1___rarg(x_7, x_8, x_4);
+x_9 = l_Lean_Elab_ElabFnTable_insert___rarg(x_7, x_8, x_4);
 x_10 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_10, 0, x_6);
 lean_ctor_set(x_10, 1, x_9);
@@ -3207,42 +3717,6 @@ x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Elab_Util_5__ElabAttribut
 return x_2;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__5___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
-_start:
-{
-size_t x_7; lean_object* x_8; 
-x_7 = lean_unbox_usize(x_1);
-lean_dec(x_1);
-x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__5___rarg(x_7, x_2, x_3, x_4, x_5, x_6);
-lean_dec(x_4);
-lean_dec(x_3);
-lean_dec(x_2);
-return x_8;
-}
-}
-lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
-_start:
-{
-size_t x_6; size_t x_7; lean_object* x_8; 
-x_6 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_7 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_8 = l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__3___rarg(x_1, x_6, x_7, x_4, x_5);
-return x_8;
-}
-}
-lean_object* l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7___rarg___boxed(lean_object* x_1, lean_object* x_2) {
-_start:
-{
-uint8_t x_3; lean_object* x_4; 
-x_3 = l_AssocList_contains___main___at___private_Init_Lean_Elab_Util_5__ElabAttribute_addExtensionEntry___spec__7___rarg(x_1, x_2);
-lean_dec(x_2);
-lean_dec(x_1);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
 lean_object* l_IO_ofExcept___at___private_Init_Lean_Elab_Util_6__ElabAttribute_add___spec__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
diff --git a/stage0/stdlib/Init/Lean/HeadIndex.c b/stage0/stdlib/Init/Lean/HeadIndex.c
new file mode 100644
index 0000000000..68a7102b89
--- /dev/null
+++ b/stage0/stdlib/Init/Lean/HeadIndex.c
@@ -0,0 +1,660 @@
+// Lean compiler output
+// Module: Init.Lean.HeadIndex
+// Imports: Init.Lean.Expr
+#include "runtime/lean.h"
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-label"
+#elif defined(__GNUC__) && !defined(__CLANG__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+lean_object* l_Lean_Expr_toHeadIndex___boxed(lean_object*);
+lean_object* l_Lean_Expr_toHeadIndex___main___closed__2;
+lean_object* l_Lean_Expr_head___boxed(lean_object*);
+lean_object* l_Lean_Expr_toHeadIndex___main___boxed(lean_object*);
+lean_object* l_Lean_Expr_toHeadIndex___main___closed__1;
+lean_object* l_Lean_HeadIndex_HasBeq___closed__1;
+lean_object* l___private_Init_Util_1__mkPanicMessage(lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t lean_name_eq(lean_object*, lean_object*);
+lean_object* l_Lean_Expr_head___main(lean_object*);
+uint8_t l_Lean_HeadIndex_HeadIndex_beq(lean_object*, lean_object*);
+lean_object* lean_nat_add(lean_object*, lean_object*);
+lean_object* l_Lean_Expr_head(lean_object*);
+lean_object* l_Lean_HeadIndex_Inhabited;
+lean_object* l___private_Init_Lean_HeadIndex_1__headNumArgsAux___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_HeadIndex_HeadIndex_hash___boxed(lean_object*);
+uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
+lean_object* l_Lean_Expr_toHeadIndex___main___closed__3;
+uint8_t l_Lean_Literal_beq(lean_object*, lean_object*);
+lean_object* l_Lean_Expr_toHeadIndex___main(lean_object*);
+lean_object* l_Lean_HeadIndex_HasBeq;
+size_t l_Lean_HeadIndex_HeadIndex_hash(lean_object*);
+size_t l_Lean_Name_hash(lean_object*);
+lean_object* l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_Expr_headNumArgs(lean_object*);
+lean_object* l_Lean_Expr_toHeadIndex(lean_object*);
+size_t lean_usize_of_nat(lean_object*);
+lean_object* l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main(lean_object*, lean_object*);
+lean_object* l_Lean_HeadIndex_Hashable;
+lean_object* l___private_Init_Lean_HeadIndex_1__headNumArgsAux(lean_object*, lean_object*);
+lean_object* l_Lean_Expr_head___main___boxed(lean_object*);
+lean_object* l_Lean_HeadIndex_Hashable___closed__1;
+lean_object* l_Lean_Expr_headNumArgs___boxed(lean_object*);
+lean_object* l_Lean_HeadIndex_HeadIndex_beq___boxed(lean_object*, lean_object*);
+size_t l_Lean_Literal_hash(lean_object*);
+lean_object* lean_panic_fn(lean_object*, lean_object*);
+size_t lean_usize_mix_hash(size_t, size_t);
+lean_object* _init_l_Lean_HeadIndex_Inhabited() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_box(5);
+return x_1;
+}
+}
+size_t l_Lean_HeadIndex_HeadIndex_hash(lean_object* x_1) {
+_start:
+{
+switch (lean_obj_tag(x_1)) {
+case 0:
+{
+lean_object* x_2; size_t x_3; size_t x_4; size_t x_5; 
+x_2 = lean_ctor_get(x_1, 0);
+x_3 = 11;
+x_4 = l_Lean_Name_hash(x_2);
+x_5 = lean_usize_mix_hash(x_3, x_4);
+return x_5;
+}
+case 1:
+{
+lean_object* x_6; size_t x_7; size_t x_8; size_t x_9; 
+x_6 = lean_ctor_get(x_1, 0);
+x_7 = 13;
+x_8 = l_Lean_Name_hash(x_6);
+x_9 = lean_usize_mix_hash(x_7, x_8);
+return x_9;
+}
+case 2:
+{
+lean_object* x_10; size_t x_11; size_t x_12; size_t x_13; 
+x_10 = lean_ctor_get(x_1, 0);
+x_11 = 17;
+x_12 = l_Lean_Name_hash(x_10);
+x_13 = lean_usize_mix_hash(x_11, x_12);
+return x_13;
+}
+case 3:
+{
+lean_object* x_14; lean_object* x_15; size_t x_16; size_t x_17; size_t x_18; size_t x_19; size_t x_20; 
+x_14 = lean_ctor_get(x_1, 0);
+x_15 = lean_ctor_get(x_1, 1);
+x_16 = 19;
+x_17 = l_Lean_Name_hash(x_14);
+x_18 = lean_usize_of_nat(x_15);
+x_19 = lean_usize_mix_hash(x_17, x_18);
+x_20 = lean_usize_mix_hash(x_16, x_19);
+return x_20;
+}
+case 4:
+{
+lean_object* x_21; size_t x_22; size_t x_23; size_t x_24; 
+x_21 = lean_ctor_get(x_1, 0);
+x_22 = 23;
+x_23 = l_Lean_Literal_hash(x_21);
+x_24 = lean_usize_mix_hash(x_22, x_23);
+return x_24;
+}
+case 5:
+{
+size_t x_25; 
+x_25 = 29;
+return x_25;
+}
+case 6:
+{
+size_t x_26; 
+x_26 = 31;
+return x_26;
+}
+default: 
+{
+size_t x_27; 
+x_27 = 37;
+return x_27;
+}
+}
+}
+}
+lean_object* l_Lean_HeadIndex_HeadIndex_hash___boxed(lean_object* x_1) {
+_start:
+{
+size_t x_2; lean_object* x_3; 
+x_2 = l_Lean_HeadIndex_HeadIndex_hash(x_1);
+lean_dec(x_1);
+x_3 = lean_box_usize(x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_HeadIndex_Hashable___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_HeadIndex_HeadIndex_hash___boxed), 1, 0);
+return x_1;
+}
+}
+lean_object* _init_l_Lean_HeadIndex_Hashable() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_HeadIndex_Hashable___closed__1;
+return x_1;
+}
+}
+uint8_t l_Lean_HeadIndex_HeadIndex_beq(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+switch (lean_obj_tag(x_1)) {
+case 0:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+lean_object* x_3; lean_object* x_4; uint8_t x_5; 
+x_3 = lean_ctor_get(x_1, 0);
+x_4 = lean_ctor_get(x_2, 0);
+x_5 = lean_name_eq(x_3, x_4);
+return x_5;
+}
+else
+{
+uint8_t x_6; 
+x_6 = 0;
+return x_6;
+}
+}
+case 1:
+{
+if (lean_obj_tag(x_2) == 1)
+{
+lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_7 = lean_ctor_get(x_1, 0);
+x_8 = lean_ctor_get(x_2, 0);
+x_9 = lean_name_eq(x_7, x_8);
+return x_9;
+}
+else
+{
+uint8_t x_10; 
+x_10 = 0;
+return x_10;
+}
+}
+case 2:
+{
+if (lean_obj_tag(x_2) == 2)
+{
+lean_object* x_11; lean_object* x_12; uint8_t x_13; 
+x_11 = lean_ctor_get(x_1, 0);
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_name_eq(x_11, x_12);
+return x_13;
+}
+else
+{
+uint8_t x_14; 
+x_14 = 0;
+return x_14;
+}
+}
+case 3:
+{
+if (lean_obj_tag(x_2) == 3)
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
+x_15 = lean_ctor_get(x_1, 0);
+x_16 = lean_ctor_get(x_1, 1);
+x_17 = lean_ctor_get(x_2, 0);
+x_18 = lean_ctor_get(x_2, 1);
+x_19 = lean_name_eq(x_15, x_17);
+if (x_19 == 0)
+{
+uint8_t x_20; 
+x_20 = 0;
+return x_20;
+}
+else
+{
+uint8_t x_21; 
+x_21 = lean_nat_dec_eq(x_16, x_18);
+return x_21;
+}
+}
+else
+{
+uint8_t x_22; 
+x_22 = 0;
+return x_22;
+}
+}
+case 4:
+{
+if (lean_obj_tag(x_2) == 4)
+{
+lean_object* x_23; lean_object* x_24; uint8_t x_25; 
+x_23 = lean_ctor_get(x_1, 0);
+x_24 = lean_ctor_get(x_2, 0);
+x_25 = l_Lean_Literal_beq(x_23, x_24);
+return x_25;
+}
+else
+{
+uint8_t x_26; 
+x_26 = 0;
+return x_26;
+}
+}
+case 5:
+{
+if (lean_obj_tag(x_2) == 5)
+{
+uint8_t x_27; 
+x_27 = 1;
+return x_27;
+}
+else
+{
+uint8_t x_28; 
+x_28 = 0;
+return x_28;
+}
+}
+case 6:
+{
+if (lean_obj_tag(x_2) == 6)
+{
+uint8_t x_29; 
+x_29 = 1;
+return x_29;
+}
+else
+{
+uint8_t x_30; 
+x_30 = 0;
+return x_30;
+}
+}
+default: 
+{
+if (lean_obj_tag(x_2) == 7)
+{
+uint8_t x_31; 
+x_31 = 1;
+return x_31;
+}
+else
+{
+uint8_t x_32; 
+x_32 = 0;
+return x_32;
+}
+}
+}
+}
+}
+lean_object* l_Lean_HeadIndex_HeadIndex_beq___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = l_Lean_HeadIndex_HeadIndex_beq(x_1, x_2);
+lean_dec(x_2);
+lean_dec(x_1);
+x_4 = lean_box(x_3);
+return x_4;
+}
+}
+lean_object* _init_l_Lean_HeadIndex_HasBeq___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_Lean_HeadIndex_HeadIndex_beq___boxed), 2, 0);
+return x_1;
+}
+}
+lean_object* _init_l_Lean_HeadIndex_HasBeq() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_HeadIndex_HasBeq___closed__1;
+return x_1;
+}
+}
+lean_object* l_Lean_Expr_head___main(lean_object* x_1) {
+_start:
+{
+switch (lean_obj_tag(x_1)) {
+case 5:
+{
+lean_object* x_2; 
+x_2 = lean_ctor_get(x_1, 0);
+x_1 = x_2;
+goto _start;
+}
+case 8:
+{
+lean_object* x_4; 
+x_4 = lean_ctor_get(x_1, 3);
+x_1 = x_4;
+goto _start;
+}
+case 10:
+{
+lean_object* x_6; 
+x_6 = lean_ctor_get(x_1, 1);
+x_1 = x_6;
+goto _start;
+}
+default: 
+{
+lean_inc(x_1);
+return x_1;
+}
+}
+}
+}
+lean_object* l_Lean_Expr_head___main___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Expr_head___main(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l_Lean_Expr_head(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Expr_head___main(x_1);
+return x_2;
+}
+}
+lean_object* l_Lean_Expr_head___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Expr_head(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+switch (lean_obj_tag(x_1)) {
+case 5:
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_3 = lean_ctor_get(x_1, 0);
+x_4 = lean_unsigned_to_nat(1u);
+x_5 = lean_nat_add(x_2, x_4);
+lean_dec(x_2);
+x_1 = x_3;
+x_2 = x_5;
+goto _start;
+}
+case 8:
+{
+lean_object* x_7; 
+x_7 = lean_ctor_get(x_1, 3);
+x_1 = x_7;
+goto _start;
+}
+case 10:
+{
+lean_object* x_9; 
+x_9 = lean_ctor_get(x_1, 1);
+x_1 = x_9;
+goto _start;
+}
+default: 
+{
+return x_2;
+}
+}
+}
+}
+lean_object* l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main(x_1, x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+lean_object* l___private_Init_Lean_HeadIndex_1__headNumArgsAux(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main(x_1, x_2);
+return x_3;
+}
+}
+lean_object* l___private_Init_Lean_HeadIndex_1__headNumArgsAux___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l___private_Init_Lean_HeadIndex_1__headNumArgsAux(x_1, x_2);
+lean_dec(x_1);
+return x_3;
+}
+}
+lean_object* l_Lean_Expr_headNumArgs(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = lean_unsigned_to_nat(0u);
+x_3 = l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main(x_1, x_2);
+return x_3;
+}
+}
+lean_object* l_Lean_Expr_headNumArgs___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Expr_headNumArgs(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Expr_toHeadIndex___main___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("Init.Lean.HeadIndex");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Expr_toHeadIndex___main___closed__2() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("unexpected expression kind");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Expr_toHeadIndex___main___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_1 = l_Lean_Expr_toHeadIndex___main___closed__1;
+x_2 = lean_unsigned_to_nat(81u);
+x_3 = lean_unsigned_to_nat(29u);
+x_4 = l_Lean_Expr_toHeadIndex___main___closed__2;
+x_5 = l___private_Init_Util_1__mkPanicMessage(x_1, x_2, x_3, x_4);
+return x_5;
+}
+}
+lean_object* l_Lean_Expr_toHeadIndex___main(lean_object* x_1) {
+_start:
+{
+switch (lean_obj_tag(x_1)) {
+case 1:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = lean_ctor_get(x_1, 0);
+lean_inc(x_2);
+x_3 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_3, 0, x_2);
+return x_3;
+}
+case 2:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = lean_ctor_get(x_1, 0);
+lean_inc(x_4);
+x_5 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_5, 0, x_4);
+return x_5;
+}
+case 3:
+{
+lean_object* x_6; 
+x_6 = lean_box(5);
+return x_6;
+}
+case 4:
+{
+lean_object* x_7; lean_object* x_8; 
+x_7 = lean_ctor_get(x_1, 0);
+lean_inc(x_7);
+x_8 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_8, 0, x_7);
+return x_8;
+}
+case 5:
+{
+lean_object* x_9; 
+x_9 = lean_ctor_get(x_1, 0);
+x_1 = x_9;
+goto _start;
+}
+case 6:
+{
+lean_object* x_11; 
+x_11 = lean_box(6);
+return x_11;
+}
+case 7:
+{
+lean_object* x_12; 
+x_12 = lean_box(7);
+return x_12;
+}
+case 8:
+{
+lean_object* x_13; 
+x_13 = lean_ctor_get(x_1, 3);
+x_1 = x_13;
+goto _start;
+}
+case 9:
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_ctor_get(x_1, 0);
+lean_inc(x_15);
+x_16 = lean_alloc_ctor(4, 1, 0);
+lean_ctor_set(x_16, 0, x_15);
+return x_16;
+}
+case 10:
+{
+lean_object* x_17; 
+x_17 = lean_ctor_get(x_1, 1);
+x_1 = x_17;
+goto _start;
+}
+case 11:
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_1, 0);
+x_20 = lean_ctor_get(x_1, 1);
+lean_inc(x_20);
+lean_inc(x_19);
+x_21 = lean_alloc_ctor(3, 2, 0);
+lean_ctor_set(x_21, 0, x_19);
+lean_ctor_set(x_21, 1, x_20);
+return x_21;
+}
+default: 
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = l_Lean_HeadIndex_Inhabited;
+x_23 = l_Lean_Expr_toHeadIndex___main___closed__3;
+x_24 = lean_panic_fn(x_22, x_23);
+return x_24;
+}
+}
+}
+}
+lean_object* l_Lean_Expr_toHeadIndex___main___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Expr_toHeadIndex___main(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l_Lean_Expr_toHeadIndex(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Expr_toHeadIndex___main(x_1);
+return x_2;
+}
+}
+lean_object* l_Lean_Expr_toHeadIndex___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_Expr_toHeadIndex(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* initialize_Init_Lean_Expr(lean_object*);
+static bool _G_initialized = false;
+lean_object* initialize_Init_Lean_HeadIndex(lean_object* w) {
+lean_object * res;
+if (_G_initialized) return lean_mk_io_result(lean_box(0));
+_G_initialized = true;
+res = initialize_Init_Lean_Expr(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+l_Lean_HeadIndex_Inhabited = _init_l_Lean_HeadIndex_Inhabited();
+lean_mark_persistent(l_Lean_HeadIndex_Inhabited);
+l_Lean_HeadIndex_Hashable___closed__1 = _init_l_Lean_HeadIndex_Hashable___closed__1();
+lean_mark_persistent(l_Lean_HeadIndex_Hashable___closed__1);
+l_Lean_HeadIndex_Hashable = _init_l_Lean_HeadIndex_Hashable();
+lean_mark_persistent(l_Lean_HeadIndex_Hashable);
+l_Lean_HeadIndex_HasBeq___closed__1 = _init_l_Lean_HeadIndex_HasBeq___closed__1();
+lean_mark_persistent(l_Lean_HeadIndex_HasBeq___closed__1);
+l_Lean_HeadIndex_HasBeq = _init_l_Lean_HeadIndex_HasBeq();
+lean_mark_persistent(l_Lean_HeadIndex_HasBeq);
+l_Lean_Expr_toHeadIndex___main___closed__1 = _init_l_Lean_Expr_toHeadIndex___main___closed__1();
+lean_mark_persistent(l_Lean_Expr_toHeadIndex___main___closed__1);
+l_Lean_Expr_toHeadIndex___main___closed__2 = _init_l_Lean_Expr_toHeadIndex___main___closed__2();
+lean_mark_persistent(l_Lean_Expr_toHeadIndex___main___closed__2);
+l_Lean_Expr_toHeadIndex___main___closed__3 = _init_l_Lean_Expr_toHeadIndex___main___closed__3();
+lean_mark_persistent(l_Lean_Expr_toHeadIndex___main___closed__3);
+return lean_mk_io_result(lean_box(0));
+}
+#ifdef __cplusplus
+}
+#endif
diff --git a/stage0/stdlib/Init/Lean/Linter.c b/stage0/stdlib/Init/Lean/Linter.c
index 1f5a18cb62..a1b23a253b 100644
--- a/stage0/stdlib/Init/Lean/Linter.c
+++ b/stage0/stdlib/Init/Lean/Linter.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Lean.Linter
-// Imports: Init.System.IO Init.Lean.Attributes Init.Lean.Syntax Init.Lean.Util.Message
+// Imports: Init.System.IO Init.Lean.Attributes Init.Lean.Syntax Init.Lean.Message
 #include "runtime/lean.h"
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -76,7 +76,7 @@ return x_12;
 lean_object* initialize_Init_System_IO(lean_object*);
 lean_object* initialize_Init_Lean_Attributes(lean_object*);
 lean_object* initialize_Init_Lean_Syntax(lean_object*);
-lean_object* initialize_Init_Lean_Util_Message(lean_object*);
+lean_object* initialize_Init_Lean_Message(lean_object*);
 static bool _G_initialized = false;
 lean_object* initialize_Init_Lean_Linter(lean_object* w) {
 lean_object * res;
@@ -91,7 +91,7 @@ lean_dec_ref(res);
 res = initialize_Init_Lean_Syntax(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = initialize_Init_Lean_Util_Message(lean_io_mk_world());
+res = initialize_Init_Lean_Message(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 res = l_Lean_mkLintersRef(lean_io_mk_world());
diff --git a/stage0/stdlib/Init/Lean/Util/Message.c b/stage0/stdlib/Init/Lean/Message.c
similarity index 99%
rename from stage0/stdlib/Init/Lean/Util/Message.c
rename to stage0/stdlib/Init/Lean/Message.c
index 0366aa531d..be336c2a5c 100644
--- a/stage0/stdlib/Init/Lean/Util/Message.c
+++ b/stage0/stdlib/Init/Lean/Message.c
@@ -1,5 +1,5 @@
 // Lean compiler output
-// Module: Init.Lean.Util.Message
+// Module: Init.Lean.Message
 // Imports: Init.Data.ToString Init.Lean.Data.Position Init.Lean.Syntax Init.Lean.MetavarContext Init.Lean.Environment
 #include "runtime/lean.h"
 #if defined(__clang__)
@@ -2127,7 +2127,7 @@ lean_object* initialize_Init_Lean_Syntax(lean_object*);
 lean_object* initialize_Init_Lean_MetavarContext(lean_object*);
 lean_object* initialize_Init_Lean_Environment(lean_object*);
 static bool _G_initialized = false;
-lean_object* initialize_Init_Lean_Util_Message(lean_object* w) {
+lean_object* initialize_Init_Lean_Message(lean_object* w) {
 lean_object * res;
 if (_G_initialized) return lean_mk_io_result(lean_box(0));
 _G_initialized = true;
diff --git a/stage0/stdlib/Init/Lean/Meta.c b/stage0/stdlib/Init/Lean/Meta.c
index 0c283734f2..57646c5d1e 100644
--- a/stage0/stdlib/Init/Lean/Meta.c
+++ b/stage0/stdlib/Init/Lean/Meta.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Lean.Meta
-// Imports: Init.Lean.Meta.Basic Init.Lean.Meta.LevelDefEq Init.Lean.Meta.WHNF Init.Lean.Meta.InferType Init.Lean.Meta.FunInfo Init.Lean.Meta.ExprDefEq Init.Lean.Meta.DiscrTree Init.Lean.Meta.Reduce Init.Lean.Meta.Instances Init.Lean.Meta.AbstractMVars Init.Lean.Meta.SynthInstance Init.Lean.Meta.AppBuilder Init.Lean.Meta.Tactic Init.Lean.Meta.Message
+// Imports: Init.Lean.Meta.Basic Init.Lean.Meta.LevelDefEq Init.Lean.Meta.WHNF Init.Lean.Meta.InferType Init.Lean.Meta.FunInfo Init.Lean.Meta.ExprDefEq Init.Lean.Meta.DiscrTree Init.Lean.Meta.Reduce Init.Lean.Meta.Instances Init.Lean.Meta.AbstractMVars Init.Lean.Meta.SynthInstance Init.Lean.Meta.AppBuilder Init.Lean.Meta.Tactic Init.Lean.Meta.Message Init.Lean.Meta.KAbstract
 #include "runtime/lean.h"
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -27,6 +27,7 @@ lean_object* initialize_Init_Lean_Meta_SynthInstance(lean_object*);
 lean_object* initialize_Init_Lean_Meta_AppBuilder(lean_object*);
 lean_object* initialize_Init_Lean_Meta_Tactic(lean_object*);
 lean_object* initialize_Init_Lean_Meta_Message(lean_object*);
+lean_object* initialize_Init_Lean_Meta_KAbstract(lean_object*);
 static bool _G_initialized = false;
 lean_object* initialize_Init_Lean_Meta(lean_object* w) {
 lean_object * res;
@@ -74,6 +75,9 @@ lean_dec_ref(res);
 res = initialize_Init_Lean_Meta_Message(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+res = initialize_Init_Lean_Meta_KAbstract(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 return lean_mk_io_result(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Init/Lean/Meta/AppBuilder.c b/stage0/stdlib/Init/Lean/Meta/AppBuilder.c
index da79db8b0e..af2e455d5a 100644
--- a/stage0/stdlib/Init/Lean/Meta/AppBuilder.c
+++ b/stage0/stdlib/Init/Lean/Meta/AppBuilder.c
@@ -29,6 +29,7 @@ lean_object* l_Lean_Meta_mkEqSymm___closed__1;
 lean_object* l_Lean_Meta_mkEqTrans___closed__3;
 lean_object* l_Lean_Meta_mkAppM(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkCongr___closed__2;
+extern lean_object* l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l_Lean_Meta_mkCongr(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkCongrFun(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -53,7 +54,6 @@ lean_object* l_Lean_Meta_mkEqSymm___closed__2;
 lean_object* l___private_Init_Lean_Meta_AppBuilder_3__mkAppMAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkEqSymm(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
 lean_object* l___private_Init_Lean_Meta_AppBuilder_1__infer(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkCongrArg___closed__3;
 lean_object* l_Lean_Expr_heq_x3f___closed__2;
@@ -80,7 +80,7 @@ lean_object* l_Lean_Expr_heq_x3f___closed__1;
 lean_object* l_Lean_Expr_heq_x3f___boxed(lean_object*);
 lean_object* l_Lean_ConstantInfo_lparams(lean_object*);
 lean_object* l_Lean_Meta_assignExprMVar(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_synthInstance(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_synthInstance(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_hasAssignableMVar(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_arrow_x3f(lean_object*);
 lean_object* l_List_mapM___main___at_Lean_Meta_mkAppM___spec__1(lean_object*, lean_object*, lean_object*);
@@ -4334,7 +4334,7 @@ lean_inc(x_9);
 x_10 = l_Lean_Meta_getMVarDecl(x_9, x_3, x_4);
 if (lean_obj_tag(x_10) == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 x_11 = lean_ctor_get(x_10, 0);
 lean_inc(x_11);
 x_12 = lean_ctor_get(x_10, 1);
@@ -4343,105 +4343,104 @@ lean_dec(x_10);
 x_13 = lean_ctor_get(x_11, 2);
 lean_inc(x_13);
 lean_dec(x_11);
-x_14 = lean_unsigned_to_nat(10000u);
 lean_inc(x_3);
-x_15 = l_Lean_Meta_synthInstance(x_13, x_14, x_3, x_12);
-if (lean_obj_tag(x_15) == 0)
+x_14 = l_Lean_Meta_synthInstance(x_13, x_3, x_12);
+if (lean_obj_tag(x_14) == 0)
 {
-lean_object* x_16; lean_object* x_17; lean_object* x_18; 
-x_16 = lean_ctor_get(x_15, 0);
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_14, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_14, 1);
 lean_inc(x_16);
-x_17 = lean_ctor_get(x_15, 1);
-lean_inc(x_17);
-lean_dec(x_15);
-x_18 = l_Lean_Meta_assignExprMVar(x_9, x_16, x_3, x_17);
-if (lean_obj_tag(x_18) == 0)
+lean_dec(x_14);
+x_17 = l_Lean_Meta_assignExprMVar(x_9, x_15, x_3, x_16);
+if (lean_obj_tag(x_17) == 0)
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_19 = lean_ctor_get(x_18, 1);
-lean_inc(x_19);
-lean_dec(x_18);
-x_20 = lean_unsigned_to_nat(1u);
-x_21 = lean_nat_add(x_2, x_20);
+lean_object* x_18; lean_object* x_19; lean_object* x_20; 
+x_18 = lean_ctor_get(x_17, 1);
+lean_inc(x_18);
+lean_dec(x_17);
+x_19 = lean_unsigned_to_nat(1u);
+x_20 = lean_nat_add(x_2, x_19);
 lean_dec(x_2);
-x_2 = x_21;
-x_4 = x_19;
+x_2 = x_20;
+x_4 = x_18;
 goto _start;
 }
 else
 {
-uint8_t x_23; 
+uint8_t x_22; 
 lean_dec(x_3);
 lean_dec(x_2);
-x_23 = !lean_is_exclusive(x_18);
-if (x_23 == 0)
+x_22 = !lean_is_exclusive(x_17);
+if (x_22 == 0)
 {
-return x_18;
+return x_17;
 }
 else
 {
-lean_object* x_24; lean_object* x_25; lean_object* x_26; 
-x_24 = lean_ctor_get(x_18, 0);
-x_25 = lean_ctor_get(x_18, 1);
-lean_inc(x_25);
+lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+x_23 = lean_ctor_get(x_17, 0);
+x_24 = lean_ctor_get(x_17, 1);
 lean_inc(x_24);
-lean_dec(x_18);
-x_26 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_26, 0, x_24);
-lean_ctor_set(x_26, 1, x_25);
-return x_26;
+lean_inc(x_23);
+lean_dec(x_17);
+x_25 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_25, 0, x_23);
+lean_ctor_set(x_25, 1, x_24);
+return x_25;
 }
 }
 }
 else
 {
-uint8_t x_27; 
+uint8_t x_26; 
 lean_dec(x_9);
 lean_dec(x_3);
 lean_dec(x_2);
-x_27 = !lean_is_exclusive(x_15);
-if (x_27 == 0)
+x_26 = !lean_is_exclusive(x_14);
+if (x_26 == 0)
 {
-return x_15;
+return x_14;
 }
 else
 {
-lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_28 = lean_ctor_get(x_15, 0);
-x_29 = lean_ctor_get(x_15, 1);
-lean_inc(x_29);
+lean_object* x_27; lean_object* x_28; lean_object* x_29; 
+x_27 = lean_ctor_get(x_14, 0);
+x_28 = lean_ctor_get(x_14, 1);
 lean_inc(x_28);
-lean_dec(x_15);
-x_30 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_30, 0, x_28);
-lean_ctor_set(x_30, 1, x_29);
-return x_30;
+lean_inc(x_27);
+lean_dec(x_14);
+x_29 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_29, 0, x_27);
+lean_ctor_set(x_29, 1, x_28);
+return x_29;
 }
 }
 }
 else
 {
-uint8_t x_31; 
+uint8_t x_30; 
 lean_dec(x_9);
 lean_dec(x_3);
 lean_dec(x_2);
-x_31 = !lean_is_exclusive(x_10);
-if (x_31 == 0)
+x_30 = !lean_is_exclusive(x_10);
+if (x_30 == 0)
 {
 return x_10;
 }
 else
 {
-lean_object* x_32; lean_object* x_33; lean_object* x_34; 
-x_32 = lean_ctor_get(x_10, 0);
-x_33 = lean_ctor_get(x_10, 1);
-lean_inc(x_33);
+lean_object* x_31; lean_object* x_32; lean_object* x_33; 
+x_31 = lean_ctor_get(x_10, 0);
+x_32 = lean_ctor_get(x_10, 1);
 lean_inc(x_32);
+lean_inc(x_31);
 lean_dec(x_10);
-x_34 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_34, 0, x_32);
-lean_ctor_set(x_34, 1, x_33);
-return x_34;
+x_33 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_33, 0, x_31);
+lean_ctor_set(x_33, 1, x_32);
+return x_33;
 }
 }
 }
@@ -5251,7 +5250,7 @@ lean_object* _init_l_Lean_Meta_mkAppM___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
+x_1 = l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 x_2 = l_Lean_Meta_Exception_toTraceMessageData___closed__68;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
diff --git a/stage0/stdlib/Init/Lean/Meta/Basic.c b/stage0/stdlib/Init/Lean/Meta/Basic.c
index 8a5a5ad4d6..45533ae679 100644
--- a/stage0/stdlib/Init/Lean/Meta/Basic.c
+++ b/stage0/stdlib/Init/Lean/Meta/Basic.c
@@ -18,6 +18,7 @@ lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_isClassExpe
 lean_object* l_Lean_Meta_MetaM_inhabited(lean_object*, lean_object*);
 size_t l_Lean_Meta_InfoCacheKey_Hashable(lean_object*);
 lean_object* l_Lean_Meta_getLCtx___boxed(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_MetaExtState_inhabited___closed__4;
 lean_object* l_Lean_Meta_withLocalDecl(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_isClassExpensive___main___spec__5___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -47,25 +48,31 @@ lean_object* l_Lean_Meta_getEnv(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescope___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isReadOnlyExprMVar___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_addLevelMVarDecl(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Format_pretty(lean_object*, lean_object*);
 extern lean_object* l_EIO_Monad___closed__1;
 lean_object* l_Lean_Meta_savingCache(lean_object*);
 lean_object* l_Lean_Meta_addContext___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__1;
 lean_object* l_Lean_Meta_mkFreshExprMVarAt___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForall(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux(lean_object*);
 lean_object* lean_local_ctx_mk_let_decl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_bind___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_2__getTraceState___boxed(lean_object*);
 lean_object* l_Lean_Meta_resettingSynthInstanceCache___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_liftStateMCtx(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_3__getTraceState___boxed(lean_object*);
 lean_object* lean_metavar_ctx_get_expr_assignment(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2(lean_object*);
 lean_object* l_Lean_mkMVar(lean_object*);
 lean_object* l_Lean_Meta_isClassQuick___main(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
 lean_object* lean_environment_find(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isExprDefEqAux(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_lambdaTelescope(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -76,12 +83,12 @@ lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTeles
 lean_object* l_ReaderT_bind___at_Lean_Meta_isClassExpensive___main___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_io_ref_get(lean_object*, lean_object*);
 lean_object* l_Option_hash___at_Lean_Meta_InfoCacheKey_Hashable___spec__1___boxed(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_lambdaMetaTelescope___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withLetDecl___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_instantiateLevelMVars(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_MetaHasEval(lean_object*);
 lean_object* l_Lean_Meta_forallBoundedTelescope(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_IO_println___at_Lean_Meta_MetaHasEval___spec__2(lean_object*, lean_object*);
@@ -97,16 +104,19 @@ lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_isClassExpe
 lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
 lean_object* l_Lean_Meta_MetaExtState_inhabited___lambda__2(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_String_splitAux___main___closed__1;
-lean_object* l___private_Init_Lean_Meta_Basic_10__withNewFVar___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getConst(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_Exception_Inhabited___closed__1;
 lean_object* l_Lean_Meta_throwBug___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescope___spec__3___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkInferTypeRef___lambda__1(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2(lean_object*);
 lean_object* l_Lean_Meta_isReadOnlyLevelMVar___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_forMAux___main___at_Lean_Meta_MetaHasEval___spec__5(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_9__withNewFVar___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_isReducible(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_MetaHasEval___rarg___closed__4;
 lean_object* l_Array_forMAux___main___at_Lean_Meta_MetaHasEval___spec__6___boxed(lean_object*, lean_object*, lean_object*);
@@ -116,20 +126,17 @@ lean_object* l_Lean_Meta_withMVarContext(lean_object*);
 lean_object* l_Lean_Meta_MetaM_inhabited___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescope___spec__4(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_isClassExpensive___main___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withLocalDeclD(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getConst___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withTransparency___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescopeReducing(lean_object*);
 lean_object* l_Lean_Meta_MetaM_inhabited___rarg(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_TransparencyMode_Hashable___closed__1;
+lean_object* l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getEnv___rarg(lean_object*);
 lean_object* l_Lean_MetavarContext_hasAssignableMVar___main(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__1;
 lean_object* l_Lean_Meta_getConfig___boxed(lean_object*, lean_object*);
 uint8_t l_Array_isEqvAux___main___at_Lean_Meta_withMVarContext___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_metavar_ctx_is_expr_assigned(lean_object*, lean_object*);
@@ -140,9 +147,9 @@ lean_object* l_Lean_Meta_withNewLocalInstances___rarg(lean_object*, lean_object*
 lean_object* l_Lean_Meta_withNewLocalInstance___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_throwEx___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_dbgTrace___rarg___closed__1;
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1(lean_object*);
 lean_object* l_Lean_Meta_mkMetaExtension(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_InfoCacheKey_Inhabited___closed__1;
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -153,49 +160,44 @@ uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 size_t l_Option_hash___at_Lean_Meta_InfoCacheKey_Hashable___spec__1(lean_object*);
 lean_object* l_Lean_Meta_mkSynthPendingRef(lean_object*);
 lean_object* l_Lean_Meta_TransparencyMode_lt___boxed(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkWHNFRef___lambda__1___closed__1;
-lean_object* l___private_Init_Lean_Meta_Basic_10__withNewFVar(lean_object*);
 lean_object* l_Lean_Meta_withMVarContext___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_9__withNewFVar(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescope___spec__2(lean_object*);
 lean_object* l_Lean_Meta_mkWHNFRef___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_EStateM_bind___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Meta_InfoCacheKey_HasBeq(lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_instantiateLevelMVars___main(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkWHNFRef___lambda__1___closed__2;
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkInferTypeRef___lambda__1___closed__2;
 lean_object* l_Lean_Meta_withMCtx___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isClassQuickConst___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_forM___at_Lean_Meta_MetaHasEval___spec__4(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getConstNoEx___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewMCtxDepth___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_MetaHasEval___rarg___closed__3;
 lean_object* l_Lean_Meta_mkMetaExtension___closed__2;
 lean_object* l_Array_forMAux___main___at_Lean_Meta_MetaHasEval___spec__7(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkMetaExtension___closed__1;
+lean_object* l_Lean_Meta_getOptions___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkInferTypeRef___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkInferTypeRef___lambda__1___closed__1;
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main(lean_object*);
 lean_object* l_Lean_Meta_TransparencyMode_Hashable;
 lean_object* l_Lean_Meta_dbgTrace___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 lean_object* l_Lean_Meta_withTransparency(lean_object*);
 lean_object* l_Lean_Meta_tracer___closed__5;
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkSynthPendingRef___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForallUsedOnly(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_2__getTraceState___rarg(lean_object*);
 lean_object* l_Lean_Meta_MetaHasEval___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__4(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_3__getTraceState___rarg(lean_object*);
 lean_object* l_Lean_Meta_ParamInfo_inhabited___closed__1;
 lean_object* l_Lean_Meta_mkFreshLevelMVarId(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isExprMVarAssigned___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescope___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_tracer___closed__3;
 lean_object* l_Lean_Meta_tracer;
@@ -212,20 +214,19 @@ lean_object* l_Lean_Meta_metaExt___closed__1;
 lean_object* l_ReaderT_pure___at_Lean_Meta_MetaExtState_inhabited___spec__1(lean_object*);
 lean_object* l_Lean_Meta_InfoCacheKey_HasBeq___boxed(lean_object*, lean_object*);
 extern lean_object* l_IO_println___rarg___closed__1;
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_PersistentArray_empty___closed__3;
 lean_object* l_Lean_Meta_lambdaMetaTelescope(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_addContext(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkSynthPendingRef___closed__1;
 lean_object* l_Lean_MetavarContext_assignExpr(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_TransparencyMode_HasBeq___closed__1;
 lean_object* l_Lean_Meta_withNewLocalInstances(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Options_empty;
 lean_object* l_Lean_Meta_approxDefEq___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withAtLeastTransparency___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_MetaExtState_inhabited___lambda__2___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Meta_TransparencyMode_beq(uint8_t, uint8_t);
@@ -235,22 +236,19 @@ lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_isClassExpe
 lean_object* l_Lean_Meta_withNewLocalInstances___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_assignLevelMVar(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_isEmpty___rarg(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_PersistentHashMap_empty___rarg___closed__2;
 lean_object* l_Lean_Meta_getLocalInstances(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__4___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__4___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_Prim_Ref_get___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkFreshId___rarg(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__3(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__5(lean_object*);
 lean_object* l_Lean_Meta_tracer___closed__4;
-lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__4___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_isForall(lean_object*);
 lean_object* l_Lean_Meta_whnf(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main(lean_object*);
 lean_object* l_Lean_Meta_forallMetaTelescopeReducing___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkFVar(lean_object*);
@@ -263,10 +261,10 @@ lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTeles
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_isClassExpensive___main___spec__5(uint8_t, 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_mkLevelMVar(lean_object*);
 lean_object* l_Lean_Meta_getMVarDecl___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1(lean_object*);
 lean_object* l_Lean_Meta_getMCtx___boxed(lean_object*);
 lean_object* l_Lean_Meta_isClassQuick(lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_runMeta(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallMetaTelescopeReducing(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_approxDefEq(lean_object*);
@@ -276,34 +274,35 @@ lean_object* l_Lean_Meta_mkFreshExprMVarAt(lean_object*, lean_object*, lean_obje
 lean_object* l_Lean_LocalDecl_type(lean_object*);
 lean_object* lean_local_ctx_mk_local_decl(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_Meta_mkIsExprDefEqAuxRef___lambda__1___closed__1;
+lean_object* l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescope___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_assignExprMVar(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkIsExprDefEqAuxRef___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__5(lean_object*);
 lean_object* l_Lean_Meta_withLocalDecl___rarg(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__4___rarg___lambda__1(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkIsExprDefEqAuxRef___closed__1;
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_print___at_Lean_Meta_MetaHasEval___spec__3(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_hasAssignableMVar(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux(lean_object*);
 lean_object* l_Lean_Meta_mkIsExprDefEqAuxRef___lambda__1___closed__2;
 lean_object* l_Lean_Meta_withNewLocalInstances___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_ParamInfo_inhabited;
 lean_object* l_Lean_Meta_MetaHasEval___rarg___closed__1;
 lean_object* l_Lean_Meta_getExprMVarAssignment_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_metaExt;
 lean_object* l_Lean_Meta_getLocalDecl(lean_object*, lean_object*, lean_object*);
 uint8_t lean_expr_eqv(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_3__liftMkBindingM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_liftStateMCtx___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_tracer___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_resettingSynthInstanceCache(lean_object*);
 lean_object* l_Lean_Meta_mkFreshExprMVar(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Expr_hasMVar(lean_object*);
 lean_object* l_Lean_Meta_tracer___closed__2;
 lean_object* l_Lean_Meta_withAtLeastTransparency___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_metavar_ctx_mk_decl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
 lean_object* l_Lean_Meta_synthPendingRef;
 lean_object* l_Lean_Meta_getConstAux(lean_object*, uint8_t, lean_object*, lean_object*);
@@ -312,18 +311,19 @@ lean_object* l_Lean_Meta_throwEx___rarg___boxed(lean_object*, lean_object*, lean
 lean_object* l_Lean_Meta_withMVarContext___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_Basic_1__whenDebugging___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_incDepth(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_whnfRef;
 lean_object* l_Lean_Meta_synthPending(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_MetaExtState_inhabited___closed__3;
 lean_object* l_Lean_Meta_isExprDefEqAuxRef;
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_TransparencyMode_HasBeq;
 lean_object* l_Lean_Meta_throwBug___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_dbgTrace___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_tracer___closed__1;
 lean_object* l_Lean_Meta_lambdaTelescope___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_4__liftMkBindingM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getExprMVarAssignment_x3f___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_io_ref_reset(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withLocalDeclD___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_assignLevelMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -332,40 +332,43 @@ lean_object* l_Lean_Meta_tracer___lambda__1___boxed(lean_object*, lean_object*,
 lean_object* l_Lean_Meta_mkFreshExprMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isReducible(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at_Lean_Meta_MetaHasEval___spec__7___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_registerEnvExtensionUnsafe___rarg___closed__2;
 lean_object* l_Lean_Meta_withNewLocalInstances___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withAtLeastTransparency(lean_object*);
 lean_object* lean_metavar_ctx_find_decl(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_dbgTrace(lean_object*);
 lean_object* l_Lean_Meta_mkFreshId(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescope___spec__3___rarg___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_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_TransparencyMode_beq___boxed(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_11__regTraceClasses(lean_object*);
 lean_object* l_Lean_Meta_metaExt___elambda__1(lean_object*);
 lean_object* l_Lean_Meta_getTransparency___boxed(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_TraceState_Inhabited___closed__1;
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_instantiateMVars___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_io_ref_set(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__4(lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Meta_mkMetaExtension___spec__1(lean_object*, lean_object*);
 uint8_t l_Lean_Meta_TransparencyMode_lt(uint8_t, uint8_t);
 lean_object* l_Lean_Meta_assignExprMVar___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkInferTypeRef(lean_object*);
+lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getConstInfo(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkLambda(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_10__regTraceClasses(lean_object*);
 lean_object* l_Lean_Meta_getMVarDecl(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_MkBinding_mkBinding(uint8_t, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
 lean_object* l_Lean_Meta_getTransparency(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Exception_toStr(lean_object*);
 size_t lean_usize_mix_hash(size_t, size_t);
 lean_object* l_ReaderT_pure___at_Lean_Meta_MetaExtState_inhabited___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_io_initializing(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_2__getOptions(lean_object*, lean_object*);
+lean_object* l_Lean_Meta_getOptions(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallMetaTelescope(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isClassQuickConst(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_EnvExtension_getStateUnsafe___rarg(lean_object*, lean_object*);
@@ -374,22 +377,18 @@ lean_object* l_Lean_Meta_withConfig(lean_object*);
 lean_object* l_Lean_Meta_withNewMCtxDepth(lean_object*);
 lean_object* l_Lean_Meta_shouldReduceReducibleOnly(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getMCtx___rarg(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_4__liftMkBindingM(lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__4___rarg(lean_object*, uint8_t, 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_Meta_whnfD(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2(lean_object*);
 lean_object* l_Lean_Meta_mkWHNFRef___closed__1;
 lean_object* l_Lean_Meta_mkFreshLevelMVar___rarg(lean_object*);
 extern lean_object* l_Lean_MetavarContext_Inhabited___closed__1;
+lean_object* l___private_Init_Lean_Meta_Basic_3__liftMkBindingM(lean_object*);
 lean_object* l_PersistentHashMap_empty___at_Lean_Meta_MetaHasEval___spec__1___closed__1;
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescope___spec__3(lean_object*);
 lean_object* l_Lean_Meta_mkMetaExtension___closed__3;
 lean_object* l_PersistentArray_forMAux___main___at_Lean_Meta_MetaHasEval___spec__5___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isClassQuick___main___closed__1;
 uint8_t l_Lean_LocalInstance_beq(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_2__getOptions___boxed(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2(lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Meta_mkMetaExtension___spec__1___closed__2;
 lean_object* l_Lean_Meta_resettingSynthInstanceCache___rarg___closed__1;
 lean_object* l_Lean_Meta_TransparencyMode_hash___boxed(lean_object*);
@@ -398,10 +397,10 @@ lean_object* l_Array_isEqvAux___main___at_Lean_Meta_withMVarContext___spec__1___
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallBoundedTelescope___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getMCtx(lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_2__getTraceState(lean_object*);
 lean_object* l_Lean_Meta_MetaExtState_inhabited___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_3__getTraceState(lean_object*);
 lean_object* lean_local_ctx_find(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___main(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentArray_forM___at_Lean_Meta_MetaHasEval___spec__4___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkFreshLevelMVarId___boxed(lean_object*);
 extern lean_object* l_HashMap_Inhabited___closed__1;
@@ -414,27 +413,28 @@ lean_object* l_Lean_Meta_mkWHNFRef(lean_object*);
 lean_object* l___private_Init_Lean_Meta_Basic_1__whenDebugging(lean_object*);
 lean_object* l_Lean_Meta_getConfig(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_forallTelescopeReducing___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getLCtx(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withMCtx(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isReadOnlyOrSyntheticOpaqueExprMVar___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isClassExpensive(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getConstInfo___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_name_mk_numeral(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_shouldReduceAll___boxed(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkIsExprDefEqAuxRef___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Meta_isClassExpensive___main___spec__4(lean_object*, lean_object*);
 uint8_t lean_is_class(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescopeReducing___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkFreshLevelMVar___boxed(lean_object*);
 lean_object* l_Lean_Meta_forallBoundedTelescope___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_NameGenerator_Inhabited___closed__3;
+lean_object* l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_Meta_mkMetaExtension___spec__1___closed__1;
 lean_object* l_Lean_Meta_getFVarLocalDecl___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at_Lean_Meta_MetaHasEval___spec__6(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getConstAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at_Lean_Meta_isClassExpensive___main___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2539,7 +2539,7 @@ lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_2__getOptions(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_Meta_getOptions(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; 
@@ -2552,11 +2552,11 @@ lean_ctor_set(x_5, 1, x_2);
 return x_5;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_2__getOptions___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l_Lean_Meta_getOptions___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l___private_Init_Lean_Meta_Basic_2__getOptions(x_1, x_2);
+x_3 = l_Lean_Meta_getOptions(x_1, x_2);
 lean_dec(x_1);
 return x_3;
 }
@@ -3500,7 +3500,7 @@ lean_dec(x_1);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_3__getTraceState___rarg(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_2__getTraceState___rarg(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -3512,19 +3512,19 @@ lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_3__getTraceState(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_2__getTraceState(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_3__getTraceState___rarg), 1, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_2__getTraceState___rarg), 1, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_3__getTraceState___boxed(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_2__getTraceState___boxed(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l___private_Init_Lean_Meta_Basic_3__getTraceState(x_1);
+x_2 = l___private_Init_Lean_Meta_Basic_2__getTraceState(x_1);
 lean_dec(x_1);
 return x_2;
 }
@@ -3618,7 +3618,7 @@ lean_object* _init_l_Lean_Meta_tracer___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_2__getOptions___boxed), 2, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Meta_getOptions___boxed), 2, 0);
 return x_1;
 }
 }
@@ -3634,7 +3634,7 @@ lean_object* _init_l_Lean_Meta_tracer___closed__3() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_3__getTraceState___boxed), 1, 0);
+x_1 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_2__getTraceState___boxed), 1, 0);
 return x_1;
 }
 }
@@ -4070,7 +4070,7 @@ lean_dec(x_2);
 return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_4__liftMkBindingM___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Init_Lean_Meta_Basic_3__liftMkBindingM___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -4344,11 +4344,11 @@ return x_77;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_4__liftMkBindingM(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_3__liftMkBindingM(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_4__liftMkBindingM___rarg), 3, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_3__liftMkBindingM___rarg), 3, 0);
 return x_2;
 }
 }
@@ -9605,7 +9605,7 @@ lean_dec(x_2);
 return x_7;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, uint8_t x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 uint8_t x_12; 
@@ -9625,12 +9625,12 @@ else
 {
 lean_object* x_14; 
 lean_dec(x_3);
-x_14 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg(x_4, x_5, x_6, x_1, x_7, x_2, x_8, x_9, x_10, x_11);
+x_14 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg(x_4, x_5, x_6, x_1, x_7, x_2, x_8, x_9, x_10, x_11);
 return x_14;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; 
@@ -9792,7 +9792,7 @@ lean_closure_set(x_18, 0, x_13);
 x_19 = lean_box(x_2);
 lean_inc(x_1);
 lean_inc(x_6);
-x_20 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___lambda__1___boxed), 11, 8);
+x_20 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___lambda__1___boxed), 11, 8);
 lean_closure_set(x_20, 0, x_4);
 lean_closure_set(x_20, 1, x_6);
 lean_closure_set(x_20, 2, x_13);
@@ -9847,7 +9847,7 @@ lean_closure_set(x_29, 0, x_13);
 x_30 = lean_box(x_2);
 lean_inc(x_1);
 lean_inc(x_6);
-x_31 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___lambda__1___boxed), 11, 8);
+x_31 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___lambda__1___boxed), 11, 8);
 lean_closure_set(x_31, 0, x_4);
 lean_closure_set(x_31, 1, x_6);
 lean_closure_set(x_31, 2, x_13);
@@ -9871,61 +9871,61 @@ return x_34;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___boxed), 10, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___boxed), 10, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 uint8_t x_12; lean_object* x_13; 
 x_12 = lean_unbox(x_5);
 lean_dec(x_5);
-x_13 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___lambda__1(x_1, x_2, x_3, x_4, x_12, x_6, x_7, x_8, x_9, x_10, x_11);
+x_13 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___lambda__1(x_1, x_2, x_3, x_4, x_12, x_6, x_7, x_8, x_9, x_10, x_11);
 return x_13;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 uint8_t x_11; lean_object* x_12; 
 x_11 = lean_unbox(x_2);
 lean_dec(x_2);
-x_12 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg(x_1, x_11, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_12 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg(x_1, x_11, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_12;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 lean_object* x_11; 
-x_11 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_11 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_11;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___rarg___boxed), 10, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___rarg___boxed), 10, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
 _start:
 {
 uint8_t x_11; lean_object* x_12; 
 x_11 = lean_unbox(x_2);
 lean_dec(x_2);
-x_12 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___rarg(x_1, x_11, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_12 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___rarg(x_1, x_11, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_12;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
@@ -9960,7 +9960,7 @@ lean_inc(x_13);
 x_14 = 1;
 x_15 = l_Array_empty___closed__1;
 x_16 = lean_unsigned_to_nat(0u);
-x_17 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___rarg(x_1, x_14, x_3, x_4, x_13, x_15, x_16, x_8, x_5, x_9);
+x_17 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___rarg(x_1, x_14, x_3, x_4, x_13, x_15, x_16, x_8, x_5, x_9);
 return x_17;
 }
 }
@@ -9993,11 +9993,11 @@ return x_21;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___rarg), 6, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___rarg), 6, 0);
 return x_2;
 }
 }
@@ -12263,7 +12263,7 @@ return x_20;
 else
 {
 lean_object* x_21; 
-x_21 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+x_21 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 return x_21;
 }
 }
@@ -16567,7 +16567,7 @@ return x_485;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(uint8_t 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; 
@@ -16771,7 +16771,7 @@ return x_20;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
@@ -16842,7 +16842,7 @@ lean_inc(x_17);
 x_18 = 1;
 x_19 = l_Array_empty___closed__1;
 x_20 = lean_unsigned_to_nat(0u);
-x_21 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(x_18, x_2, x_17, x_19, x_20, x_7, x_3, x_8);
+x_21 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(x_18, x_2, x_17, x_19, x_20, x_7, x_3, x_8);
 return x_21;
 }
 }
@@ -16914,7 +16914,7 @@ lean_inc(x_35);
 x_36 = 1;
 x_37 = l_Array_empty___closed__1;
 x_38 = lean_unsigned_to_nat(0u);
-x_39 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(x_36, x_2, x_35, x_37, x_38, x_22, x_3, x_23);
+x_39 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(x_36, x_2, x_35, x_37, x_38, x_22, x_3, x_23);
 return x_39;
 }
 }
@@ -16962,7 +16962,7 @@ if (x_7 == 0)
 uint8_t x_8; lean_object* x_9; 
 x_8 = 2;
 lean_ctor_set_uint8(x_6, sizeof(void*)*1 + 6, x_8);
-x_9 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(x_1, x_4, x_2, x_3);
+x_9 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(x_1, x_4, x_2, x_3);
 return x_9;
 }
 else
@@ -16988,7 +16988,7 @@ lean_ctor_set_uint8(x_18, sizeof(void*)*1 + 4, x_15);
 lean_ctor_set_uint8(x_18, sizeof(void*)*1 + 5, x_16);
 lean_ctor_set_uint8(x_18, sizeof(void*)*1 + 6, x_17);
 lean_ctor_set(x_2, 0, x_18);
-x_19 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(x_1, x_4, x_2, x_3);
+x_19 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(x_1, x_4, x_2, x_3);
 return x_19;
 }
 }
@@ -17035,7 +17035,7 @@ x_33 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_33, 0, x_32);
 lean_ctor_set(x_33, 1, x_21);
 lean_ctor_set(x_33, 2, x_22);
-x_34 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(x_1, x_4, x_33, x_3);
+x_34 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_isClassExpensive___main___spec__1(x_1, x_4, x_33, x_3);
 return x_34;
 }
 }
@@ -17084,13 +17084,13 @@ lean_dec(x_1);
 return x_6;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 uint8_t x_9; lean_object* x_10; 
 x_9 = lean_unbox(x_1);
 lean_dec(x_1);
-x_10 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_10 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_isClassExpensive___main___spec__2(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 return x_10;
 }
 }
@@ -19249,7 +19249,7 @@ else
 {
 lean_object* x_13; 
 lean_dec(x_3);
-x_13 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(x_1, x_4, x_5, x_6, x_2, x_7, x_8, x_9, x_10);
+x_13 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(x_1, x_4, x_5, x_6, x_2, x_7, x_8, x_9, x_10);
 return x_13;
 }
 }
@@ -23544,7 +23544,7 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Meta_withNewLocalInstances___main___at_L
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 lean_object* x_10; 
@@ -23758,11 +23758,11 @@ return x_21;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg___boxed), 9, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg___boxed), 9, 0);
 return x_2;
 }
 }
@@ -23776,7 +23776,7 @@ x_6 = lean_box(0);
 x_7 = 0;
 x_8 = l_Array_empty___closed__1;
 x_9 = lean_unsigned_to_nat(0u);
-x_10 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(x_2, x_7, x_6, x_5, x_8, x_9, x_1, x_3, x_4);
+x_10 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(x_2, x_7, x_6, x_5, x_8, x_9, x_1, x_3, x_4);
 return x_10;
 }
 }
@@ -23833,13 +23833,13 @@ lean_dec(x_3);
 return x_9;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 uint8_t x_10; lean_object* x_11; 
 x_10 = lean_unbox(x_2);
 lean_dec(x_2);
-x_11 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(x_1, x_10, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+x_11 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescope___spec__1___rarg(x_1, x_10, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 return x_11;
 }
 }
@@ -25990,7 +25990,7 @@ else
 {
 lean_object* x_13; 
 lean_dec(x_3);
-x_13 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(x_1, x_4, x_5, x_6, x_2, x_7, x_8, x_9, x_10);
+x_13 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(x_1, x_4, x_5, x_6, x_2, x_7, x_8, x_9, x_10);
 return x_13;
 }
 }
@@ -30285,7 +30285,7 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Meta_withNewLocalInstances___main___at_L
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 lean_object* x_10; 
@@ -30499,15 +30499,15 @@ return x_21;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg___boxed), 9, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg___boxed), 9, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1___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; 
@@ -30541,7 +30541,7 @@ lean_inc(x_12);
 x_13 = 1;
 x_14 = l_Array_empty___closed__1;
 x_15 = lean_unsigned_to_nat(0u);
-x_16 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(x_1, x_13, x_3, x_12, x_14, x_15, x_7, x_4, x_8);
+x_16 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(x_1, x_13, x_3, x_12, x_14, x_15, x_7, x_4, x_8);
 return x_16;
 }
 }
@@ -30573,11 +30573,11 @@ return x_20;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1___rarg), 5, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1___rarg), 5, 0);
 return x_2;
 }
 }
@@ -30586,7 +30586,7 @@ _start:
 {
 lean_object* x_5; lean_object* x_6; 
 x_5 = lean_box(0);
-x_6 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1___rarg(x_2, x_1, x_5, x_3, x_4);
+x_6 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallTelescopeReducing___spec__1___rarg(x_2, x_1, x_5, x_3, x_4);
 return x_6;
 }
 }
@@ -30643,13 +30643,13 @@ lean_dec(x_3);
 return x_9;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 uint8_t x_10; lean_object* x_11; 
 x_10 = lean_unbox(x_2);
 lean_dec(x_2);
-x_11 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(x_1, x_10, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+x_11 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallTelescopeReducing___spec__2___rarg(x_1, x_10, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 return x_11;
 }
 }
@@ -32800,7 +32800,7 @@ else
 {
 lean_object* x_13; 
 lean_dec(x_3);
-x_13 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(x_1, x_4, x_5, x_6, x_2, x_7, x_8, x_9, x_10);
+x_13 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(x_1, x_4, x_5, x_6, x_2, x_7, x_8, x_9, x_10);
 return x_13;
 }
 }
@@ -37095,7 +37095,7 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Meta_withNewLocalInstances___main___at_L
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(lean_object* x_1, uint8_t x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 lean_object* x_10; 
@@ -37309,15 +37309,15 @@ return x_21;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg___boxed), 9, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg___boxed), 9, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1___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; 
@@ -37351,7 +37351,7 @@ lean_inc(x_12);
 x_13 = 1;
 x_14 = l_Array_empty___closed__1;
 x_15 = lean_unsigned_to_nat(0u);
-x_16 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(x_1, x_13, x_3, x_12, x_14, x_15, x_7, x_4, x_8);
+x_16 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(x_1, x_13, x_3, x_12, x_14, x_15, x_7, x_4, x_8);
 return x_16;
 }
 }
@@ -37383,11 +37383,11 @@ return x_20;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1___rarg), 5, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1___rarg), 5, 0);
 return x_2;
 }
 }
@@ -37395,7 +37395,7 @@ lean_object* l_Lean_Meta_forallBoundedTelescope___rarg(lean_object* x_1, lean_ob
 _start:
 {
 lean_object* x_6; 
-x_6 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1___rarg(x_3, x_1, x_2, x_4, x_5);
+x_6 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at_Lean_Meta_forallBoundedTelescope___spec__1___rarg(x_3, x_1, x_2, x_4, x_5);
 return x_6;
 }
 }
@@ -37452,13 +37452,13 @@ lean_dec(x_3);
 return x_9;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
 uint8_t x_10; lean_object* x_11; 
 x_10 = lean_unbox(x_2);
 lean_dec(x_2);
-x_11 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(x_1, x_10, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+x_11 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at_Lean_Meta_forallBoundedTelescope___spec__2___rarg(x_1, x_10, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 return x_11;
 }
 }
@@ -37576,7 +37576,7 @@ return x_25;
 }
 }
 }
-lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
@@ -37669,7 +37669,7 @@ lean_ctor_set(x_36, 0, x_26);
 lean_ctor_set(x_36, 1, x_14);
 x_37 = lean_array_push(x_35, x_36);
 lean_ctor_set(x_7, 2, x_37);
-x_38 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_28, x_7, x_25);
+x_38 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_28, x_7, x_25);
 if (lean_obj_tag(x_38) == 0)
 {
 lean_object* x_39; lean_object* x_40; uint8_t x_41; 
@@ -38001,7 +38001,7 @@ x_112 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_112, 0, x_107);
 lean_ctor_set(x_112, 1, x_108);
 lean_ctor_set(x_112, 2, x_111);
-x_113 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_28, x_112, x_25);
+x_113 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_28, x_112, x_25);
 if (lean_obj_tag(x_113) == 0)
 {
 lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; 
@@ -38207,7 +38207,7 @@ if (lean_is_scalar(x_154)) {
 lean_ctor_set(x_157, 0, x_151);
 lean_ctor_set(x_157, 1, x_152);
 lean_ctor_set(x_157, 2, x_156);
-x_158 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_28, x_157, x_25);
+x_158 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_28, x_157, x_25);
 if (lean_obj_tag(x_158) == 0)
 {
 lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
@@ -38444,7 +38444,7 @@ if (lean_is_scalar(x_207)) {
 lean_ctor_set(x_210, 0, x_204);
 lean_ctor_set(x_210, 1, x_205);
 lean_ctor_set(x_210, 2, x_209);
-x_211 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_28, x_210, x_203);
+x_211 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_28, x_210, x_203);
 if (lean_obj_tag(x_211) == 0)
 {
 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; 
@@ -38668,7 +38668,7 @@ lean_ctor_set(x_262, 0, x_252);
 lean_ctor_set(x_262, 1, x_14);
 x_263 = lean_array_push(x_261, x_262);
 lean_ctor_set(x_7, 2, x_263);
-x_264 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_254, x_7, x_251);
+x_264 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_254, x_7, x_251);
 if (lean_obj_tag(x_264) == 0)
 {
 lean_object* x_265; lean_object* x_266; uint8_t x_267; 
@@ -39000,7 +39000,7 @@ x_338 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_338, 0, x_333);
 lean_ctor_set(x_338, 1, x_334);
 lean_ctor_set(x_338, 2, x_337);
-x_339 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_254, x_338, x_251);
+x_339 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_254, x_338, x_251);
 if (lean_obj_tag(x_339) == 0)
 {
 lean_object* x_340; lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; 
@@ -39206,7 +39206,7 @@ if (lean_is_scalar(x_380)) {
 lean_ctor_set(x_383, 0, x_377);
 lean_ctor_set(x_383, 1, x_378);
 lean_ctor_set(x_383, 2, x_382);
-x_384 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_254, x_383, x_251);
+x_384 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_254, x_383, x_251);
 if (lean_obj_tag(x_384) == 0)
 {
 lean_object* x_385; lean_object* x_386; lean_object* x_387; lean_object* x_388; lean_object* x_389; lean_object* x_390; lean_object* x_391; lean_object* x_392; lean_object* x_393; lean_object* x_394; lean_object* x_395; lean_object* x_396; lean_object* x_397; lean_object* x_398; lean_object* x_399; lean_object* x_400; 
@@ -39443,7 +39443,7 @@ if (lean_is_scalar(x_433)) {
 lean_ctor_set(x_436, 0, x_430);
 lean_ctor_set(x_436, 1, x_431);
 lean_ctor_set(x_436, 2, x_435);
-x_437 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_254, x_436, x_429);
+x_437 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_254, x_436, x_429);
 if (lean_obj_tag(x_437) == 0)
 {
 lean_object* x_438; lean_object* x_439; lean_object* x_440; lean_object* x_441; lean_object* x_442; lean_object* x_443; lean_object* x_444; lean_object* x_445; lean_object* x_446; lean_object* x_447; lean_object* x_448; lean_object* x_449; lean_object* x_450; lean_object* x_451; lean_object* x_452; lean_object* x_453; 
@@ -39696,15 +39696,15 @@ return x_481;
 }
 }
 }
-lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1(lean_object* x_1) {
+lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg___boxed), 8, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg___boxed), 8, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
@@ -39796,7 +39796,7 @@ lean_dec(x_10);
 lean_ctor_set(x_6, 1, x_2);
 lean_inc(x_4);
 lean_inc(x_3);
-x_11 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_3, x_4, x_5, x_3, x_4, x_6, x_7);
+x_11 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_3, x_4, x_5, x_3, x_4, x_6, x_7);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
@@ -39816,7 +39816,7 @@ lean_ctor_set(x_14, 1, x_2);
 lean_ctor_set(x_14, 2, x_13);
 lean_inc(x_4);
 lean_inc(x_3);
-x_15 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_3, x_4, x_5, x_3, x_4, x_14, x_7);
+x_15 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_3, x_4, x_5, x_3, x_4, x_14, x_7);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
@@ -39825,38 +39825,38 @@ return x_15;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___rarg), 7, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___rarg), 7, 0);
 return x_2;
 }
 }
-lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 lean_object* x_9; 
-x_9 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_9 = l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
 return x_9;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___rarg), 7, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___rarg), 7, 0);
 return x_2;
 }
 }
@@ -39868,7 +39868,7 @@ x_5 = lean_ctor_get(x_3, 1);
 lean_inc(x_5);
 x_6 = l_Array_empty___closed__1;
 x_7 = lean_unsigned_to_nat(0u);
-x_8 = l___private_Init_Lean_Meta_Basic_7__lambdaTelescopeAux___main___rarg(x_2, x_5, x_6, x_7, x_1, x_3, x_4);
+x_8 = l___private_Init_Lean_Meta_Basic_6__lambdaTelescopeAux___main___rarg(x_2, x_5, x_6, x_7, x_1, x_3, x_4);
 return x_8;
 }
 }
@@ -39880,7 +39880,7 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Meta_lambdaTelescope___rarg), 4, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___main(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___main(uint8_t 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; 
@@ -40117,32 +40117,32 @@ return x_33;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 uint8_t x_9; lean_object* x_10; 
 x_9 = lean_unbox(x_1);
 lean_dec(x_1);
-x_10 = l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___main(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_10 = l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___main(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_2);
 return x_10;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux(uint8_t 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; 
-x_9 = l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_9 = l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 return x_9;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 uint8_t x_9; lean_object* x_10; 
 x_9 = lean_unbox(x_1);
 lean_dec(x_1);
-x_10 = l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_10 = l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 lean_dec(x_2);
 return x_10;
 }
@@ -40155,7 +40155,7 @@ x_4 = lean_box(0);
 x_5 = 0;
 x_6 = l_Array_empty___closed__1;
 x_7 = lean_unsigned_to_nat(0u);
-x_8 = l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___main(x_5, x_4, x_6, x_6, x_7, x_1, x_2, x_3);
+x_8 = l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___main(x_5, x_4, x_6, x_6, x_7, x_1, x_2, x_3);
 return x_8;
 }
 }
@@ -40166,7 +40166,7 @@ uint8_t x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8;
 x_5 = 1;
 x_6 = l_Array_empty___closed__1;
 x_7 = lean_unsigned_to_nat(0u);
-x_8 = l___private_Init_Lean_Meta_Basic_8__forallMetaTelescopeReducingAux___main(x_5, x_2, x_6, x_6, x_7, x_1, x_3, x_4);
+x_8 = l___private_Init_Lean_Meta_Basic_7__forallMetaTelescopeReducingAux___main(x_5, x_2, x_6, x_6, x_7, x_1, x_3, x_4);
 return x_8;
 }
 }
@@ -40179,7 +40179,7 @@ lean_dec(x_2);
 return x_5;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux___main(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* l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@@ -40304,30 +40304,30 @@ return x_52;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux(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* l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_1);
@@ -40340,7 +40340,7 @@ _start:
 lean_object* x_5; lean_object* x_6; lean_object* x_7; 
 x_5 = l_Array_empty___closed__1;
 x_6 = lean_unsigned_to_nat(0u);
-x_7 = l___private_Init_Lean_Meta_Basic_9__lambdaMetaTelescopeAux___main(x_2, x_5, x_5, x_6, x_1, x_3, x_4);
+x_7 = l___private_Init_Lean_Meta_Basic_8__lambdaMetaTelescopeAux___main(x_2, x_5, x_5, x_6, x_1, x_3, x_4);
 return x_7;
 }
 }
@@ -40863,7 +40863,7 @@ x_2 = lean_alloc_closure((void*)(l_Lean_Meta_approxDefEq___rarg), 3, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_10__withNewFVar___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_Meta_Basic_9__withNewFVar___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; 
@@ -41885,11 +41885,11 @@ return x_230;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_10__withNewFVar(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_9__withNewFVar(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_10__withNewFVar___rarg), 5, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_Meta_Basic_9__withNewFVar___rarg), 5, 0);
 return x_2;
 }
 }
@@ -46280,7 +46280,7 @@ lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__1() {
+lean_object* _init_l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -46288,21 +46288,21 @@ x_1 = lean_mk_string("Meta");
 return x_1;
 }
 }
-lean_object* _init_l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2() {
+lean_object* _init_l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__1;
+x_2 = l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_11__regTraceClasses(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Basic_10__regTraceClasses(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
+x_2 = l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 x_3 = l_Lean_registerTraceClass(x_2, x_1);
 return x_3;
 }
@@ -46568,11 +46568,11 @@ l_Lean_Meta_MetaHasEval___rarg___closed__3 = _init_l_Lean_Meta_MetaHasEval___rar
 lean_mark_persistent(l_Lean_Meta_MetaHasEval___rarg___closed__3);
 l_Lean_Meta_MetaHasEval___rarg___closed__4 = _init_l_Lean_Meta_MetaHasEval___rarg___closed__4();
 lean_mark_persistent(l_Lean_Meta_MetaHasEval___rarg___closed__4);
-l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__1 = _init_l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__1);
-l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2 = _init_l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2();
-lean_mark_persistent(l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2);
-res = l___private_Init_Lean_Meta_Basic_11__regTraceClasses(lean_io_mk_world());
+l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__1 = _init_l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__1);
+l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2 = _init_l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2();
+lean_mark_persistent(l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2);
+res = l___private_Init_Lean_Meta_Basic_10__regTraceClasses(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_mk_io_result(lean_box(0));
diff --git a/stage0/stdlib/Init/Lean/Meta/Check.c b/stage0/stdlib/Init/Lean/Meta/Check.c
index 1189fec5a9..10d15d0fed 100644
--- a/stage0/stdlib/Init/Lean/Meta/Check.c
+++ b/stage0/stdlib/Init/Lean/Meta/Check.c
@@ -23,6 +23,7 @@ lean_object* l___private_Init_Lean_Meta_Check_4__checkConstant(lean_object*, lea
 lean_object* l___private_Init_Lean_Meta_Check_1__ensureType(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Util_Trace_2__addNode___at_Lean_Meta_check___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_EIO_Monad___closed__1;
+extern lean_object* l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 lean_object* l___private_Init_Lean_Meta_Check_6__checkAux(lean_object*, lean_object*, lean_object*);
 lean_object* lean_environment_find(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isExprDefEqAux(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -49,7 +50,6 @@ lean_object* l_Lean_MonadTracerAdapter_addTrace___at_Lean_Meta_isTypeCorrect___s
 lean_object* l_Lean_Meta_isTypeCorrect___closed__1;
 lean_object* l_Lean_Meta_isTypeCorrect___closed__2;
 lean_object* l_Array_forMAux___main___at___private_Init_Lean_Meta_Check_6__checkAux___main___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 lean_object* l_List_lengthAux___main___rarg(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Util_Trace_3__getResetTraces___at_Lean_Meta_check___spec__1(lean_object*);
@@ -2676,7 +2676,7 @@ lean_object* _init_l_Lean_Meta_check___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
+x_1 = l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 x_2 = l_Lean_Meta_check___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -4255,7 +4255,7 @@ lean_object* _init_l_Lean_Meta_isTypeCorrect___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
+x_1 = l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 x_2 = l_Lean_Meta_isTypeCorrect___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
diff --git a/stage0/stdlib/Init/Lean/Meta/Exception.c b/stage0/stdlib/Init/Lean/Meta/Exception.c
index 269d9d2cd7..192959d99e 100644
--- a/stage0/stdlib/Init/Lean/Meta/Exception.c
+++ b/stage0/stdlib/Init/Lean/Meta/Exception.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Lean.Meta.Exception
-// Imports: Init.Lean.Environment Init.Lean.MetavarContext Init.Lean.Util.Message
+// Imports: Init.Lean.Environment Init.Lean.MetavarContext Init.Lean.Message
 #include "runtime/lean.h"
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -1821,7 +1821,7 @@ return x_144;
 }
 lean_object* initialize_Init_Lean_Environment(lean_object*);
 lean_object* initialize_Init_Lean_MetavarContext(lean_object*);
-lean_object* initialize_Init_Lean_Util_Message(lean_object*);
+lean_object* initialize_Init_Lean_Message(lean_object*);
 static bool _G_initialized = false;
 lean_object* initialize_Init_Lean_Meta_Exception(lean_object* w) {
 lean_object * res;
@@ -1833,7 +1833,7 @@ lean_dec_ref(res);
 res = initialize_Init_Lean_MetavarContext(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = initialize_Init_Lean_Util_Message(lean_io_mk_world());
+res = initialize_Init_Lean_Message(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Meta_Exception_Inhabited___closed__1 = _init_l_Lean_Meta_Exception_Inhabited___closed__1();
diff --git a/stage0/stdlib/Init/Lean/Meta/ExprDefEq.c b/stage0/stdlib/Init/Lean/Meta/ExprDefEq.c
index b91b6bab08..bad1bebc33 100644
--- a/stage0/stdlib/Init/Lean/Meta/ExprDefEq.c
+++ b/stage0/stdlib/Init/Lean/Meta/ExprDefEq.c
@@ -49,6 +49,7 @@ lean_object* l_Lean_Meta_CheckAssignment_checkFVar(lean_object*, lean_object*, l
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_8__cache___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_metavar_ctx_get_expr_assignment(lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at_Lean_Meta_CheckAssignment_check___main___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkMVar(lean_object*);
 lean_object* l_Lean_Meta_isClassQuick___main(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
@@ -74,6 +75,7 @@ lean_object* l___private_Init_Lean_Meta_ExprDefEq_26__tryHeuristic(lean_object*,
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_23__isDefEqLeft(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___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* l_Lean_LocalContext_findFVar_x3f(lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at___private_Init_Lean_Meta_ExprDefEq_7__findCached_x3f___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_WHNF_getStuckMVar___main___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -198,7 +200,6 @@ uint8_t l_Array_isEmpty___rarg(lean_object*);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_36__isSynthetic(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isEtaUnassignedMVar(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkLambda(lean_object*, uint8_t, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___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* l_Lean_Meta_mkFreshId___rarg(lean_object*);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_6__isDefEqBinding(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_try___at___private_Init_Lean_Meta_ExprDefEq_40__isDefEqQuick___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -279,6 +280,7 @@ lean_object* l_Lean_Meta_CheckAssignmentQuick_check(uint8_t, uint8_t, lean_objec
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_41__isDefEqProofIrrel(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_try___at___private_Init_Lean_Meta_ExprDefEq_40__isDefEqQuick___main___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_24__isDefEqRight___closed__2;
+extern lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
 uint8_t l_Bool_toLBool(uint8_t);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_4__isDefEqArgs___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_synthPending(lean_object*, lean_object*, lean_object*);
@@ -318,8 +320,6 @@ lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_objec
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_17__checkTypesAndAssign___closed__3;
 uint8_t l_Array_anyRangeMAux___main___at___private_Init_Lean_Meta_ExprDefEq_19__processAssignmentAux___main___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_array(lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_8__cache(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_checkAssignment___closed__1;
 lean_object* l_Lean_Meta_CheckAssignment_mkAuxMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -327,7 +327,7 @@ lean_object* l___private_Init_Lean_Meta_ExprDefEq_21__isDeltaCandidate(lean_obje
 lean_object* l_Lean_Meta_CheckAssignment_Lean_MonadCache___closed__3;
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_32__unfoldReducibeDefEq___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__4___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_mkHashMap___at_Lean_Meta_checkAssignment___spec__2(lean_object*);
 lean_object* l_Lean_Meta_whnfD(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_ExprDefEq_35__isAssigned(lean_object*, lean_object*, lean_object*);
@@ -16196,7 +16196,7 @@ return x_24;
 else
 {
 lean_object* x_25; 
-x_25 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(x_5, x_2, x_4, x_6, x_7, x_8, x_3, x_1, x_9, x_10, x_11);
+x_25 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(x_5, x_2, x_4, x_6, x_7, x_8, x_3, x_1, x_9, x_10, x_11);
 return x_25;
 }
 }
@@ -20534,7 +20534,7 @@ return x_491;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, uint8_t x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 lean_object* x_12; 
@@ -20740,7 +20740,7 @@ return x_22;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__1(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* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
@@ -20761,7 +20761,7 @@ if (x_12 == 0)
 lean_object* x_13; uint8_t x_14; 
 lean_dec(x_10);
 lean_dec(x_5);
-x_13 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
+x_13 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
 x_14 = lean_nat_dec_eq(x_13, x_2);
 lean_dec(x_2);
 if (x_14 == 0)
@@ -20828,7 +20828,7 @@ lean_inc(x_26);
 x_27 = 1;
 x_28 = l_Array_empty___closed__1;
 x_29 = lean_unsigned_to_nat(0u);
-x_30 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(x_1, x_2, x_3, x_27, x_5, x_26, x_28, x_29, x_10, x_6, x_11);
+x_30 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(x_1, x_2, x_3, x_27, x_5, x_26, x_28, x_29, x_10, x_6, x_11);
 return x_30;
 }
 }
@@ -20846,7 +20846,7 @@ if (x_33 == 0)
 lean_object* x_34; uint8_t x_35; 
 lean_dec(x_31);
 lean_dec(x_5);
-x_34 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
+x_34 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
 x_35 = lean_nat_dec_eq(x_34, x_2);
 lean_dec(x_2);
 if (x_35 == 0)
@@ -20915,7 +20915,7 @@ lean_inc(x_48);
 x_49 = 1;
 x_50 = l_Array_empty___closed__1;
 x_51 = lean_unsigned_to_nat(0u);
-x_52 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(x_1, x_2, x_3, x_49, x_5, x_48, x_50, x_51, x_31, x_6, x_32);
+x_52 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(x_1, x_2, x_3, x_49, x_5, x_48, x_50, x_51, x_31, x_6, x_32);
 return x_52;
 }
 }
@@ -21020,7 +21020,7 @@ lean_inc(x_24);
 lean_dec(x_22);
 lean_inc(x_2);
 lean_ctor_set(x_9, 0, x_2);
-x_25 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__1(x_1, x_2, x_20, x_24, x_9, x_4, x_23);
+x_25 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__1(x_1, x_2, x_20, x_24, x_9, x_4, x_23);
 return x_25;
 }
 else
@@ -21072,7 +21072,7 @@ lean_dec(x_32);
 lean_inc(x_2);
 x_35 = lean_alloc_ctor(1, 1, 0);
 lean_ctor_set(x_35, 0, x_2);
-x_36 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__1(x_1, x_2, x_30, x_34, x_35, x_4, x_33);
+x_36 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__1(x_1, x_2, x_30, x_34, x_35, x_4, x_33);
 return x_36;
 }
 else
@@ -21179,13 +21179,13 @@ lean_dec(x_2);
 return x_10;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10, lean_object* x_11) {
 _start:
 {
 uint8_t x_12; lean_object* x_13; 
 x_12 = lean_unbox(x_4);
 lean_dec(x_4);
-x_13 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(x_1, x_2, x_3, x_12, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
+x_13 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_ExprDefEq_18__processConstApprox___spec__2(x_1, x_2, x_3, x_12, x_5, x_6, x_7, x_8, x_9, x_10, x_11);
 return x_13;
 }
 }
diff --git a/stage0/stdlib/Init/Lean/Meta/FunInfo.c b/stage0/stdlib/Init/Lean/Meta/FunInfo.c
index 2216f566f7..951992305d 100644
--- a/stage0/stdlib/Init/Lean/Meta/FunInfo.c
+++ b/stage0/stdlib/Init/Lean/Meta/FunInfo.c
@@ -15,12 +15,14 @@ extern "C" {
 #endif
 lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Meta_FunInfo_1__checkFunInfoCache___spec__5(lean_object*, size_t, size_t, lean_object*, lean_object*);
 size_t l_USize_add(size_t, size_t);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_Lean_Meta_TransparencyMode_hash(uint8_t);
 lean_object* lean_nat_div(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isClassExpensive___main(lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyRangeMAux___main___at___private_Init_Lean_Meta_FunInfo_3__collectDepsAux___main___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAtAux___main___at___private_Init_Lean_Meta_FunInfo_1__checkFunInfoCache___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_FunInfo_3__collectDepsAux___main(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 extern size_t l_PersistentHashMap_insertAux___main___rarg___closed__2;
 lean_object* l_Array_qsortAux___main___at___private_Init_Lean_Meta_FunInfo_4__collectDeps___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_FunInfo_4__collectDeps(lean_object*, lean_object*);
@@ -31,7 +33,7 @@ lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_M
 lean_object* l___private_Init_Data_Array_QSort_1__partitionAux___main___at___private_Init_Lean_Meta_FunInfo_4__collectDeps___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Meta_FunInfo_1__checkFunInfoCache___spec__7(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Meta_isClassExpensive___main___spec__4___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_Meta_getFunInfo(lean_object*, lean_object*, lean_object*);
@@ -40,7 +42,6 @@ size_t l_USize_shiftRight(size_t, size_t);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_FunInfo_4__collectDeps___boxed(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at___private_Init_Lean_Meta_FunInfo_1__checkFunInfoCache___spec__2___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAtAux___main___at___private_Init_Lean_Meta_FunInfo_1__checkFunInfoCache___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_insertAux___main___at___private_Init_Lean_Meta_FunInfo_1__checkFunInfoCache___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -66,7 +67,6 @@ size_t l_Lean_Expr_hash(lean_object*);
 lean_object* l___private_Init_Lean_Meta_FunInfo_1__checkFunInfoCache(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at___private_Init_Lean_Meta_FunInfo_3__collectDepsAux___main___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at___private_Init_Lean_Meta_FunInfo_1__checkFunInfoCache___spec__2(lean_object*, size_t, lean_object*);
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Meta_TransparencyMode_beq(uint8_t, uint8_t);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -92,6 +92,7 @@ lean_object* l___private_Init_Lean_Meta_FunInfo_2__whenHasVar___rarg(lean_object
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__5___lambda__1(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_QSort_1__partitionAux___main___at___private_Init_Lean_Meta_FunInfo_4__collectDeps___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_FunInfo_2__whenHasVar(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__5___lambda__1___boxed(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_Init_Lean_Meta_FunInfo_5__updateHasFwdDeps___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getFunInfoNArgs(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -100,7 +101,6 @@ lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_getCollisionNodeSize___rarg(lean_object*);
 lean_object* l_PersistentHashMap_find_x3f___at___private_Init_Lean_Meta_FunInfo_1__checkFunInfoCache___spec__1(lean_object*, lean_object*);
 extern lean_object* l_Lean_Expr_Inhabited;
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
 size_t lean_usize_mix_hash(size_t, size_t);
 lean_object* l_Lean_Meta_withNewLocalInstances___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__5(uint8_t, 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_Meta_resettingSynthInstanceCache___rarg___closed__1;
@@ -4846,7 +4846,7 @@ return x_27;
 else
 {
 lean_object* x_28; 
-x_28 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(x_4, x_5, x_6, x_1, x_2, x_7, x_8, x_9);
+x_28 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(x_4, x_5, x_6, x_1, x_2, x_7, x_8, x_9);
 return x_28;
 }
 }
@@ -9171,7 +9171,7 @@ return x_494;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(uint8_t x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(uint8_t 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; 
@@ -9372,7 +9372,7 @@ return x_20;
 }
 }
 }
-lean_object* _init_l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1() {
+lean_object* _init_l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -9381,7 +9381,7 @@ x_2 = lean_array_get_size(x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
 lean_object* x_5; 
@@ -9403,7 +9403,7 @@ lean_object* x_9; lean_object* x_10; lean_object* x_11;
 lean_dec(x_6);
 lean_dec(x_2);
 x_9 = l_Array_empty___closed__1;
-x_10 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
+x_10 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1;
 x_11 = l_Nat_foldMAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__1(x_9, x_10, x_10, x_9, x_3, x_7);
 if (lean_obj_tag(x_11) == 0)
 {
@@ -9475,7 +9475,7 @@ lean_inc(x_27);
 x_28 = 1;
 x_29 = l_Array_empty___closed__1;
 x_30 = lean_unsigned_to_nat(0u);
-x_31 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(x_28, x_2, x_27, x_29, x_30, x_6, x_3, x_7);
+x_31 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(x_28, x_2, x_27, x_29, x_30, x_6, x_3, x_7);
 return x_31;
 }
 }
@@ -9559,7 +9559,7 @@ lean_inc(x_21);
 lean_dec(x_15);
 x_22 = 1;
 lean_ctor_set_uint8(x_5, sizeof(void*)*1 + 6, x_22);
-x_23 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(x_20, x_2, x_3, x_21);
+x_23 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(x_20, x_2, x_3, x_21);
 if (lean_obj_tag(x_23) == 0)
 {
 lean_object* x_24; lean_object* x_25; uint8_t x_26; 
@@ -9801,7 +9801,7 @@ x_77 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_77, 0, x_5);
 lean_ctor_set(x_77, 1, x_6);
 lean_ctor_set(x_77, 2, x_7);
-x_78 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(x_74, x_2, x_77, x_75);
+x_78 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(x_74, x_2, x_77, x_75);
 if (lean_obj_tag(x_78) == 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; 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; 
@@ -10029,7 +10029,7 @@ if (lean_is_scalar(x_120)) {
 lean_ctor_set(x_125, 0, x_124);
 lean_ctor_set(x_125, 1, x_6);
 lean_ctor_set(x_125, 2, x_7);
-x_126 = l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(x_121, x_2, x_125, x_122);
+x_126 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2(x_121, x_2, x_125, x_122);
 if (lean_obj_tag(x_126) == 0)
 {
 lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; 
@@ -10248,13 +10248,13 @@ lean_dec(x_1);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
 _start:
 {
 uint8_t x_9; lean_object* x_10; 
 x_9 = lean_unbox(x_1);
 lean_dec(x_1);
-x_10 = l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+x_10 = l___private_Init_Lean_Meta_Basic_4__forallTelescopeReducingAuxAux___main___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__3(x_9, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 return x_10;
 }
 }
@@ -10290,8 +10290,8 @@ lean_dec_ref(res);
 res = initialize_Init_Lean_Meta_InferType(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1 = _init_l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Meta_Basic_6__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1);
+l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1 = _init_l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Meta_Basic_5__forallTelescopeReducingAux___at___private_Init_Lean_Meta_FunInfo_6__getFunInfoAux___spec__2___closed__1);
 return lean_mk_io_result(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Init/Lean/Meta/KAbstract.c b/stage0/stdlib/Init/Lean/Meta/KAbstract.c
new file mode 100644
index 0000000000..085c9e9018
--- /dev/null
+++ b/stage0/stdlib/Init/Lean/Meta/KAbstract.c
@@ -0,0 +1,4514 @@
+// Lean compiler output
+// Module: Init.Lean.Meta.KAbstract
+// Imports: Init.Lean.Data.Occurrences Init.Lean.HeadIndex Init.Lean.Meta.ExprDefEq
+#include "runtime/lean.h"
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-label"
+#elif defined(__GNUC__) && !defined(__CLANG__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+lean_object* lean_expr_update_forall(lean_object*, uint8_t, lean_object*, lean_object*);
+lean_object* lean_expr_update_mdata(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_HeadIndex_HeadIndex_beq(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main___boxed(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*);
+lean_object* l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___boxed(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_Lean_Expr_toHeadIndex___main(lean_object*);
+uint8_t l_Lean_Occurrences_contains(lean_object*, lean_object*);
+lean_object* lean_expr_update_let(lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
+lean_object* l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main(lean_object*, lean_object*);
+lean_object* lean_expr_update_proj(lean_object*, lean_object*);
+lean_object* lean_expr_update_lambda(lean_object*, uint8_t, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_isExprDefEq(lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Expr_hasLooseBVars(lean_object*);
+lean_object* lean_expr_update_app(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_mkBVar(lean_object*);
+lean_object* l_Lean_Meta_kabstract(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_KAbstract_1__kabstractAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_kabstract___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; uint8_t x_216; 
+x_216 = l_Lean_Expr_hasLooseBVars(x_5);
+if (x_216 == 0)
+{
+lean_object* x_217; uint8_t x_218; 
+x_217 = l_Lean_Expr_toHeadIndex___main(x_5);
+x_218 = l_Lean_HeadIndex_HeadIndex_beq(x_217, x_3);
+lean_dec(x_217);
+if (x_218 == 0)
+{
+lean_object* x_219; 
+x_219 = lean_box(0);
+x_10 = x_219;
+goto block_215;
+}
+else
+{
+lean_object* x_220; lean_object* x_221; uint8_t x_222; 
+x_220 = lean_unsigned_to_nat(0u);
+x_221 = l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main(x_5, x_220);
+x_222 = lean_nat_dec_eq(x_221, x_4);
+lean_dec(x_221);
+if (x_222 == 0)
+{
+lean_object* x_223; 
+x_223 = lean_box(0);
+x_10 = x_223;
+goto block_215;
+}
+else
+{
+lean_object* x_224; 
+lean_inc(x_8);
+lean_inc(x_2);
+lean_inc(x_5);
+x_224 = l_Lean_Meta_isExprDefEq(x_5, x_2, x_8, x_9);
+if (lean_obj_tag(x_224) == 0)
+{
+lean_object* x_225; uint8_t x_226; 
+x_225 = lean_ctor_get(x_224, 0);
+lean_inc(x_225);
+x_226 = lean_unbox(x_225);
+lean_dec(x_225);
+if (x_226 == 0)
+{
+switch (lean_obj_tag(x_5)) {
+case 5:
+{
+lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; 
+x_227 = lean_ctor_get(x_224, 1);
+lean_inc(x_227);
+lean_dec(x_224);
+x_228 = lean_ctor_get(x_5, 0);
+lean_inc(x_228);
+x_229 = lean_ctor_get(x_5, 1);
+lean_inc(x_229);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_230 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_228, x_6, x_7, x_8, x_227);
+if (lean_obj_tag(x_230) == 0)
+{
+lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; lean_object* x_235; 
+x_231 = lean_ctor_get(x_230, 0);
+lean_inc(x_231);
+x_232 = lean_ctor_get(x_230, 1);
+lean_inc(x_232);
+lean_dec(x_230);
+x_233 = lean_ctor_get(x_231, 0);
+lean_inc(x_233);
+x_234 = lean_ctor_get(x_231, 1);
+lean_inc(x_234);
+lean_dec(x_231);
+x_235 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_229, x_6, x_234, x_8, x_232);
+if (lean_obj_tag(x_235) == 0)
+{
+uint8_t x_236; 
+x_236 = !lean_is_exclusive(x_235);
+if (x_236 == 0)
+{
+lean_object* x_237; uint8_t x_238; 
+x_237 = lean_ctor_get(x_235, 0);
+x_238 = !lean_is_exclusive(x_237);
+if (x_238 == 0)
+{
+lean_object* x_239; lean_object* x_240; 
+x_239 = lean_ctor_get(x_237, 0);
+x_240 = lean_expr_update_app(x_5, x_233, x_239);
+lean_ctor_set(x_237, 0, x_240);
+return x_235;
+}
+else
+{
+lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; 
+x_241 = lean_ctor_get(x_237, 0);
+x_242 = lean_ctor_get(x_237, 1);
+lean_inc(x_242);
+lean_inc(x_241);
+lean_dec(x_237);
+x_243 = lean_expr_update_app(x_5, x_233, x_241);
+x_244 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_244, 0, x_243);
+lean_ctor_set(x_244, 1, x_242);
+lean_ctor_set(x_235, 0, x_244);
+return x_235;
+}
+}
+else
+{
+lean_object* x_245; lean_object* x_246; lean_object* x_247; lean_object* x_248; lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; 
+x_245 = lean_ctor_get(x_235, 0);
+x_246 = lean_ctor_get(x_235, 1);
+lean_inc(x_246);
+lean_inc(x_245);
+lean_dec(x_235);
+x_247 = lean_ctor_get(x_245, 0);
+lean_inc(x_247);
+x_248 = lean_ctor_get(x_245, 1);
+lean_inc(x_248);
+if (lean_is_exclusive(x_245)) {
+ lean_ctor_release(x_245, 0);
+ lean_ctor_release(x_245, 1);
+ x_249 = x_245;
+} else {
+ lean_dec_ref(x_245);
+ x_249 = lean_box(0);
+}
+x_250 = lean_expr_update_app(x_5, x_233, x_247);
+if (lean_is_scalar(x_249)) {
+ x_251 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_251 = x_249;
+}
+lean_ctor_set(x_251, 0, x_250);
+lean_ctor_set(x_251, 1, x_248);
+x_252 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_252, 0, x_251);
+lean_ctor_set(x_252, 1, x_246);
+return x_252;
+}
+}
+else
+{
+uint8_t x_253; 
+lean_dec(x_233);
+lean_dec(x_5);
+x_253 = !lean_is_exclusive(x_235);
+if (x_253 == 0)
+{
+return x_235;
+}
+else
+{
+lean_object* x_254; lean_object* x_255; lean_object* x_256; 
+x_254 = lean_ctor_get(x_235, 0);
+x_255 = lean_ctor_get(x_235, 1);
+lean_inc(x_255);
+lean_inc(x_254);
+lean_dec(x_235);
+x_256 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_256, 0, x_254);
+lean_ctor_set(x_256, 1, x_255);
+return x_256;
+}
+}
+}
+else
+{
+uint8_t x_257; 
+lean_dec(x_229);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_257 = !lean_is_exclusive(x_230);
+if (x_257 == 0)
+{
+return x_230;
+}
+else
+{
+lean_object* x_258; lean_object* x_259; lean_object* x_260; 
+x_258 = lean_ctor_get(x_230, 0);
+x_259 = lean_ctor_get(x_230, 1);
+lean_inc(x_259);
+lean_inc(x_258);
+lean_dec(x_230);
+x_260 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_260, 0, x_258);
+lean_ctor_set(x_260, 1, x_259);
+return x_260;
+}
+}
+}
+case 6:
+{
+lean_object* x_261; lean_object* x_262; lean_object* x_263; uint64_t x_264; lean_object* x_265; 
+x_261 = lean_ctor_get(x_224, 1);
+lean_inc(x_261);
+lean_dec(x_224);
+x_262 = lean_ctor_get(x_5, 1);
+lean_inc(x_262);
+x_263 = lean_ctor_get(x_5, 2);
+lean_inc(x_263);
+x_264 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_265 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_262, x_6, x_7, x_8, x_261);
+if (lean_obj_tag(x_265) == 0)
+{
+lean_object* x_266; lean_object* x_267; lean_object* x_268; lean_object* x_269; lean_object* x_270; lean_object* x_271; lean_object* x_272; 
+x_266 = lean_ctor_get(x_265, 0);
+lean_inc(x_266);
+x_267 = lean_ctor_get(x_265, 1);
+lean_inc(x_267);
+lean_dec(x_265);
+x_268 = lean_ctor_get(x_266, 0);
+lean_inc(x_268);
+x_269 = lean_ctor_get(x_266, 1);
+lean_inc(x_269);
+lean_dec(x_266);
+x_270 = lean_unsigned_to_nat(1u);
+x_271 = lean_nat_add(x_6, x_270);
+lean_dec(x_6);
+x_272 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_263, x_271, x_269, x_8, x_267);
+if (lean_obj_tag(x_272) == 0)
+{
+uint8_t x_273; 
+x_273 = !lean_is_exclusive(x_272);
+if (x_273 == 0)
+{
+lean_object* x_274; uint8_t x_275; 
+x_274 = lean_ctor_get(x_272, 0);
+x_275 = !lean_is_exclusive(x_274);
+if (x_275 == 0)
+{
+lean_object* x_276; uint8_t x_277; lean_object* x_278; 
+x_276 = lean_ctor_get(x_274, 0);
+x_277 = (uint8_t)((x_264 << 24) >> 61);
+x_278 = lean_expr_update_lambda(x_5, x_277, x_268, x_276);
+lean_ctor_set(x_274, 0, x_278);
+return x_272;
+}
+else
+{
+lean_object* x_279; lean_object* x_280; uint8_t x_281; lean_object* x_282; lean_object* x_283; 
+x_279 = lean_ctor_get(x_274, 0);
+x_280 = lean_ctor_get(x_274, 1);
+lean_inc(x_280);
+lean_inc(x_279);
+lean_dec(x_274);
+x_281 = (uint8_t)((x_264 << 24) >> 61);
+x_282 = lean_expr_update_lambda(x_5, x_281, x_268, x_279);
+x_283 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_283, 0, x_282);
+lean_ctor_set(x_283, 1, x_280);
+lean_ctor_set(x_272, 0, x_283);
+return x_272;
+}
+}
+else
+{
+lean_object* x_284; lean_object* x_285; lean_object* x_286; lean_object* x_287; lean_object* x_288; uint8_t x_289; lean_object* x_290; lean_object* x_291; lean_object* x_292; 
+x_284 = lean_ctor_get(x_272, 0);
+x_285 = lean_ctor_get(x_272, 1);
+lean_inc(x_285);
+lean_inc(x_284);
+lean_dec(x_272);
+x_286 = lean_ctor_get(x_284, 0);
+lean_inc(x_286);
+x_287 = lean_ctor_get(x_284, 1);
+lean_inc(x_287);
+if (lean_is_exclusive(x_284)) {
+ lean_ctor_release(x_284, 0);
+ lean_ctor_release(x_284, 1);
+ x_288 = x_284;
+} else {
+ lean_dec_ref(x_284);
+ x_288 = lean_box(0);
+}
+x_289 = (uint8_t)((x_264 << 24) >> 61);
+x_290 = lean_expr_update_lambda(x_5, x_289, x_268, x_286);
+if (lean_is_scalar(x_288)) {
+ x_291 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_291 = x_288;
+}
+lean_ctor_set(x_291, 0, x_290);
+lean_ctor_set(x_291, 1, x_287);
+x_292 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_292, 0, x_291);
+lean_ctor_set(x_292, 1, x_285);
+return x_292;
+}
+}
+else
+{
+uint8_t x_293; 
+lean_dec(x_268);
+lean_dec(x_5);
+x_293 = !lean_is_exclusive(x_272);
+if (x_293 == 0)
+{
+return x_272;
+}
+else
+{
+lean_object* x_294; lean_object* x_295; lean_object* x_296; 
+x_294 = lean_ctor_get(x_272, 0);
+x_295 = lean_ctor_get(x_272, 1);
+lean_inc(x_295);
+lean_inc(x_294);
+lean_dec(x_272);
+x_296 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_296, 0, x_294);
+lean_ctor_set(x_296, 1, x_295);
+return x_296;
+}
+}
+}
+else
+{
+uint8_t x_297; 
+lean_dec(x_263);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_297 = !lean_is_exclusive(x_265);
+if (x_297 == 0)
+{
+return x_265;
+}
+else
+{
+lean_object* x_298; lean_object* x_299; lean_object* x_300; 
+x_298 = lean_ctor_get(x_265, 0);
+x_299 = lean_ctor_get(x_265, 1);
+lean_inc(x_299);
+lean_inc(x_298);
+lean_dec(x_265);
+x_300 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_300, 0, x_298);
+lean_ctor_set(x_300, 1, x_299);
+return x_300;
+}
+}
+}
+case 7:
+{
+lean_object* x_301; lean_object* x_302; lean_object* x_303; uint64_t x_304; lean_object* x_305; 
+x_301 = lean_ctor_get(x_224, 1);
+lean_inc(x_301);
+lean_dec(x_224);
+x_302 = lean_ctor_get(x_5, 1);
+lean_inc(x_302);
+x_303 = lean_ctor_get(x_5, 2);
+lean_inc(x_303);
+x_304 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_305 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_302, x_6, x_7, x_8, x_301);
+if (lean_obj_tag(x_305) == 0)
+{
+lean_object* x_306; lean_object* x_307; lean_object* x_308; lean_object* x_309; lean_object* x_310; lean_object* x_311; lean_object* x_312; 
+x_306 = lean_ctor_get(x_305, 0);
+lean_inc(x_306);
+x_307 = lean_ctor_get(x_305, 1);
+lean_inc(x_307);
+lean_dec(x_305);
+x_308 = lean_ctor_get(x_306, 0);
+lean_inc(x_308);
+x_309 = lean_ctor_get(x_306, 1);
+lean_inc(x_309);
+lean_dec(x_306);
+x_310 = lean_unsigned_to_nat(1u);
+x_311 = lean_nat_add(x_6, x_310);
+lean_dec(x_6);
+x_312 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_303, x_311, x_309, x_8, x_307);
+if (lean_obj_tag(x_312) == 0)
+{
+uint8_t x_313; 
+x_313 = !lean_is_exclusive(x_312);
+if (x_313 == 0)
+{
+lean_object* x_314; uint8_t x_315; 
+x_314 = lean_ctor_get(x_312, 0);
+x_315 = !lean_is_exclusive(x_314);
+if (x_315 == 0)
+{
+lean_object* x_316; uint8_t x_317; lean_object* x_318; 
+x_316 = lean_ctor_get(x_314, 0);
+x_317 = (uint8_t)((x_304 << 24) >> 61);
+x_318 = lean_expr_update_forall(x_5, x_317, x_308, x_316);
+lean_ctor_set(x_314, 0, x_318);
+return x_312;
+}
+else
+{
+lean_object* x_319; lean_object* x_320; uint8_t x_321; lean_object* x_322; lean_object* x_323; 
+x_319 = lean_ctor_get(x_314, 0);
+x_320 = lean_ctor_get(x_314, 1);
+lean_inc(x_320);
+lean_inc(x_319);
+lean_dec(x_314);
+x_321 = (uint8_t)((x_304 << 24) >> 61);
+x_322 = lean_expr_update_forall(x_5, x_321, x_308, x_319);
+x_323 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_323, 0, x_322);
+lean_ctor_set(x_323, 1, x_320);
+lean_ctor_set(x_312, 0, x_323);
+return x_312;
+}
+}
+else
+{
+lean_object* x_324; lean_object* x_325; lean_object* x_326; lean_object* x_327; lean_object* x_328; uint8_t x_329; lean_object* x_330; lean_object* x_331; lean_object* x_332; 
+x_324 = lean_ctor_get(x_312, 0);
+x_325 = lean_ctor_get(x_312, 1);
+lean_inc(x_325);
+lean_inc(x_324);
+lean_dec(x_312);
+x_326 = lean_ctor_get(x_324, 0);
+lean_inc(x_326);
+x_327 = lean_ctor_get(x_324, 1);
+lean_inc(x_327);
+if (lean_is_exclusive(x_324)) {
+ lean_ctor_release(x_324, 0);
+ lean_ctor_release(x_324, 1);
+ x_328 = x_324;
+} else {
+ lean_dec_ref(x_324);
+ x_328 = lean_box(0);
+}
+x_329 = (uint8_t)((x_304 << 24) >> 61);
+x_330 = lean_expr_update_forall(x_5, x_329, x_308, x_326);
+if (lean_is_scalar(x_328)) {
+ x_331 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_331 = x_328;
+}
+lean_ctor_set(x_331, 0, x_330);
+lean_ctor_set(x_331, 1, x_327);
+x_332 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_332, 0, x_331);
+lean_ctor_set(x_332, 1, x_325);
+return x_332;
+}
+}
+else
+{
+uint8_t x_333; 
+lean_dec(x_308);
+lean_dec(x_5);
+x_333 = !lean_is_exclusive(x_312);
+if (x_333 == 0)
+{
+return x_312;
+}
+else
+{
+lean_object* x_334; lean_object* x_335; lean_object* x_336; 
+x_334 = lean_ctor_get(x_312, 0);
+x_335 = lean_ctor_get(x_312, 1);
+lean_inc(x_335);
+lean_inc(x_334);
+lean_dec(x_312);
+x_336 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_336, 0, x_334);
+lean_ctor_set(x_336, 1, x_335);
+return x_336;
+}
+}
+}
+else
+{
+uint8_t x_337; 
+lean_dec(x_303);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_337 = !lean_is_exclusive(x_305);
+if (x_337 == 0)
+{
+return x_305;
+}
+else
+{
+lean_object* x_338; lean_object* x_339; lean_object* x_340; 
+x_338 = lean_ctor_get(x_305, 0);
+x_339 = lean_ctor_get(x_305, 1);
+lean_inc(x_339);
+lean_inc(x_338);
+lean_dec(x_305);
+x_340 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_340, 0, x_338);
+lean_ctor_set(x_340, 1, x_339);
+return x_340;
+}
+}
+}
+case 8:
+{
+lean_object* x_341; lean_object* x_342; lean_object* x_343; lean_object* x_344; lean_object* x_345; 
+x_341 = lean_ctor_get(x_224, 1);
+lean_inc(x_341);
+lean_dec(x_224);
+x_342 = lean_ctor_get(x_5, 1);
+lean_inc(x_342);
+x_343 = lean_ctor_get(x_5, 2);
+lean_inc(x_343);
+x_344 = lean_ctor_get(x_5, 3);
+lean_inc(x_344);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_345 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_342, x_6, x_7, x_8, x_341);
+if (lean_obj_tag(x_345) == 0)
+{
+lean_object* x_346; lean_object* x_347; lean_object* x_348; lean_object* x_349; lean_object* x_350; 
+x_346 = lean_ctor_get(x_345, 0);
+lean_inc(x_346);
+x_347 = lean_ctor_get(x_345, 1);
+lean_inc(x_347);
+lean_dec(x_345);
+x_348 = lean_ctor_get(x_346, 0);
+lean_inc(x_348);
+x_349 = lean_ctor_get(x_346, 1);
+lean_inc(x_349);
+lean_dec(x_346);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_350 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_343, x_6, x_349, x_8, x_347);
+if (lean_obj_tag(x_350) == 0)
+{
+lean_object* x_351; lean_object* x_352; lean_object* x_353; lean_object* x_354; lean_object* x_355; lean_object* x_356; lean_object* x_357; 
+x_351 = lean_ctor_get(x_350, 0);
+lean_inc(x_351);
+x_352 = lean_ctor_get(x_350, 1);
+lean_inc(x_352);
+lean_dec(x_350);
+x_353 = lean_ctor_get(x_351, 0);
+lean_inc(x_353);
+x_354 = lean_ctor_get(x_351, 1);
+lean_inc(x_354);
+lean_dec(x_351);
+x_355 = lean_unsigned_to_nat(1u);
+x_356 = lean_nat_add(x_6, x_355);
+lean_dec(x_6);
+x_357 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_344, x_356, x_354, x_8, x_352);
+if (lean_obj_tag(x_357) == 0)
+{
+uint8_t x_358; 
+x_358 = !lean_is_exclusive(x_357);
+if (x_358 == 0)
+{
+lean_object* x_359; uint8_t x_360; 
+x_359 = lean_ctor_get(x_357, 0);
+x_360 = !lean_is_exclusive(x_359);
+if (x_360 == 0)
+{
+lean_object* x_361; lean_object* x_362; 
+x_361 = lean_ctor_get(x_359, 0);
+x_362 = lean_expr_update_let(x_5, x_348, x_353, x_361);
+lean_ctor_set(x_359, 0, x_362);
+return x_357;
+}
+else
+{
+lean_object* x_363; lean_object* x_364; lean_object* x_365; lean_object* x_366; 
+x_363 = lean_ctor_get(x_359, 0);
+x_364 = lean_ctor_get(x_359, 1);
+lean_inc(x_364);
+lean_inc(x_363);
+lean_dec(x_359);
+x_365 = lean_expr_update_let(x_5, x_348, x_353, x_363);
+x_366 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_366, 0, x_365);
+lean_ctor_set(x_366, 1, x_364);
+lean_ctor_set(x_357, 0, x_366);
+return x_357;
+}
+}
+else
+{
+lean_object* x_367; lean_object* x_368; lean_object* x_369; lean_object* x_370; lean_object* x_371; lean_object* x_372; lean_object* x_373; lean_object* x_374; 
+x_367 = lean_ctor_get(x_357, 0);
+x_368 = lean_ctor_get(x_357, 1);
+lean_inc(x_368);
+lean_inc(x_367);
+lean_dec(x_357);
+x_369 = lean_ctor_get(x_367, 0);
+lean_inc(x_369);
+x_370 = lean_ctor_get(x_367, 1);
+lean_inc(x_370);
+if (lean_is_exclusive(x_367)) {
+ lean_ctor_release(x_367, 0);
+ lean_ctor_release(x_367, 1);
+ x_371 = x_367;
+} else {
+ lean_dec_ref(x_367);
+ x_371 = lean_box(0);
+}
+x_372 = lean_expr_update_let(x_5, x_348, x_353, x_369);
+if (lean_is_scalar(x_371)) {
+ x_373 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_373 = x_371;
+}
+lean_ctor_set(x_373, 0, x_372);
+lean_ctor_set(x_373, 1, x_370);
+x_374 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_374, 0, x_373);
+lean_ctor_set(x_374, 1, x_368);
+return x_374;
+}
+}
+else
+{
+uint8_t x_375; 
+lean_dec(x_353);
+lean_dec(x_348);
+lean_dec(x_5);
+x_375 = !lean_is_exclusive(x_357);
+if (x_375 == 0)
+{
+return x_357;
+}
+else
+{
+lean_object* x_376; lean_object* x_377; lean_object* x_378; 
+x_376 = lean_ctor_get(x_357, 0);
+x_377 = lean_ctor_get(x_357, 1);
+lean_inc(x_377);
+lean_inc(x_376);
+lean_dec(x_357);
+x_378 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_378, 0, x_376);
+lean_ctor_set(x_378, 1, x_377);
+return x_378;
+}
+}
+}
+else
+{
+uint8_t x_379; 
+lean_dec(x_348);
+lean_dec(x_344);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_379 = !lean_is_exclusive(x_350);
+if (x_379 == 0)
+{
+return x_350;
+}
+else
+{
+lean_object* x_380; lean_object* x_381; lean_object* x_382; 
+x_380 = lean_ctor_get(x_350, 0);
+x_381 = lean_ctor_get(x_350, 1);
+lean_inc(x_381);
+lean_inc(x_380);
+lean_dec(x_350);
+x_382 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_382, 0, x_380);
+lean_ctor_set(x_382, 1, x_381);
+return x_382;
+}
+}
+}
+else
+{
+uint8_t x_383; 
+lean_dec(x_344);
+lean_dec(x_343);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_383 = !lean_is_exclusive(x_345);
+if (x_383 == 0)
+{
+return x_345;
+}
+else
+{
+lean_object* x_384; lean_object* x_385; lean_object* x_386; 
+x_384 = lean_ctor_get(x_345, 0);
+x_385 = lean_ctor_get(x_345, 1);
+lean_inc(x_385);
+lean_inc(x_384);
+lean_dec(x_345);
+x_386 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_386, 0, x_384);
+lean_ctor_set(x_386, 1, x_385);
+return x_386;
+}
+}
+}
+case 10:
+{
+lean_object* x_387; lean_object* x_388; lean_object* x_389; 
+x_387 = lean_ctor_get(x_224, 1);
+lean_inc(x_387);
+lean_dec(x_224);
+x_388 = lean_ctor_get(x_5, 1);
+lean_inc(x_388);
+x_389 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_388, x_6, x_7, x_8, x_387);
+if (lean_obj_tag(x_389) == 0)
+{
+uint8_t x_390; 
+x_390 = !lean_is_exclusive(x_389);
+if (x_390 == 0)
+{
+lean_object* x_391; uint8_t x_392; 
+x_391 = lean_ctor_get(x_389, 0);
+x_392 = !lean_is_exclusive(x_391);
+if (x_392 == 0)
+{
+lean_object* x_393; lean_object* x_394; 
+x_393 = lean_ctor_get(x_391, 0);
+x_394 = lean_expr_update_mdata(x_5, x_393);
+lean_ctor_set(x_391, 0, x_394);
+return x_389;
+}
+else
+{
+lean_object* x_395; lean_object* x_396; lean_object* x_397; lean_object* x_398; 
+x_395 = lean_ctor_get(x_391, 0);
+x_396 = lean_ctor_get(x_391, 1);
+lean_inc(x_396);
+lean_inc(x_395);
+lean_dec(x_391);
+x_397 = lean_expr_update_mdata(x_5, x_395);
+x_398 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_398, 0, x_397);
+lean_ctor_set(x_398, 1, x_396);
+lean_ctor_set(x_389, 0, x_398);
+return x_389;
+}
+}
+else
+{
+lean_object* x_399; lean_object* x_400; lean_object* x_401; lean_object* x_402; lean_object* x_403; lean_object* x_404; lean_object* x_405; lean_object* x_406; 
+x_399 = lean_ctor_get(x_389, 0);
+x_400 = lean_ctor_get(x_389, 1);
+lean_inc(x_400);
+lean_inc(x_399);
+lean_dec(x_389);
+x_401 = lean_ctor_get(x_399, 0);
+lean_inc(x_401);
+x_402 = lean_ctor_get(x_399, 1);
+lean_inc(x_402);
+if (lean_is_exclusive(x_399)) {
+ lean_ctor_release(x_399, 0);
+ lean_ctor_release(x_399, 1);
+ x_403 = x_399;
+} else {
+ lean_dec_ref(x_399);
+ x_403 = lean_box(0);
+}
+x_404 = lean_expr_update_mdata(x_5, x_401);
+if (lean_is_scalar(x_403)) {
+ x_405 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_405 = x_403;
+}
+lean_ctor_set(x_405, 0, x_404);
+lean_ctor_set(x_405, 1, x_402);
+x_406 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_406, 0, x_405);
+lean_ctor_set(x_406, 1, x_400);
+return x_406;
+}
+}
+else
+{
+uint8_t x_407; 
+lean_dec(x_5);
+x_407 = !lean_is_exclusive(x_389);
+if (x_407 == 0)
+{
+return x_389;
+}
+else
+{
+lean_object* x_408; lean_object* x_409; lean_object* x_410; 
+x_408 = lean_ctor_get(x_389, 0);
+x_409 = lean_ctor_get(x_389, 1);
+lean_inc(x_409);
+lean_inc(x_408);
+lean_dec(x_389);
+x_410 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_410, 0, x_408);
+lean_ctor_set(x_410, 1, x_409);
+return x_410;
+}
+}
+}
+case 11:
+{
+lean_object* x_411; lean_object* x_412; lean_object* x_413; 
+x_411 = lean_ctor_get(x_224, 1);
+lean_inc(x_411);
+lean_dec(x_224);
+x_412 = lean_ctor_get(x_5, 2);
+lean_inc(x_412);
+x_413 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_412, x_6, x_7, x_8, x_411);
+if (lean_obj_tag(x_413) == 0)
+{
+uint8_t x_414; 
+x_414 = !lean_is_exclusive(x_413);
+if (x_414 == 0)
+{
+lean_object* x_415; uint8_t x_416; 
+x_415 = lean_ctor_get(x_413, 0);
+x_416 = !lean_is_exclusive(x_415);
+if (x_416 == 0)
+{
+lean_object* x_417; lean_object* x_418; 
+x_417 = lean_ctor_get(x_415, 0);
+x_418 = lean_expr_update_proj(x_5, x_417);
+lean_ctor_set(x_415, 0, x_418);
+return x_413;
+}
+else
+{
+lean_object* x_419; lean_object* x_420; lean_object* x_421; lean_object* x_422; 
+x_419 = lean_ctor_get(x_415, 0);
+x_420 = lean_ctor_get(x_415, 1);
+lean_inc(x_420);
+lean_inc(x_419);
+lean_dec(x_415);
+x_421 = lean_expr_update_proj(x_5, x_419);
+x_422 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_422, 0, x_421);
+lean_ctor_set(x_422, 1, x_420);
+lean_ctor_set(x_413, 0, x_422);
+return x_413;
+}
+}
+else
+{
+lean_object* x_423; lean_object* x_424; lean_object* x_425; lean_object* x_426; lean_object* x_427; lean_object* x_428; lean_object* x_429; lean_object* x_430; 
+x_423 = lean_ctor_get(x_413, 0);
+x_424 = lean_ctor_get(x_413, 1);
+lean_inc(x_424);
+lean_inc(x_423);
+lean_dec(x_413);
+x_425 = lean_ctor_get(x_423, 0);
+lean_inc(x_425);
+x_426 = lean_ctor_get(x_423, 1);
+lean_inc(x_426);
+if (lean_is_exclusive(x_423)) {
+ lean_ctor_release(x_423, 0);
+ lean_ctor_release(x_423, 1);
+ x_427 = x_423;
+} else {
+ lean_dec_ref(x_423);
+ x_427 = lean_box(0);
+}
+x_428 = lean_expr_update_proj(x_5, x_425);
+if (lean_is_scalar(x_427)) {
+ x_429 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_429 = x_427;
+}
+lean_ctor_set(x_429, 0, x_428);
+lean_ctor_set(x_429, 1, x_426);
+x_430 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_430, 0, x_429);
+lean_ctor_set(x_430, 1, x_424);
+return x_430;
+}
+}
+else
+{
+uint8_t x_431; 
+lean_dec(x_5);
+x_431 = !lean_is_exclusive(x_413);
+if (x_431 == 0)
+{
+return x_413;
+}
+else
+{
+lean_object* x_432; lean_object* x_433; lean_object* x_434; 
+x_432 = lean_ctor_get(x_413, 0);
+x_433 = lean_ctor_get(x_413, 1);
+lean_inc(x_433);
+lean_inc(x_432);
+lean_dec(x_413);
+x_434 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_434, 0, x_432);
+lean_ctor_set(x_434, 1, x_433);
+return x_434;
+}
+}
+}
+default: 
+{
+uint8_t x_435; 
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_2);
+x_435 = !lean_is_exclusive(x_224);
+if (x_435 == 0)
+{
+lean_object* x_436; lean_object* x_437; 
+x_436 = lean_ctor_get(x_224, 0);
+lean_dec(x_436);
+x_437 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_437, 0, x_5);
+lean_ctor_set(x_437, 1, x_7);
+lean_ctor_set(x_224, 0, x_437);
+return x_224;
+}
+else
+{
+lean_object* x_438; lean_object* x_439; lean_object* x_440; 
+x_438 = lean_ctor_get(x_224, 1);
+lean_inc(x_438);
+lean_dec(x_224);
+x_439 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_439, 0, x_5);
+lean_ctor_set(x_439, 1, x_7);
+x_440 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_440, 0, x_439);
+lean_ctor_set(x_440, 1, x_438);
+return x_440;
+}
+}
+}
+}
+else
+{
+uint8_t x_441; 
+x_441 = !lean_is_exclusive(x_224);
+if (x_441 == 0)
+{
+lean_object* x_442; lean_object* x_443; lean_object* x_444; lean_object* x_445; uint8_t x_446; 
+x_442 = lean_ctor_get(x_224, 1);
+x_443 = lean_ctor_get(x_224, 0);
+lean_dec(x_443);
+x_444 = lean_unsigned_to_nat(1u);
+x_445 = lean_nat_add(x_7, x_444);
+x_446 = l_Lean_Occurrences_contains(x_1, x_7);
+lean_dec(x_7);
+if (x_446 == 0)
+{
+switch (lean_obj_tag(x_5)) {
+case 5:
+{
+lean_object* x_447; lean_object* x_448; lean_object* x_449; 
+lean_free_object(x_224);
+x_447 = lean_ctor_get(x_5, 0);
+lean_inc(x_447);
+x_448 = lean_ctor_get(x_5, 1);
+lean_inc(x_448);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_449 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_447, x_6, x_445, x_8, x_442);
+if (lean_obj_tag(x_449) == 0)
+{
+lean_object* x_450; lean_object* x_451; lean_object* x_452; lean_object* x_453; lean_object* x_454; 
+x_450 = lean_ctor_get(x_449, 0);
+lean_inc(x_450);
+x_451 = lean_ctor_get(x_449, 1);
+lean_inc(x_451);
+lean_dec(x_449);
+x_452 = lean_ctor_get(x_450, 0);
+lean_inc(x_452);
+x_453 = lean_ctor_get(x_450, 1);
+lean_inc(x_453);
+lean_dec(x_450);
+x_454 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_448, x_6, x_453, x_8, x_451);
+if (lean_obj_tag(x_454) == 0)
+{
+uint8_t x_455; 
+x_455 = !lean_is_exclusive(x_454);
+if (x_455 == 0)
+{
+lean_object* x_456; uint8_t x_457; 
+x_456 = lean_ctor_get(x_454, 0);
+x_457 = !lean_is_exclusive(x_456);
+if (x_457 == 0)
+{
+lean_object* x_458; lean_object* x_459; 
+x_458 = lean_ctor_get(x_456, 0);
+x_459 = lean_expr_update_app(x_5, x_452, x_458);
+lean_ctor_set(x_456, 0, x_459);
+return x_454;
+}
+else
+{
+lean_object* x_460; lean_object* x_461; lean_object* x_462; lean_object* x_463; 
+x_460 = lean_ctor_get(x_456, 0);
+x_461 = lean_ctor_get(x_456, 1);
+lean_inc(x_461);
+lean_inc(x_460);
+lean_dec(x_456);
+x_462 = lean_expr_update_app(x_5, x_452, x_460);
+x_463 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_463, 0, x_462);
+lean_ctor_set(x_463, 1, x_461);
+lean_ctor_set(x_454, 0, x_463);
+return x_454;
+}
+}
+else
+{
+lean_object* x_464; lean_object* x_465; lean_object* x_466; lean_object* x_467; lean_object* x_468; lean_object* x_469; lean_object* x_470; lean_object* x_471; 
+x_464 = lean_ctor_get(x_454, 0);
+x_465 = lean_ctor_get(x_454, 1);
+lean_inc(x_465);
+lean_inc(x_464);
+lean_dec(x_454);
+x_466 = lean_ctor_get(x_464, 0);
+lean_inc(x_466);
+x_467 = lean_ctor_get(x_464, 1);
+lean_inc(x_467);
+if (lean_is_exclusive(x_464)) {
+ lean_ctor_release(x_464, 0);
+ lean_ctor_release(x_464, 1);
+ x_468 = x_464;
+} else {
+ lean_dec_ref(x_464);
+ x_468 = lean_box(0);
+}
+x_469 = lean_expr_update_app(x_5, x_452, x_466);
+if (lean_is_scalar(x_468)) {
+ x_470 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_470 = x_468;
+}
+lean_ctor_set(x_470, 0, x_469);
+lean_ctor_set(x_470, 1, x_467);
+x_471 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_471, 0, x_470);
+lean_ctor_set(x_471, 1, x_465);
+return x_471;
+}
+}
+else
+{
+uint8_t x_472; 
+lean_dec(x_452);
+lean_dec(x_5);
+x_472 = !lean_is_exclusive(x_454);
+if (x_472 == 0)
+{
+return x_454;
+}
+else
+{
+lean_object* x_473; lean_object* x_474; lean_object* x_475; 
+x_473 = lean_ctor_get(x_454, 0);
+x_474 = lean_ctor_get(x_454, 1);
+lean_inc(x_474);
+lean_inc(x_473);
+lean_dec(x_454);
+x_475 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_475, 0, x_473);
+lean_ctor_set(x_475, 1, x_474);
+return x_475;
+}
+}
+}
+else
+{
+uint8_t x_476; 
+lean_dec(x_448);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_476 = !lean_is_exclusive(x_449);
+if (x_476 == 0)
+{
+return x_449;
+}
+else
+{
+lean_object* x_477; lean_object* x_478; lean_object* x_479; 
+x_477 = lean_ctor_get(x_449, 0);
+x_478 = lean_ctor_get(x_449, 1);
+lean_inc(x_478);
+lean_inc(x_477);
+lean_dec(x_449);
+x_479 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_479, 0, x_477);
+lean_ctor_set(x_479, 1, x_478);
+return x_479;
+}
+}
+}
+case 6:
+{
+lean_object* x_480; lean_object* x_481; uint64_t x_482; lean_object* x_483; 
+lean_free_object(x_224);
+x_480 = lean_ctor_get(x_5, 1);
+lean_inc(x_480);
+x_481 = lean_ctor_get(x_5, 2);
+lean_inc(x_481);
+x_482 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_483 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_480, x_6, x_445, x_8, x_442);
+if (lean_obj_tag(x_483) == 0)
+{
+lean_object* x_484; lean_object* x_485; lean_object* x_486; lean_object* x_487; lean_object* x_488; lean_object* x_489; 
+x_484 = lean_ctor_get(x_483, 0);
+lean_inc(x_484);
+x_485 = lean_ctor_get(x_483, 1);
+lean_inc(x_485);
+lean_dec(x_483);
+x_486 = lean_ctor_get(x_484, 0);
+lean_inc(x_486);
+x_487 = lean_ctor_get(x_484, 1);
+lean_inc(x_487);
+lean_dec(x_484);
+x_488 = lean_nat_add(x_6, x_444);
+lean_dec(x_6);
+x_489 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_481, x_488, x_487, x_8, x_485);
+if (lean_obj_tag(x_489) == 0)
+{
+uint8_t x_490; 
+x_490 = !lean_is_exclusive(x_489);
+if (x_490 == 0)
+{
+lean_object* x_491; uint8_t x_492; 
+x_491 = lean_ctor_get(x_489, 0);
+x_492 = !lean_is_exclusive(x_491);
+if (x_492 == 0)
+{
+lean_object* x_493; uint8_t x_494; lean_object* x_495; 
+x_493 = lean_ctor_get(x_491, 0);
+x_494 = (uint8_t)((x_482 << 24) >> 61);
+x_495 = lean_expr_update_lambda(x_5, x_494, x_486, x_493);
+lean_ctor_set(x_491, 0, x_495);
+return x_489;
+}
+else
+{
+lean_object* x_496; lean_object* x_497; uint8_t x_498; lean_object* x_499; lean_object* x_500; 
+x_496 = lean_ctor_get(x_491, 0);
+x_497 = lean_ctor_get(x_491, 1);
+lean_inc(x_497);
+lean_inc(x_496);
+lean_dec(x_491);
+x_498 = (uint8_t)((x_482 << 24) >> 61);
+x_499 = lean_expr_update_lambda(x_5, x_498, x_486, x_496);
+x_500 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_500, 0, x_499);
+lean_ctor_set(x_500, 1, x_497);
+lean_ctor_set(x_489, 0, x_500);
+return x_489;
+}
+}
+else
+{
+lean_object* x_501; lean_object* x_502; lean_object* x_503; lean_object* x_504; lean_object* x_505; uint8_t x_506; lean_object* x_507; lean_object* x_508; lean_object* x_509; 
+x_501 = lean_ctor_get(x_489, 0);
+x_502 = lean_ctor_get(x_489, 1);
+lean_inc(x_502);
+lean_inc(x_501);
+lean_dec(x_489);
+x_503 = lean_ctor_get(x_501, 0);
+lean_inc(x_503);
+x_504 = lean_ctor_get(x_501, 1);
+lean_inc(x_504);
+if (lean_is_exclusive(x_501)) {
+ lean_ctor_release(x_501, 0);
+ lean_ctor_release(x_501, 1);
+ x_505 = x_501;
+} else {
+ lean_dec_ref(x_501);
+ x_505 = lean_box(0);
+}
+x_506 = (uint8_t)((x_482 << 24) >> 61);
+x_507 = lean_expr_update_lambda(x_5, x_506, x_486, x_503);
+if (lean_is_scalar(x_505)) {
+ x_508 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_508 = x_505;
+}
+lean_ctor_set(x_508, 0, x_507);
+lean_ctor_set(x_508, 1, x_504);
+x_509 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_509, 0, x_508);
+lean_ctor_set(x_509, 1, x_502);
+return x_509;
+}
+}
+else
+{
+uint8_t x_510; 
+lean_dec(x_486);
+lean_dec(x_5);
+x_510 = !lean_is_exclusive(x_489);
+if (x_510 == 0)
+{
+return x_489;
+}
+else
+{
+lean_object* x_511; lean_object* x_512; lean_object* x_513; 
+x_511 = lean_ctor_get(x_489, 0);
+x_512 = lean_ctor_get(x_489, 1);
+lean_inc(x_512);
+lean_inc(x_511);
+lean_dec(x_489);
+x_513 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_513, 0, x_511);
+lean_ctor_set(x_513, 1, x_512);
+return x_513;
+}
+}
+}
+else
+{
+uint8_t x_514; 
+lean_dec(x_481);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_514 = !lean_is_exclusive(x_483);
+if (x_514 == 0)
+{
+return x_483;
+}
+else
+{
+lean_object* x_515; lean_object* x_516; lean_object* x_517; 
+x_515 = lean_ctor_get(x_483, 0);
+x_516 = lean_ctor_get(x_483, 1);
+lean_inc(x_516);
+lean_inc(x_515);
+lean_dec(x_483);
+x_517 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_517, 0, x_515);
+lean_ctor_set(x_517, 1, x_516);
+return x_517;
+}
+}
+}
+case 7:
+{
+lean_object* x_518; lean_object* x_519; uint64_t x_520; lean_object* x_521; 
+lean_free_object(x_224);
+x_518 = lean_ctor_get(x_5, 1);
+lean_inc(x_518);
+x_519 = lean_ctor_get(x_5, 2);
+lean_inc(x_519);
+x_520 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_521 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_518, x_6, x_445, x_8, x_442);
+if (lean_obj_tag(x_521) == 0)
+{
+lean_object* x_522; lean_object* x_523; lean_object* x_524; lean_object* x_525; lean_object* x_526; lean_object* x_527; 
+x_522 = lean_ctor_get(x_521, 0);
+lean_inc(x_522);
+x_523 = lean_ctor_get(x_521, 1);
+lean_inc(x_523);
+lean_dec(x_521);
+x_524 = lean_ctor_get(x_522, 0);
+lean_inc(x_524);
+x_525 = lean_ctor_get(x_522, 1);
+lean_inc(x_525);
+lean_dec(x_522);
+x_526 = lean_nat_add(x_6, x_444);
+lean_dec(x_6);
+x_527 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_519, x_526, x_525, x_8, x_523);
+if (lean_obj_tag(x_527) == 0)
+{
+uint8_t x_528; 
+x_528 = !lean_is_exclusive(x_527);
+if (x_528 == 0)
+{
+lean_object* x_529; uint8_t x_530; 
+x_529 = lean_ctor_get(x_527, 0);
+x_530 = !lean_is_exclusive(x_529);
+if (x_530 == 0)
+{
+lean_object* x_531; uint8_t x_532; lean_object* x_533; 
+x_531 = lean_ctor_get(x_529, 0);
+x_532 = (uint8_t)((x_520 << 24) >> 61);
+x_533 = lean_expr_update_forall(x_5, x_532, x_524, x_531);
+lean_ctor_set(x_529, 0, x_533);
+return x_527;
+}
+else
+{
+lean_object* x_534; lean_object* x_535; uint8_t x_536; lean_object* x_537; lean_object* x_538; 
+x_534 = lean_ctor_get(x_529, 0);
+x_535 = lean_ctor_get(x_529, 1);
+lean_inc(x_535);
+lean_inc(x_534);
+lean_dec(x_529);
+x_536 = (uint8_t)((x_520 << 24) >> 61);
+x_537 = lean_expr_update_forall(x_5, x_536, x_524, x_534);
+x_538 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_538, 0, x_537);
+lean_ctor_set(x_538, 1, x_535);
+lean_ctor_set(x_527, 0, x_538);
+return x_527;
+}
+}
+else
+{
+lean_object* x_539; lean_object* x_540; lean_object* x_541; lean_object* x_542; lean_object* x_543; uint8_t x_544; lean_object* x_545; lean_object* x_546; lean_object* x_547; 
+x_539 = lean_ctor_get(x_527, 0);
+x_540 = lean_ctor_get(x_527, 1);
+lean_inc(x_540);
+lean_inc(x_539);
+lean_dec(x_527);
+x_541 = lean_ctor_get(x_539, 0);
+lean_inc(x_541);
+x_542 = lean_ctor_get(x_539, 1);
+lean_inc(x_542);
+if (lean_is_exclusive(x_539)) {
+ lean_ctor_release(x_539, 0);
+ lean_ctor_release(x_539, 1);
+ x_543 = x_539;
+} else {
+ lean_dec_ref(x_539);
+ x_543 = lean_box(0);
+}
+x_544 = (uint8_t)((x_520 << 24) >> 61);
+x_545 = lean_expr_update_forall(x_5, x_544, x_524, x_541);
+if (lean_is_scalar(x_543)) {
+ x_546 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_546 = x_543;
+}
+lean_ctor_set(x_546, 0, x_545);
+lean_ctor_set(x_546, 1, x_542);
+x_547 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_547, 0, x_546);
+lean_ctor_set(x_547, 1, x_540);
+return x_547;
+}
+}
+else
+{
+uint8_t x_548; 
+lean_dec(x_524);
+lean_dec(x_5);
+x_548 = !lean_is_exclusive(x_527);
+if (x_548 == 0)
+{
+return x_527;
+}
+else
+{
+lean_object* x_549; lean_object* x_550; lean_object* x_551; 
+x_549 = lean_ctor_get(x_527, 0);
+x_550 = lean_ctor_get(x_527, 1);
+lean_inc(x_550);
+lean_inc(x_549);
+lean_dec(x_527);
+x_551 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_551, 0, x_549);
+lean_ctor_set(x_551, 1, x_550);
+return x_551;
+}
+}
+}
+else
+{
+uint8_t x_552; 
+lean_dec(x_519);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_552 = !lean_is_exclusive(x_521);
+if (x_552 == 0)
+{
+return x_521;
+}
+else
+{
+lean_object* x_553; lean_object* x_554; lean_object* x_555; 
+x_553 = lean_ctor_get(x_521, 0);
+x_554 = lean_ctor_get(x_521, 1);
+lean_inc(x_554);
+lean_inc(x_553);
+lean_dec(x_521);
+x_555 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_555, 0, x_553);
+lean_ctor_set(x_555, 1, x_554);
+return x_555;
+}
+}
+}
+case 8:
+{
+lean_object* x_556; lean_object* x_557; lean_object* x_558; lean_object* x_559; 
+lean_free_object(x_224);
+x_556 = lean_ctor_get(x_5, 1);
+lean_inc(x_556);
+x_557 = lean_ctor_get(x_5, 2);
+lean_inc(x_557);
+x_558 = lean_ctor_get(x_5, 3);
+lean_inc(x_558);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_559 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_556, x_6, x_445, x_8, x_442);
+if (lean_obj_tag(x_559) == 0)
+{
+lean_object* x_560; lean_object* x_561; lean_object* x_562; lean_object* x_563; lean_object* x_564; 
+x_560 = lean_ctor_get(x_559, 0);
+lean_inc(x_560);
+x_561 = lean_ctor_get(x_559, 1);
+lean_inc(x_561);
+lean_dec(x_559);
+x_562 = lean_ctor_get(x_560, 0);
+lean_inc(x_562);
+x_563 = lean_ctor_get(x_560, 1);
+lean_inc(x_563);
+lean_dec(x_560);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_564 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_557, x_6, x_563, x_8, x_561);
+if (lean_obj_tag(x_564) == 0)
+{
+lean_object* x_565; lean_object* x_566; lean_object* x_567; lean_object* x_568; lean_object* x_569; lean_object* x_570; 
+x_565 = lean_ctor_get(x_564, 0);
+lean_inc(x_565);
+x_566 = lean_ctor_get(x_564, 1);
+lean_inc(x_566);
+lean_dec(x_564);
+x_567 = lean_ctor_get(x_565, 0);
+lean_inc(x_567);
+x_568 = lean_ctor_get(x_565, 1);
+lean_inc(x_568);
+lean_dec(x_565);
+x_569 = lean_nat_add(x_6, x_444);
+lean_dec(x_6);
+x_570 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_558, x_569, x_568, x_8, x_566);
+if (lean_obj_tag(x_570) == 0)
+{
+uint8_t x_571; 
+x_571 = !lean_is_exclusive(x_570);
+if (x_571 == 0)
+{
+lean_object* x_572; uint8_t x_573; 
+x_572 = lean_ctor_get(x_570, 0);
+x_573 = !lean_is_exclusive(x_572);
+if (x_573 == 0)
+{
+lean_object* x_574; lean_object* x_575; 
+x_574 = lean_ctor_get(x_572, 0);
+x_575 = lean_expr_update_let(x_5, x_562, x_567, x_574);
+lean_ctor_set(x_572, 0, x_575);
+return x_570;
+}
+else
+{
+lean_object* x_576; lean_object* x_577; lean_object* x_578; lean_object* x_579; 
+x_576 = lean_ctor_get(x_572, 0);
+x_577 = lean_ctor_get(x_572, 1);
+lean_inc(x_577);
+lean_inc(x_576);
+lean_dec(x_572);
+x_578 = lean_expr_update_let(x_5, x_562, x_567, x_576);
+x_579 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_579, 0, x_578);
+lean_ctor_set(x_579, 1, x_577);
+lean_ctor_set(x_570, 0, x_579);
+return x_570;
+}
+}
+else
+{
+lean_object* x_580; lean_object* x_581; lean_object* x_582; lean_object* x_583; lean_object* x_584; lean_object* x_585; lean_object* x_586; lean_object* x_587; 
+x_580 = lean_ctor_get(x_570, 0);
+x_581 = lean_ctor_get(x_570, 1);
+lean_inc(x_581);
+lean_inc(x_580);
+lean_dec(x_570);
+x_582 = lean_ctor_get(x_580, 0);
+lean_inc(x_582);
+x_583 = lean_ctor_get(x_580, 1);
+lean_inc(x_583);
+if (lean_is_exclusive(x_580)) {
+ lean_ctor_release(x_580, 0);
+ lean_ctor_release(x_580, 1);
+ x_584 = x_580;
+} else {
+ lean_dec_ref(x_580);
+ x_584 = lean_box(0);
+}
+x_585 = lean_expr_update_let(x_5, x_562, x_567, x_582);
+if (lean_is_scalar(x_584)) {
+ x_586 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_586 = x_584;
+}
+lean_ctor_set(x_586, 0, x_585);
+lean_ctor_set(x_586, 1, x_583);
+x_587 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_587, 0, x_586);
+lean_ctor_set(x_587, 1, x_581);
+return x_587;
+}
+}
+else
+{
+uint8_t x_588; 
+lean_dec(x_567);
+lean_dec(x_562);
+lean_dec(x_5);
+x_588 = !lean_is_exclusive(x_570);
+if (x_588 == 0)
+{
+return x_570;
+}
+else
+{
+lean_object* x_589; lean_object* x_590; lean_object* x_591; 
+x_589 = lean_ctor_get(x_570, 0);
+x_590 = lean_ctor_get(x_570, 1);
+lean_inc(x_590);
+lean_inc(x_589);
+lean_dec(x_570);
+x_591 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_591, 0, x_589);
+lean_ctor_set(x_591, 1, x_590);
+return x_591;
+}
+}
+}
+else
+{
+uint8_t x_592; 
+lean_dec(x_562);
+lean_dec(x_558);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_592 = !lean_is_exclusive(x_564);
+if (x_592 == 0)
+{
+return x_564;
+}
+else
+{
+lean_object* x_593; lean_object* x_594; lean_object* x_595; 
+x_593 = lean_ctor_get(x_564, 0);
+x_594 = lean_ctor_get(x_564, 1);
+lean_inc(x_594);
+lean_inc(x_593);
+lean_dec(x_564);
+x_595 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_595, 0, x_593);
+lean_ctor_set(x_595, 1, x_594);
+return x_595;
+}
+}
+}
+else
+{
+uint8_t x_596; 
+lean_dec(x_558);
+lean_dec(x_557);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_596 = !lean_is_exclusive(x_559);
+if (x_596 == 0)
+{
+return x_559;
+}
+else
+{
+lean_object* x_597; lean_object* x_598; lean_object* x_599; 
+x_597 = lean_ctor_get(x_559, 0);
+x_598 = lean_ctor_get(x_559, 1);
+lean_inc(x_598);
+lean_inc(x_597);
+lean_dec(x_559);
+x_599 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_599, 0, x_597);
+lean_ctor_set(x_599, 1, x_598);
+return x_599;
+}
+}
+}
+case 10:
+{
+lean_object* x_600; lean_object* x_601; 
+lean_free_object(x_224);
+x_600 = lean_ctor_get(x_5, 1);
+lean_inc(x_600);
+x_601 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_600, x_6, x_445, x_8, x_442);
+if (lean_obj_tag(x_601) == 0)
+{
+uint8_t x_602; 
+x_602 = !lean_is_exclusive(x_601);
+if (x_602 == 0)
+{
+lean_object* x_603; uint8_t x_604; 
+x_603 = lean_ctor_get(x_601, 0);
+x_604 = !lean_is_exclusive(x_603);
+if (x_604 == 0)
+{
+lean_object* x_605; lean_object* x_606; 
+x_605 = lean_ctor_get(x_603, 0);
+x_606 = lean_expr_update_mdata(x_5, x_605);
+lean_ctor_set(x_603, 0, x_606);
+return x_601;
+}
+else
+{
+lean_object* x_607; lean_object* x_608; lean_object* x_609; lean_object* x_610; 
+x_607 = lean_ctor_get(x_603, 0);
+x_608 = lean_ctor_get(x_603, 1);
+lean_inc(x_608);
+lean_inc(x_607);
+lean_dec(x_603);
+x_609 = lean_expr_update_mdata(x_5, x_607);
+x_610 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_610, 0, x_609);
+lean_ctor_set(x_610, 1, x_608);
+lean_ctor_set(x_601, 0, x_610);
+return x_601;
+}
+}
+else
+{
+lean_object* x_611; lean_object* x_612; lean_object* x_613; lean_object* x_614; lean_object* x_615; lean_object* x_616; lean_object* x_617; lean_object* x_618; 
+x_611 = lean_ctor_get(x_601, 0);
+x_612 = lean_ctor_get(x_601, 1);
+lean_inc(x_612);
+lean_inc(x_611);
+lean_dec(x_601);
+x_613 = lean_ctor_get(x_611, 0);
+lean_inc(x_613);
+x_614 = lean_ctor_get(x_611, 1);
+lean_inc(x_614);
+if (lean_is_exclusive(x_611)) {
+ lean_ctor_release(x_611, 0);
+ lean_ctor_release(x_611, 1);
+ x_615 = x_611;
+} else {
+ lean_dec_ref(x_611);
+ x_615 = lean_box(0);
+}
+x_616 = lean_expr_update_mdata(x_5, x_613);
+if (lean_is_scalar(x_615)) {
+ x_617 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_617 = x_615;
+}
+lean_ctor_set(x_617, 0, x_616);
+lean_ctor_set(x_617, 1, x_614);
+x_618 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_618, 0, x_617);
+lean_ctor_set(x_618, 1, x_612);
+return x_618;
+}
+}
+else
+{
+uint8_t x_619; 
+lean_dec(x_5);
+x_619 = !lean_is_exclusive(x_601);
+if (x_619 == 0)
+{
+return x_601;
+}
+else
+{
+lean_object* x_620; lean_object* x_621; lean_object* x_622; 
+x_620 = lean_ctor_get(x_601, 0);
+x_621 = lean_ctor_get(x_601, 1);
+lean_inc(x_621);
+lean_inc(x_620);
+lean_dec(x_601);
+x_622 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_622, 0, x_620);
+lean_ctor_set(x_622, 1, x_621);
+return x_622;
+}
+}
+}
+case 11:
+{
+lean_object* x_623; lean_object* x_624; 
+lean_free_object(x_224);
+x_623 = lean_ctor_get(x_5, 2);
+lean_inc(x_623);
+x_624 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_623, x_6, x_445, x_8, x_442);
+if (lean_obj_tag(x_624) == 0)
+{
+uint8_t x_625; 
+x_625 = !lean_is_exclusive(x_624);
+if (x_625 == 0)
+{
+lean_object* x_626; uint8_t x_627; 
+x_626 = lean_ctor_get(x_624, 0);
+x_627 = !lean_is_exclusive(x_626);
+if (x_627 == 0)
+{
+lean_object* x_628; lean_object* x_629; 
+x_628 = lean_ctor_get(x_626, 0);
+x_629 = lean_expr_update_proj(x_5, x_628);
+lean_ctor_set(x_626, 0, x_629);
+return x_624;
+}
+else
+{
+lean_object* x_630; lean_object* x_631; lean_object* x_632; lean_object* x_633; 
+x_630 = lean_ctor_get(x_626, 0);
+x_631 = lean_ctor_get(x_626, 1);
+lean_inc(x_631);
+lean_inc(x_630);
+lean_dec(x_626);
+x_632 = lean_expr_update_proj(x_5, x_630);
+x_633 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_633, 0, x_632);
+lean_ctor_set(x_633, 1, x_631);
+lean_ctor_set(x_624, 0, x_633);
+return x_624;
+}
+}
+else
+{
+lean_object* x_634; lean_object* x_635; lean_object* x_636; lean_object* x_637; lean_object* x_638; lean_object* x_639; lean_object* x_640; lean_object* x_641; 
+x_634 = lean_ctor_get(x_624, 0);
+x_635 = lean_ctor_get(x_624, 1);
+lean_inc(x_635);
+lean_inc(x_634);
+lean_dec(x_624);
+x_636 = lean_ctor_get(x_634, 0);
+lean_inc(x_636);
+x_637 = lean_ctor_get(x_634, 1);
+lean_inc(x_637);
+if (lean_is_exclusive(x_634)) {
+ lean_ctor_release(x_634, 0);
+ lean_ctor_release(x_634, 1);
+ x_638 = x_634;
+} else {
+ lean_dec_ref(x_634);
+ x_638 = lean_box(0);
+}
+x_639 = lean_expr_update_proj(x_5, x_636);
+if (lean_is_scalar(x_638)) {
+ x_640 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_640 = x_638;
+}
+lean_ctor_set(x_640, 0, x_639);
+lean_ctor_set(x_640, 1, x_637);
+x_641 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_641, 0, x_640);
+lean_ctor_set(x_641, 1, x_635);
+return x_641;
+}
+}
+else
+{
+uint8_t x_642; 
+lean_dec(x_5);
+x_642 = !lean_is_exclusive(x_624);
+if (x_642 == 0)
+{
+return x_624;
+}
+else
+{
+lean_object* x_643; lean_object* x_644; lean_object* x_645; 
+x_643 = lean_ctor_get(x_624, 0);
+x_644 = lean_ctor_get(x_624, 1);
+lean_inc(x_644);
+lean_inc(x_643);
+lean_dec(x_624);
+x_645 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_645, 0, x_643);
+lean_ctor_set(x_645, 1, x_644);
+return x_645;
+}
+}
+}
+default: 
+{
+lean_object* x_646; 
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_2);
+x_646 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_646, 0, x_5);
+lean_ctor_set(x_646, 1, x_445);
+lean_ctor_set(x_224, 0, x_646);
+return x_224;
+}
+}
+}
+else
+{
+lean_object* x_647; lean_object* x_648; 
+lean_dec(x_8);
+lean_dec(x_5);
+lean_dec(x_2);
+x_647 = l_Lean_mkBVar(x_6);
+x_648 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_648, 0, x_647);
+lean_ctor_set(x_648, 1, x_445);
+lean_ctor_set(x_224, 0, x_648);
+return x_224;
+}
+}
+else
+{
+lean_object* x_649; lean_object* x_650; lean_object* x_651; uint8_t x_652; 
+x_649 = lean_ctor_get(x_224, 1);
+lean_inc(x_649);
+lean_dec(x_224);
+x_650 = lean_unsigned_to_nat(1u);
+x_651 = lean_nat_add(x_7, x_650);
+x_652 = l_Lean_Occurrences_contains(x_1, x_7);
+lean_dec(x_7);
+if (x_652 == 0)
+{
+switch (lean_obj_tag(x_5)) {
+case 5:
+{
+lean_object* x_653; lean_object* x_654; lean_object* x_655; 
+x_653 = lean_ctor_get(x_5, 0);
+lean_inc(x_653);
+x_654 = lean_ctor_get(x_5, 1);
+lean_inc(x_654);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_655 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_653, x_6, x_651, x_8, x_649);
+if (lean_obj_tag(x_655) == 0)
+{
+lean_object* x_656; lean_object* x_657; lean_object* x_658; lean_object* x_659; lean_object* x_660; 
+x_656 = lean_ctor_get(x_655, 0);
+lean_inc(x_656);
+x_657 = lean_ctor_get(x_655, 1);
+lean_inc(x_657);
+lean_dec(x_655);
+x_658 = lean_ctor_get(x_656, 0);
+lean_inc(x_658);
+x_659 = lean_ctor_get(x_656, 1);
+lean_inc(x_659);
+lean_dec(x_656);
+x_660 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_654, x_6, x_659, x_8, x_657);
+if (lean_obj_tag(x_660) == 0)
+{
+lean_object* x_661; lean_object* x_662; lean_object* x_663; lean_object* x_664; lean_object* x_665; lean_object* x_666; lean_object* x_667; lean_object* x_668; lean_object* x_669; 
+x_661 = lean_ctor_get(x_660, 0);
+lean_inc(x_661);
+x_662 = lean_ctor_get(x_660, 1);
+lean_inc(x_662);
+if (lean_is_exclusive(x_660)) {
+ lean_ctor_release(x_660, 0);
+ lean_ctor_release(x_660, 1);
+ x_663 = x_660;
+} else {
+ lean_dec_ref(x_660);
+ x_663 = lean_box(0);
+}
+x_664 = lean_ctor_get(x_661, 0);
+lean_inc(x_664);
+x_665 = lean_ctor_get(x_661, 1);
+lean_inc(x_665);
+if (lean_is_exclusive(x_661)) {
+ lean_ctor_release(x_661, 0);
+ lean_ctor_release(x_661, 1);
+ x_666 = x_661;
+} else {
+ lean_dec_ref(x_661);
+ x_666 = lean_box(0);
+}
+x_667 = lean_expr_update_app(x_5, x_658, x_664);
+if (lean_is_scalar(x_666)) {
+ x_668 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_668 = x_666;
+}
+lean_ctor_set(x_668, 0, x_667);
+lean_ctor_set(x_668, 1, x_665);
+if (lean_is_scalar(x_663)) {
+ x_669 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_669 = x_663;
+}
+lean_ctor_set(x_669, 0, x_668);
+lean_ctor_set(x_669, 1, x_662);
+return x_669;
+}
+else
+{
+lean_object* x_670; lean_object* x_671; lean_object* x_672; lean_object* x_673; 
+lean_dec(x_658);
+lean_dec(x_5);
+x_670 = lean_ctor_get(x_660, 0);
+lean_inc(x_670);
+x_671 = lean_ctor_get(x_660, 1);
+lean_inc(x_671);
+if (lean_is_exclusive(x_660)) {
+ lean_ctor_release(x_660, 0);
+ lean_ctor_release(x_660, 1);
+ x_672 = x_660;
+} else {
+ lean_dec_ref(x_660);
+ x_672 = lean_box(0);
+}
+if (lean_is_scalar(x_672)) {
+ x_673 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_673 = x_672;
+}
+lean_ctor_set(x_673, 0, x_670);
+lean_ctor_set(x_673, 1, x_671);
+return x_673;
+}
+}
+else
+{
+lean_object* x_674; lean_object* x_675; lean_object* x_676; lean_object* x_677; 
+lean_dec(x_654);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_674 = lean_ctor_get(x_655, 0);
+lean_inc(x_674);
+x_675 = lean_ctor_get(x_655, 1);
+lean_inc(x_675);
+if (lean_is_exclusive(x_655)) {
+ lean_ctor_release(x_655, 0);
+ lean_ctor_release(x_655, 1);
+ x_676 = x_655;
+} else {
+ lean_dec_ref(x_655);
+ x_676 = lean_box(0);
+}
+if (lean_is_scalar(x_676)) {
+ x_677 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_677 = x_676;
+}
+lean_ctor_set(x_677, 0, x_674);
+lean_ctor_set(x_677, 1, x_675);
+return x_677;
+}
+}
+case 6:
+{
+lean_object* x_678; lean_object* x_679; uint64_t x_680; lean_object* x_681; 
+x_678 = lean_ctor_get(x_5, 1);
+lean_inc(x_678);
+x_679 = lean_ctor_get(x_5, 2);
+lean_inc(x_679);
+x_680 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_681 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_678, x_6, x_651, x_8, x_649);
+if (lean_obj_tag(x_681) == 0)
+{
+lean_object* x_682; lean_object* x_683; lean_object* x_684; lean_object* x_685; lean_object* x_686; lean_object* x_687; 
+x_682 = lean_ctor_get(x_681, 0);
+lean_inc(x_682);
+x_683 = lean_ctor_get(x_681, 1);
+lean_inc(x_683);
+lean_dec(x_681);
+x_684 = lean_ctor_get(x_682, 0);
+lean_inc(x_684);
+x_685 = lean_ctor_get(x_682, 1);
+lean_inc(x_685);
+lean_dec(x_682);
+x_686 = lean_nat_add(x_6, x_650);
+lean_dec(x_6);
+x_687 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_679, x_686, x_685, x_8, x_683);
+if (lean_obj_tag(x_687) == 0)
+{
+lean_object* x_688; lean_object* x_689; lean_object* x_690; lean_object* x_691; lean_object* x_692; lean_object* x_693; uint8_t x_694; lean_object* x_695; lean_object* x_696; lean_object* x_697; 
+x_688 = lean_ctor_get(x_687, 0);
+lean_inc(x_688);
+x_689 = lean_ctor_get(x_687, 1);
+lean_inc(x_689);
+if (lean_is_exclusive(x_687)) {
+ lean_ctor_release(x_687, 0);
+ lean_ctor_release(x_687, 1);
+ x_690 = x_687;
+} else {
+ lean_dec_ref(x_687);
+ x_690 = lean_box(0);
+}
+x_691 = lean_ctor_get(x_688, 0);
+lean_inc(x_691);
+x_692 = lean_ctor_get(x_688, 1);
+lean_inc(x_692);
+if (lean_is_exclusive(x_688)) {
+ lean_ctor_release(x_688, 0);
+ lean_ctor_release(x_688, 1);
+ x_693 = x_688;
+} else {
+ lean_dec_ref(x_688);
+ x_693 = lean_box(0);
+}
+x_694 = (uint8_t)((x_680 << 24) >> 61);
+x_695 = lean_expr_update_lambda(x_5, x_694, x_684, x_691);
+if (lean_is_scalar(x_693)) {
+ x_696 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_696 = x_693;
+}
+lean_ctor_set(x_696, 0, x_695);
+lean_ctor_set(x_696, 1, x_692);
+if (lean_is_scalar(x_690)) {
+ x_697 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_697 = x_690;
+}
+lean_ctor_set(x_697, 0, x_696);
+lean_ctor_set(x_697, 1, x_689);
+return x_697;
+}
+else
+{
+lean_object* x_698; lean_object* x_699; lean_object* x_700; lean_object* x_701; 
+lean_dec(x_684);
+lean_dec(x_5);
+x_698 = lean_ctor_get(x_687, 0);
+lean_inc(x_698);
+x_699 = lean_ctor_get(x_687, 1);
+lean_inc(x_699);
+if (lean_is_exclusive(x_687)) {
+ lean_ctor_release(x_687, 0);
+ lean_ctor_release(x_687, 1);
+ x_700 = x_687;
+} else {
+ lean_dec_ref(x_687);
+ x_700 = lean_box(0);
+}
+if (lean_is_scalar(x_700)) {
+ x_701 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_701 = x_700;
+}
+lean_ctor_set(x_701, 0, x_698);
+lean_ctor_set(x_701, 1, x_699);
+return x_701;
+}
+}
+else
+{
+lean_object* x_702; lean_object* x_703; lean_object* x_704; lean_object* x_705; 
+lean_dec(x_679);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_702 = lean_ctor_get(x_681, 0);
+lean_inc(x_702);
+x_703 = lean_ctor_get(x_681, 1);
+lean_inc(x_703);
+if (lean_is_exclusive(x_681)) {
+ lean_ctor_release(x_681, 0);
+ lean_ctor_release(x_681, 1);
+ x_704 = x_681;
+} else {
+ lean_dec_ref(x_681);
+ x_704 = lean_box(0);
+}
+if (lean_is_scalar(x_704)) {
+ x_705 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_705 = x_704;
+}
+lean_ctor_set(x_705, 0, x_702);
+lean_ctor_set(x_705, 1, x_703);
+return x_705;
+}
+}
+case 7:
+{
+lean_object* x_706; lean_object* x_707; uint64_t x_708; lean_object* x_709; 
+x_706 = lean_ctor_get(x_5, 1);
+lean_inc(x_706);
+x_707 = lean_ctor_get(x_5, 2);
+lean_inc(x_707);
+x_708 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_709 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_706, x_6, x_651, x_8, x_649);
+if (lean_obj_tag(x_709) == 0)
+{
+lean_object* x_710; lean_object* x_711; lean_object* x_712; lean_object* x_713; lean_object* x_714; lean_object* x_715; 
+x_710 = lean_ctor_get(x_709, 0);
+lean_inc(x_710);
+x_711 = lean_ctor_get(x_709, 1);
+lean_inc(x_711);
+lean_dec(x_709);
+x_712 = lean_ctor_get(x_710, 0);
+lean_inc(x_712);
+x_713 = lean_ctor_get(x_710, 1);
+lean_inc(x_713);
+lean_dec(x_710);
+x_714 = lean_nat_add(x_6, x_650);
+lean_dec(x_6);
+x_715 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_707, x_714, x_713, x_8, x_711);
+if (lean_obj_tag(x_715) == 0)
+{
+lean_object* x_716; lean_object* x_717; lean_object* x_718; lean_object* x_719; lean_object* x_720; lean_object* x_721; uint8_t x_722; lean_object* x_723; lean_object* x_724; lean_object* x_725; 
+x_716 = lean_ctor_get(x_715, 0);
+lean_inc(x_716);
+x_717 = lean_ctor_get(x_715, 1);
+lean_inc(x_717);
+if (lean_is_exclusive(x_715)) {
+ lean_ctor_release(x_715, 0);
+ lean_ctor_release(x_715, 1);
+ x_718 = x_715;
+} else {
+ lean_dec_ref(x_715);
+ x_718 = lean_box(0);
+}
+x_719 = lean_ctor_get(x_716, 0);
+lean_inc(x_719);
+x_720 = lean_ctor_get(x_716, 1);
+lean_inc(x_720);
+if (lean_is_exclusive(x_716)) {
+ lean_ctor_release(x_716, 0);
+ lean_ctor_release(x_716, 1);
+ x_721 = x_716;
+} else {
+ lean_dec_ref(x_716);
+ x_721 = lean_box(0);
+}
+x_722 = (uint8_t)((x_708 << 24) >> 61);
+x_723 = lean_expr_update_forall(x_5, x_722, x_712, x_719);
+if (lean_is_scalar(x_721)) {
+ x_724 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_724 = x_721;
+}
+lean_ctor_set(x_724, 0, x_723);
+lean_ctor_set(x_724, 1, x_720);
+if (lean_is_scalar(x_718)) {
+ x_725 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_725 = x_718;
+}
+lean_ctor_set(x_725, 0, x_724);
+lean_ctor_set(x_725, 1, x_717);
+return x_725;
+}
+else
+{
+lean_object* x_726; lean_object* x_727; lean_object* x_728; lean_object* x_729; 
+lean_dec(x_712);
+lean_dec(x_5);
+x_726 = lean_ctor_get(x_715, 0);
+lean_inc(x_726);
+x_727 = lean_ctor_get(x_715, 1);
+lean_inc(x_727);
+if (lean_is_exclusive(x_715)) {
+ lean_ctor_release(x_715, 0);
+ lean_ctor_release(x_715, 1);
+ x_728 = x_715;
+} else {
+ lean_dec_ref(x_715);
+ x_728 = lean_box(0);
+}
+if (lean_is_scalar(x_728)) {
+ x_729 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_729 = x_728;
+}
+lean_ctor_set(x_729, 0, x_726);
+lean_ctor_set(x_729, 1, x_727);
+return x_729;
+}
+}
+else
+{
+lean_object* x_730; lean_object* x_731; lean_object* x_732; lean_object* x_733; 
+lean_dec(x_707);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_730 = lean_ctor_get(x_709, 0);
+lean_inc(x_730);
+x_731 = lean_ctor_get(x_709, 1);
+lean_inc(x_731);
+if (lean_is_exclusive(x_709)) {
+ lean_ctor_release(x_709, 0);
+ lean_ctor_release(x_709, 1);
+ x_732 = x_709;
+} else {
+ lean_dec_ref(x_709);
+ x_732 = lean_box(0);
+}
+if (lean_is_scalar(x_732)) {
+ x_733 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_733 = x_732;
+}
+lean_ctor_set(x_733, 0, x_730);
+lean_ctor_set(x_733, 1, x_731);
+return x_733;
+}
+}
+case 8:
+{
+lean_object* x_734; lean_object* x_735; lean_object* x_736; lean_object* x_737; 
+x_734 = lean_ctor_get(x_5, 1);
+lean_inc(x_734);
+x_735 = lean_ctor_get(x_5, 2);
+lean_inc(x_735);
+x_736 = lean_ctor_get(x_5, 3);
+lean_inc(x_736);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_737 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_734, x_6, x_651, x_8, x_649);
+if (lean_obj_tag(x_737) == 0)
+{
+lean_object* x_738; lean_object* x_739; lean_object* x_740; lean_object* x_741; lean_object* x_742; 
+x_738 = lean_ctor_get(x_737, 0);
+lean_inc(x_738);
+x_739 = lean_ctor_get(x_737, 1);
+lean_inc(x_739);
+lean_dec(x_737);
+x_740 = lean_ctor_get(x_738, 0);
+lean_inc(x_740);
+x_741 = lean_ctor_get(x_738, 1);
+lean_inc(x_741);
+lean_dec(x_738);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_742 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_735, x_6, x_741, x_8, x_739);
+if (lean_obj_tag(x_742) == 0)
+{
+lean_object* x_743; lean_object* x_744; lean_object* x_745; lean_object* x_746; lean_object* x_747; lean_object* x_748; 
+x_743 = lean_ctor_get(x_742, 0);
+lean_inc(x_743);
+x_744 = lean_ctor_get(x_742, 1);
+lean_inc(x_744);
+lean_dec(x_742);
+x_745 = lean_ctor_get(x_743, 0);
+lean_inc(x_745);
+x_746 = lean_ctor_get(x_743, 1);
+lean_inc(x_746);
+lean_dec(x_743);
+x_747 = lean_nat_add(x_6, x_650);
+lean_dec(x_6);
+x_748 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_736, x_747, x_746, x_8, x_744);
+if (lean_obj_tag(x_748) == 0)
+{
+lean_object* x_749; lean_object* x_750; lean_object* x_751; lean_object* x_752; lean_object* x_753; lean_object* x_754; lean_object* x_755; lean_object* x_756; lean_object* x_757; 
+x_749 = lean_ctor_get(x_748, 0);
+lean_inc(x_749);
+x_750 = lean_ctor_get(x_748, 1);
+lean_inc(x_750);
+if (lean_is_exclusive(x_748)) {
+ lean_ctor_release(x_748, 0);
+ lean_ctor_release(x_748, 1);
+ x_751 = x_748;
+} else {
+ lean_dec_ref(x_748);
+ x_751 = lean_box(0);
+}
+x_752 = lean_ctor_get(x_749, 0);
+lean_inc(x_752);
+x_753 = lean_ctor_get(x_749, 1);
+lean_inc(x_753);
+if (lean_is_exclusive(x_749)) {
+ lean_ctor_release(x_749, 0);
+ lean_ctor_release(x_749, 1);
+ x_754 = x_749;
+} else {
+ lean_dec_ref(x_749);
+ x_754 = lean_box(0);
+}
+x_755 = lean_expr_update_let(x_5, x_740, x_745, x_752);
+if (lean_is_scalar(x_754)) {
+ x_756 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_756 = x_754;
+}
+lean_ctor_set(x_756, 0, x_755);
+lean_ctor_set(x_756, 1, x_753);
+if (lean_is_scalar(x_751)) {
+ x_757 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_757 = x_751;
+}
+lean_ctor_set(x_757, 0, x_756);
+lean_ctor_set(x_757, 1, x_750);
+return x_757;
+}
+else
+{
+lean_object* x_758; lean_object* x_759; lean_object* x_760; lean_object* x_761; 
+lean_dec(x_745);
+lean_dec(x_740);
+lean_dec(x_5);
+x_758 = lean_ctor_get(x_748, 0);
+lean_inc(x_758);
+x_759 = lean_ctor_get(x_748, 1);
+lean_inc(x_759);
+if (lean_is_exclusive(x_748)) {
+ lean_ctor_release(x_748, 0);
+ lean_ctor_release(x_748, 1);
+ x_760 = x_748;
+} else {
+ lean_dec_ref(x_748);
+ x_760 = lean_box(0);
+}
+if (lean_is_scalar(x_760)) {
+ x_761 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_761 = x_760;
+}
+lean_ctor_set(x_761, 0, x_758);
+lean_ctor_set(x_761, 1, x_759);
+return x_761;
+}
+}
+else
+{
+lean_object* x_762; lean_object* x_763; lean_object* x_764; lean_object* x_765; 
+lean_dec(x_740);
+lean_dec(x_736);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_762 = lean_ctor_get(x_742, 0);
+lean_inc(x_762);
+x_763 = lean_ctor_get(x_742, 1);
+lean_inc(x_763);
+if (lean_is_exclusive(x_742)) {
+ lean_ctor_release(x_742, 0);
+ lean_ctor_release(x_742, 1);
+ x_764 = x_742;
+} else {
+ lean_dec_ref(x_742);
+ x_764 = lean_box(0);
+}
+if (lean_is_scalar(x_764)) {
+ x_765 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_765 = x_764;
+}
+lean_ctor_set(x_765, 0, x_762);
+lean_ctor_set(x_765, 1, x_763);
+return x_765;
+}
+}
+else
+{
+lean_object* x_766; lean_object* x_767; lean_object* x_768; lean_object* x_769; 
+lean_dec(x_736);
+lean_dec(x_735);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_766 = lean_ctor_get(x_737, 0);
+lean_inc(x_766);
+x_767 = lean_ctor_get(x_737, 1);
+lean_inc(x_767);
+if (lean_is_exclusive(x_737)) {
+ lean_ctor_release(x_737, 0);
+ lean_ctor_release(x_737, 1);
+ x_768 = x_737;
+} else {
+ lean_dec_ref(x_737);
+ x_768 = lean_box(0);
+}
+if (lean_is_scalar(x_768)) {
+ x_769 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_769 = x_768;
+}
+lean_ctor_set(x_769, 0, x_766);
+lean_ctor_set(x_769, 1, x_767);
+return x_769;
+}
+}
+case 10:
+{
+lean_object* x_770; lean_object* x_771; 
+x_770 = lean_ctor_get(x_5, 1);
+lean_inc(x_770);
+x_771 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_770, x_6, x_651, x_8, x_649);
+if (lean_obj_tag(x_771) == 0)
+{
+lean_object* x_772; lean_object* x_773; lean_object* x_774; lean_object* x_775; lean_object* x_776; lean_object* x_777; lean_object* x_778; lean_object* x_779; lean_object* x_780; 
+x_772 = lean_ctor_get(x_771, 0);
+lean_inc(x_772);
+x_773 = lean_ctor_get(x_771, 1);
+lean_inc(x_773);
+if (lean_is_exclusive(x_771)) {
+ lean_ctor_release(x_771, 0);
+ lean_ctor_release(x_771, 1);
+ x_774 = x_771;
+} else {
+ lean_dec_ref(x_771);
+ x_774 = lean_box(0);
+}
+x_775 = lean_ctor_get(x_772, 0);
+lean_inc(x_775);
+x_776 = lean_ctor_get(x_772, 1);
+lean_inc(x_776);
+if (lean_is_exclusive(x_772)) {
+ lean_ctor_release(x_772, 0);
+ lean_ctor_release(x_772, 1);
+ x_777 = x_772;
+} else {
+ lean_dec_ref(x_772);
+ x_777 = lean_box(0);
+}
+x_778 = lean_expr_update_mdata(x_5, x_775);
+if (lean_is_scalar(x_777)) {
+ x_779 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_779 = x_777;
+}
+lean_ctor_set(x_779, 0, x_778);
+lean_ctor_set(x_779, 1, x_776);
+if (lean_is_scalar(x_774)) {
+ x_780 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_780 = x_774;
+}
+lean_ctor_set(x_780, 0, x_779);
+lean_ctor_set(x_780, 1, x_773);
+return x_780;
+}
+else
+{
+lean_object* x_781; lean_object* x_782; lean_object* x_783; lean_object* x_784; 
+lean_dec(x_5);
+x_781 = lean_ctor_get(x_771, 0);
+lean_inc(x_781);
+x_782 = lean_ctor_get(x_771, 1);
+lean_inc(x_782);
+if (lean_is_exclusive(x_771)) {
+ lean_ctor_release(x_771, 0);
+ lean_ctor_release(x_771, 1);
+ x_783 = x_771;
+} else {
+ lean_dec_ref(x_771);
+ x_783 = lean_box(0);
+}
+if (lean_is_scalar(x_783)) {
+ x_784 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_784 = x_783;
+}
+lean_ctor_set(x_784, 0, x_781);
+lean_ctor_set(x_784, 1, x_782);
+return x_784;
+}
+}
+case 11:
+{
+lean_object* x_785; lean_object* x_786; 
+x_785 = lean_ctor_get(x_5, 2);
+lean_inc(x_785);
+x_786 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_785, x_6, x_651, x_8, x_649);
+if (lean_obj_tag(x_786) == 0)
+{
+lean_object* x_787; lean_object* x_788; lean_object* x_789; lean_object* x_790; lean_object* x_791; lean_object* x_792; lean_object* x_793; lean_object* x_794; lean_object* x_795; 
+x_787 = lean_ctor_get(x_786, 0);
+lean_inc(x_787);
+x_788 = lean_ctor_get(x_786, 1);
+lean_inc(x_788);
+if (lean_is_exclusive(x_786)) {
+ lean_ctor_release(x_786, 0);
+ lean_ctor_release(x_786, 1);
+ x_789 = x_786;
+} else {
+ lean_dec_ref(x_786);
+ x_789 = lean_box(0);
+}
+x_790 = lean_ctor_get(x_787, 0);
+lean_inc(x_790);
+x_791 = lean_ctor_get(x_787, 1);
+lean_inc(x_791);
+if (lean_is_exclusive(x_787)) {
+ lean_ctor_release(x_787, 0);
+ lean_ctor_release(x_787, 1);
+ x_792 = x_787;
+} else {
+ lean_dec_ref(x_787);
+ x_792 = lean_box(0);
+}
+x_793 = lean_expr_update_proj(x_5, x_790);
+if (lean_is_scalar(x_792)) {
+ x_794 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_794 = x_792;
+}
+lean_ctor_set(x_794, 0, x_793);
+lean_ctor_set(x_794, 1, x_791);
+if (lean_is_scalar(x_789)) {
+ x_795 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_795 = x_789;
+}
+lean_ctor_set(x_795, 0, x_794);
+lean_ctor_set(x_795, 1, x_788);
+return x_795;
+}
+else
+{
+lean_object* x_796; lean_object* x_797; lean_object* x_798; lean_object* x_799; 
+lean_dec(x_5);
+x_796 = lean_ctor_get(x_786, 0);
+lean_inc(x_796);
+x_797 = lean_ctor_get(x_786, 1);
+lean_inc(x_797);
+if (lean_is_exclusive(x_786)) {
+ lean_ctor_release(x_786, 0);
+ lean_ctor_release(x_786, 1);
+ x_798 = x_786;
+} else {
+ lean_dec_ref(x_786);
+ x_798 = lean_box(0);
+}
+if (lean_is_scalar(x_798)) {
+ x_799 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_799 = x_798;
+}
+lean_ctor_set(x_799, 0, x_796);
+lean_ctor_set(x_799, 1, x_797);
+return x_799;
+}
+}
+default: 
+{
+lean_object* x_800; lean_object* x_801; 
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_2);
+x_800 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_800, 0, x_5);
+lean_ctor_set(x_800, 1, x_651);
+x_801 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_801, 0, x_800);
+lean_ctor_set(x_801, 1, x_649);
+return x_801;
+}
+}
+}
+else
+{
+lean_object* x_802; lean_object* x_803; lean_object* x_804; 
+lean_dec(x_8);
+lean_dec(x_5);
+lean_dec(x_2);
+x_802 = l_Lean_mkBVar(x_6);
+x_803 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_803, 0, x_802);
+lean_ctor_set(x_803, 1, x_651);
+x_804 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_804, 0, x_803);
+lean_ctor_set(x_804, 1, x_649);
+return x_804;
+}
+}
+}
+}
+else
+{
+uint8_t x_805; 
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_805 = !lean_is_exclusive(x_224);
+if (x_805 == 0)
+{
+return x_224;
+}
+else
+{
+lean_object* x_806; lean_object* x_807; lean_object* x_808; 
+x_806 = lean_ctor_get(x_224, 0);
+x_807 = lean_ctor_get(x_224, 1);
+lean_inc(x_807);
+lean_inc(x_806);
+lean_dec(x_224);
+x_808 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_808, 0, x_806);
+lean_ctor_set(x_808, 1, x_807);
+return x_808;
+}
+}
+}
+}
+}
+else
+{
+switch (lean_obj_tag(x_5)) {
+case 5:
+{
+lean_object* x_809; lean_object* x_810; lean_object* x_811; 
+x_809 = lean_ctor_get(x_5, 0);
+lean_inc(x_809);
+x_810 = lean_ctor_get(x_5, 1);
+lean_inc(x_810);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_811 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_809, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_811) == 0)
+{
+lean_object* x_812; lean_object* x_813; lean_object* x_814; lean_object* x_815; lean_object* x_816; 
+x_812 = lean_ctor_get(x_811, 0);
+lean_inc(x_812);
+x_813 = lean_ctor_get(x_811, 1);
+lean_inc(x_813);
+lean_dec(x_811);
+x_814 = lean_ctor_get(x_812, 0);
+lean_inc(x_814);
+x_815 = lean_ctor_get(x_812, 1);
+lean_inc(x_815);
+lean_dec(x_812);
+x_816 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_810, x_6, x_815, x_8, x_813);
+if (lean_obj_tag(x_816) == 0)
+{
+uint8_t x_817; 
+x_817 = !lean_is_exclusive(x_816);
+if (x_817 == 0)
+{
+lean_object* x_818; uint8_t x_819; 
+x_818 = lean_ctor_get(x_816, 0);
+x_819 = !lean_is_exclusive(x_818);
+if (x_819 == 0)
+{
+lean_object* x_820; lean_object* x_821; 
+x_820 = lean_ctor_get(x_818, 0);
+x_821 = lean_expr_update_app(x_5, x_814, x_820);
+lean_ctor_set(x_818, 0, x_821);
+return x_816;
+}
+else
+{
+lean_object* x_822; lean_object* x_823; lean_object* x_824; lean_object* x_825; 
+x_822 = lean_ctor_get(x_818, 0);
+x_823 = lean_ctor_get(x_818, 1);
+lean_inc(x_823);
+lean_inc(x_822);
+lean_dec(x_818);
+x_824 = lean_expr_update_app(x_5, x_814, x_822);
+x_825 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_825, 0, x_824);
+lean_ctor_set(x_825, 1, x_823);
+lean_ctor_set(x_816, 0, x_825);
+return x_816;
+}
+}
+else
+{
+lean_object* x_826; lean_object* x_827; lean_object* x_828; lean_object* x_829; lean_object* x_830; lean_object* x_831; lean_object* x_832; lean_object* x_833; 
+x_826 = lean_ctor_get(x_816, 0);
+x_827 = lean_ctor_get(x_816, 1);
+lean_inc(x_827);
+lean_inc(x_826);
+lean_dec(x_816);
+x_828 = lean_ctor_get(x_826, 0);
+lean_inc(x_828);
+x_829 = lean_ctor_get(x_826, 1);
+lean_inc(x_829);
+if (lean_is_exclusive(x_826)) {
+ lean_ctor_release(x_826, 0);
+ lean_ctor_release(x_826, 1);
+ x_830 = x_826;
+} else {
+ lean_dec_ref(x_826);
+ x_830 = lean_box(0);
+}
+x_831 = lean_expr_update_app(x_5, x_814, x_828);
+if (lean_is_scalar(x_830)) {
+ x_832 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_832 = x_830;
+}
+lean_ctor_set(x_832, 0, x_831);
+lean_ctor_set(x_832, 1, x_829);
+x_833 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_833, 0, x_832);
+lean_ctor_set(x_833, 1, x_827);
+return x_833;
+}
+}
+else
+{
+uint8_t x_834; 
+lean_dec(x_814);
+lean_dec(x_5);
+x_834 = !lean_is_exclusive(x_816);
+if (x_834 == 0)
+{
+return x_816;
+}
+else
+{
+lean_object* x_835; lean_object* x_836; lean_object* x_837; 
+x_835 = lean_ctor_get(x_816, 0);
+x_836 = lean_ctor_get(x_816, 1);
+lean_inc(x_836);
+lean_inc(x_835);
+lean_dec(x_816);
+x_837 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_837, 0, x_835);
+lean_ctor_set(x_837, 1, x_836);
+return x_837;
+}
+}
+}
+else
+{
+uint8_t x_838; 
+lean_dec(x_810);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_838 = !lean_is_exclusive(x_811);
+if (x_838 == 0)
+{
+return x_811;
+}
+else
+{
+lean_object* x_839; lean_object* x_840; lean_object* x_841; 
+x_839 = lean_ctor_get(x_811, 0);
+x_840 = lean_ctor_get(x_811, 1);
+lean_inc(x_840);
+lean_inc(x_839);
+lean_dec(x_811);
+x_841 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_841, 0, x_839);
+lean_ctor_set(x_841, 1, x_840);
+return x_841;
+}
+}
+}
+case 6:
+{
+lean_object* x_842; lean_object* x_843; uint64_t x_844; lean_object* x_845; 
+x_842 = lean_ctor_get(x_5, 1);
+lean_inc(x_842);
+x_843 = lean_ctor_get(x_5, 2);
+lean_inc(x_843);
+x_844 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_845 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_842, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_845) == 0)
+{
+lean_object* x_846; lean_object* x_847; lean_object* x_848; lean_object* x_849; lean_object* x_850; lean_object* x_851; lean_object* x_852; 
+x_846 = lean_ctor_get(x_845, 0);
+lean_inc(x_846);
+x_847 = lean_ctor_get(x_845, 1);
+lean_inc(x_847);
+lean_dec(x_845);
+x_848 = lean_ctor_get(x_846, 0);
+lean_inc(x_848);
+x_849 = lean_ctor_get(x_846, 1);
+lean_inc(x_849);
+lean_dec(x_846);
+x_850 = lean_unsigned_to_nat(1u);
+x_851 = lean_nat_add(x_6, x_850);
+lean_dec(x_6);
+x_852 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_843, x_851, x_849, x_8, x_847);
+if (lean_obj_tag(x_852) == 0)
+{
+uint8_t x_853; 
+x_853 = !lean_is_exclusive(x_852);
+if (x_853 == 0)
+{
+lean_object* x_854; uint8_t x_855; 
+x_854 = lean_ctor_get(x_852, 0);
+x_855 = !lean_is_exclusive(x_854);
+if (x_855 == 0)
+{
+lean_object* x_856; uint8_t x_857; lean_object* x_858; 
+x_856 = lean_ctor_get(x_854, 0);
+x_857 = (uint8_t)((x_844 << 24) >> 61);
+x_858 = lean_expr_update_lambda(x_5, x_857, x_848, x_856);
+lean_ctor_set(x_854, 0, x_858);
+return x_852;
+}
+else
+{
+lean_object* x_859; lean_object* x_860; uint8_t x_861; lean_object* x_862; lean_object* x_863; 
+x_859 = lean_ctor_get(x_854, 0);
+x_860 = lean_ctor_get(x_854, 1);
+lean_inc(x_860);
+lean_inc(x_859);
+lean_dec(x_854);
+x_861 = (uint8_t)((x_844 << 24) >> 61);
+x_862 = lean_expr_update_lambda(x_5, x_861, x_848, x_859);
+x_863 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_863, 0, x_862);
+lean_ctor_set(x_863, 1, x_860);
+lean_ctor_set(x_852, 0, x_863);
+return x_852;
+}
+}
+else
+{
+lean_object* x_864; lean_object* x_865; lean_object* x_866; lean_object* x_867; lean_object* x_868; uint8_t x_869; lean_object* x_870; lean_object* x_871; lean_object* x_872; 
+x_864 = lean_ctor_get(x_852, 0);
+x_865 = lean_ctor_get(x_852, 1);
+lean_inc(x_865);
+lean_inc(x_864);
+lean_dec(x_852);
+x_866 = lean_ctor_get(x_864, 0);
+lean_inc(x_866);
+x_867 = lean_ctor_get(x_864, 1);
+lean_inc(x_867);
+if (lean_is_exclusive(x_864)) {
+ lean_ctor_release(x_864, 0);
+ lean_ctor_release(x_864, 1);
+ x_868 = x_864;
+} else {
+ lean_dec_ref(x_864);
+ x_868 = lean_box(0);
+}
+x_869 = (uint8_t)((x_844 << 24) >> 61);
+x_870 = lean_expr_update_lambda(x_5, x_869, x_848, x_866);
+if (lean_is_scalar(x_868)) {
+ x_871 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_871 = x_868;
+}
+lean_ctor_set(x_871, 0, x_870);
+lean_ctor_set(x_871, 1, x_867);
+x_872 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_872, 0, x_871);
+lean_ctor_set(x_872, 1, x_865);
+return x_872;
+}
+}
+else
+{
+uint8_t x_873; 
+lean_dec(x_848);
+lean_dec(x_5);
+x_873 = !lean_is_exclusive(x_852);
+if (x_873 == 0)
+{
+return x_852;
+}
+else
+{
+lean_object* x_874; lean_object* x_875; lean_object* x_876; 
+x_874 = lean_ctor_get(x_852, 0);
+x_875 = lean_ctor_get(x_852, 1);
+lean_inc(x_875);
+lean_inc(x_874);
+lean_dec(x_852);
+x_876 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_876, 0, x_874);
+lean_ctor_set(x_876, 1, x_875);
+return x_876;
+}
+}
+}
+else
+{
+uint8_t x_877; 
+lean_dec(x_843);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_877 = !lean_is_exclusive(x_845);
+if (x_877 == 0)
+{
+return x_845;
+}
+else
+{
+lean_object* x_878; lean_object* x_879; lean_object* x_880; 
+x_878 = lean_ctor_get(x_845, 0);
+x_879 = lean_ctor_get(x_845, 1);
+lean_inc(x_879);
+lean_inc(x_878);
+lean_dec(x_845);
+x_880 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_880, 0, x_878);
+lean_ctor_set(x_880, 1, x_879);
+return x_880;
+}
+}
+}
+case 7:
+{
+lean_object* x_881; lean_object* x_882; uint64_t x_883; lean_object* x_884; 
+x_881 = lean_ctor_get(x_5, 1);
+lean_inc(x_881);
+x_882 = lean_ctor_get(x_5, 2);
+lean_inc(x_882);
+x_883 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_884 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_881, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_884) == 0)
+{
+lean_object* x_885; lean_object* x_886; lean_object* x_887; lean_object* x_888; lean_object* x_889; lean_object* x_890; lean_object* x_891; 
+x_885 = lean_ctor_get(x_884, 0);
+lean_inc(x_885);
+x_886 = lean_ctor_get(x_884, 1);
+lean_inc(x_886);
+lean_dec(x_884);
+x_887 = lean_ctor_get(x_885, 0);
+lean_inc(x_887);
+x_888 = lean_ctor_get(x_885, 1);
+lean_inc(x_888);
+lean_dec(x_885);
+x_889 = lean_unsigned_to_nat(1u);
+x_890 = lean_nat_add(x_6, x_889);
+lean_dec(x_6);
+x_891 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_882, x_890, x_888, x_8, x_886);
+if (lean_obj_tag(x_891) == 0)
+{
+uint8_t x_892; 
+x_892 = !lean_is_exclusive(x_891);
+if (x_892 == 0)
+{
+lean_object* x_893; uint8_t x_894; 
+x_893 = lean_ctor_get(x_891, 0);
+x_894 = !lean_is_exclusive(x_893);
+if (x_894 == 0)
+{
+lean_object* x_895; uint8_t x_896; lean_object* x_897; 
+x_895 = lean_ctor_get(x_893, 0);
+x_896 = (uint8_t)((x_883 << 24) >> 61);
+x_897 = lean_expr_update_forall(x_5, x_896, x_887, x_895);
+lean_ctor_set(x_893, 0, x_897);
+return x_891;
+}
+else
+{
+lean_object* x_898; lean_object* x_899; uint8_t x_900; lean_object* x_901; lean_object* x_902; 
+x_898 = lean_ctor_get(x_893, 0);
+x_899 = lean_ctor_get(x_893, 1);
+lean_inc(x_899);
+lean_inc(x_898);
+lean_dec(x_893);
+x_900 = (uint8_t)((x_883 << 24) >> 61);
+x_901 = lean_expr_update_forall(x_5, x_900, x_887, x_898);
+x_902 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_902, 0, x_901);
+lean_ctor_set(x_902, 1, x_899);
+lean_ctor_set(x_891, 0, x_902);
+return x_891;
+}
+}
+else
+{
+lean_object* x_903; lean_object* x_904; lean_object* x_905; lean_object* x_906; lean_object* x_907; uint8_t x_908; lean_object* x_909; lean_object* x_910; lean_object* x_911; 
+x_903 = lean_ctor_get(x_891, 0);
+x_904 = lean_ctor_get(x_891, 1);
+lean_inc(x_904);
+lean_inc(x_903);
+lean_dec(x_891);
+x_905 = lean_ctor_get(x_903, 0);
+lean_inc(x_905);
+x_906 = lean_ctor_get(x_903, 1);
+lean_inc(x_906);
+if (lean_is_exclusive(x_903)) {
+ lean_ctor_release(x_903, 0);
+ lean_ctor_release(x_903, 1);
+ x_907 = x_903;
+} else {
+ lean_dec_ref(x_903);
+ x_907 = lean_box(0);
+}
+x_908 = (uint8_t)((x_883 << 24) >> 61);
+x_909 = lean_expr_update_forall(x_5, x_908, x_887, x_905);
+if (lean_is_scalar(x_907)) {
+ x_910 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_910 = x_907;
+}
+lean_ctor_set(x_910, 0, x_909);
+lean_ctor_set(x_910, 1, x_906);
+x_911 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_911, 0, x_910);
+lean_ctor_set(x_911, 1, x_904);
+return x_911;
+}
+}
+else
+{
+uint8_t x_912; 
+lean_dec(x_887);
+lean_dec(x_5);
+x_912 = !lean_is_exclusive(x_891);
+if (x_912 == 0)
+{
+return x_891;
+}
+else
+{
+lean_object* x_913; lean_object* x_914; lean_object* x_915; 
+x_913 = lean_ctor_get(x_891, 0);
+x_914 = lean_ctor_get(x_891, 1);
+lean_inc(x_914);
+lean_inc(x_913);
+lean_dec(x_891);
+x_915 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_915, 0, x_913);
+lean_ctor_set(x_915, 1, x_914);
+return x_915;
+}
+}
+}
+else
+{
+uint8_t x_916; 
+lean_dec(x_882);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_916 = !lean_is_exclusive(x_884);
+if (x_916 == 0)
+{
+return x_884;
+}
+else
+{
+lean_object* x_917; lean_object* x_918; lean_object* x_919; 
+x_917 = lean_ctor_get(x_884, 0);
+x_918 = lean_ctor_get(x_884, 1);
+lean_inc(x_918);
+lean_inc(x_917);
+lean_dec(x_884);
+x_919 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_919, 0, x_917);
+lean_ctor_set(x_919, 1, x_918);
+return x_919;
+}
+}
+}
+case 8:
+{
+lean_object* x_920; lean_object* x_921; lean_object* x_922; lean_object* x_923; 
+x_920 = lean_ctor_get(x_5, 1);
+lean_inc(x_920);
+x_921 = lean_ctor_get(x_5, 2);
+lean_inc(x_921);
+x_922 = lean_ctor_get(x_5, 3);
+lean_inc(x_922);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_923 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_920, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_923) == 0)
+{
+lean_object* x_924; lean_object* x_925; lean_object* x_926; lean_object* x_927; lean_object* x_928; 
+x_924 = lean_ctor_get(x_923, 0);
+lean_inc(x_924);
+x_925 = lean_ctor_get(x_923, 1);
+lean_inc(x_925);
+lean_dec(x_923);
+x_926 = lean_ctor_get(x_924, 0);
+lean_inc(x_926);
+x_927 = lean_ctor_get(x_924, 1);
+lean_inc(x_927);
+lean_dec(x_924);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_928 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_921, x_6, x_927, x_8, x_925);
+if (lean_obj_tag(x_928) == 0)
+{
+lean_object* x_929; lean_object* x_930; lean_object* x_931; lean_object* x_932; lean_object* x_933; lean_object* x_934; lean_object* x_935; 
+x_929 = lean_ctor_get(x_928, 0);
+lean_inc(x_929);
+x_930 = lean_ctor_get(x_928, 1);
+lean_inc(x_930);
+lean_dec(x_928);
+x_931 = lean_ctor_get(x_929, 0);
+lean_inc(x_931);
+x_932 = lean_ctor_get(x_929, 1);
+lean_inc(x_932);
+lean_dec(x_929);
+x_933 = lean_unsigned_to_nat(1u);
+x_934 = lean_nat_add(x_6, x_933);
+lean_dec(x_6);
+x_935 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_922, x_934, x_932, x_8, x_930);
+if (lean_obj_tag(x_935) == 0)
+{
+uint8_t x_936; 
+x_936 = !lean_is_exclusive(x_935);
+if (x_936 == 0)
+{
+lean_object* x_937; uint8_t x_938; 
+x_937 = lean_ctor_get(x_935, 0);
+x_938 = !lean_is_exclusive(x_937);
+if (x_938 == 0)
+{
+lean_object* x_939; lean_object* x_940; 
+x_939 = lean_ctor_get(x_937, 0);
+x_940 = lean_expr_update_let(x_5, x_926, x_931, x_939);
+lean_ctor_set(x_937, 0, x_940);
+return x_935;
+}
+else
+{
+lean_object* x_941; lean_object* x_942; lean_object* x_943; lean_object* x_944; 
+x_941 = lean_ctor_get(x_937, 0);
+x_942 = lean_ctor_get(x_937, 1);
+lean_inc(x_942);
+lean_inc(x_941);
+lean_dec(x_937);
+x_943 = lean_expr_update_let(x_5, x_926, x_931, x_941);
+x_944 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_944, 0, x_943);
+lean_ctor_set(x_944, 1, x_942);
+lean_ctor_set(x_935, 0, x_944);
+return x_935;
+}
+}
+else
+{
+lean_object* x_945; lean_object* x_946; lean_object* x_947; lean_object* x_948; lean_object* x_949; lean_object* x_950; lean_object* x_951; lean_object* x_952; 
+x_945 = lean_ctor_get(x_935, 0);
+x_946 = lean_ctor_get(x_935, 1);
+lean_inc(x_946);
+lean_inc(x_945);
+lean_dec(x_935);
+x_947 = lean_ctor_get(x_945, 0);
+lean_inc(x_947);
+x_948 = lean_ctor_get(x_945, 1);
+lean_inc(x_948);
+if (lean_is_exclusive(x_945)) {
+ lean_ctor_release(x_945, 0);
+ lean_ctor_release(x_945, 1);
+ x_949 = x_945;
+} else {
+ lean_dec_ref(x_945);
+ x_949 = lean_box(0);
+}
+x_950 = lean_expr_update_let(x_5, x_926, x_931, x_947);
+if (lean_is_scalar(x_949)) {
+ x_951 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_951 = x_949;
+}
+lean_ctor_set(x_951, 0, x_950);
+lean_ctor_set(x_951, 1, x_948);
+x_952 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_952, 0, x_951);
+lean_ctor_set(x_952, 1, x_946);
+return x_952;
+}
+}
+else
+{
+uint8_t x_953; 
+lean_dec(x_931);
+lean_dec(x_926);
+lean_dec(x_5);
+x_953 = !lean_is_exclusive(x_935);
+if (x_953 == 0)
+{
+return x_935;
+}
+else
+{
+lean_object* x_954; lean_object* x_955; lean_object* x_956; 
+x_954 = lean_ctor_get(x_935, 0);
+x_955 = lean_ctor_get(x_935, 1);
+lean_inc(x_955);
+lean_inc(x_954);
+lean_dec(x_935);
+x_956 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_956, 0, x_954);
+lean_ctor_set(x_956, 1, x_955);
+return x_956;
+}
+}
+}
+else
+{
+uint8_t x_957; 
+lean_dec(x_926);
+lean_dec(x_922);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_957 = !lean_is_exclusive(x_928);
+if (x_957 == 0)
+{
+return x_928;
+}
+else
+{
+lean_object* x_958; lean_object* x_959; lean_object* x_960; 
+x_958 = lean_ctor_get(x_928, 0);
+x_959 = lean_ctor_get(x_928, 1);
+lean_inc(x_959);
+lean_inc(x_958);
+lean_dec(x_928);
+x_960 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_960, 0, x_958);
+lean_ctor_set(x_960, 1, x_959);
+return x_960;
+}
+}
+}
+else
+{
+uint8_t x_961; 
+lean_dec(x_922);
+lean_dec(x_921);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_961 = !lean_is_exclusive(x_923);
+if (x_961 == 0)
+{
+return x_923;
+}
+else
+{
+lean_object* x_962; lean_object* x_963; lean_object* x_964; 
+x_962 = lean_ctor_get(x_923, 0);
+x_963 = lean_ctor_get(x_923, 1);
+lean_inc(x_963);
+lean_inc(x_962);
+lean_dec(x_923);
+x_964 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_964, 0, x_962);
+lean_ctor_set(x_964, 1, x_963);
+return x_964;
+}
+}
+}
+case 10:
+{
+lean_object* x_965; lean_object* x_966; 
+x_965 = lean_ctor_get(x_5, 1);
+lean_inc(x_965);
+x_966 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_965, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_966) == 0)
+{
+uint8_t x_967; 
+x_967 = !lean_is_exclusive(x_966);
+if (x_967 == 0)
+{
+lean_object* x_968; uint8_t x_969; 
+x_968 = lean_ctor_get(x_966, 0);
+x_969 = !lean_is_exclusive(x_968);
+if (x_969 == 0)
+{
+lean_object* x_970; lean_object* x_971; 
+x_970 = lean_ctor_get(x_968, 0);
+x_971 = lean_expr_update_mdata(x_5, x_970);
+lean_ctor_set(x_968, 0, x_971);
+return x_966;
+}
+else
+{
+lean_object* x_972; lean_object* x_973; lean_object* x_974; lean_object* x_975; 
+x_972 = lean_ctor_get(x_968, 0);
+x_973 = lean_ctor_get(x_968, 1);
+lean_inc(x_973);
+lean_inc(x_972);
+lean_dec(x_968);
+x_974 = lean_expr_update_mdata(x_5, x_972);
+x_975 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_975, 0, x_974);
+lean_ctor_set(x_975, 1, x_973);
+lean_ctor_set(x_966, 0, x_975);
+return x_966;
+}
+}
+else
+{
+lean_object* x_976; lean_object* x_977; lean_object* x_978; lean_object* x_979; lean_object* x_980; lean_object* x_981; lean_object* x_982; lean_object* x_983; 
+x_976 = lean_ctor_get(x_966, 0);
+x_977 = lean_ctor_get(x_966, 1);
+lean_inc(x_977);
+lean_inc(x_976);
+lean_dec(x_966);
+x_978 = lean_ctor_get(x_976, 0);
+lean_inc(x_978);
+x_979 = lean_ctor_get(x_976, 1);
+lean_inc(x_979);
+if (lean_is_exclusive(x_976)) {
+ lean_ctor_release(x_976, 0);
+ lean_ctor_release(x_976, 1);
+ x_980 = x_976;
+} else {
+ lean_dec_ref(x_976);
+ x_980 = lean_box(0);
+}
+x_981 = lean_expr_update_mdata(x_5, x_978);
+if (lean_is_scalar(x_980)) {
+ x_982 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_982 = x_980;
+}
+lean_ctor_set(x_982, 0, x_981);
+lean_ctor_set(x_982, 1, x_979);
+x_983 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_983, 0, x_982);
+lean_ctor_set(x_983, 1, x_977);
+return x_983;
+}
+}
+else
+{
+uint8_t x_984; 
+lean_dec(x_5);
+x_984 = !lean_is_exclusive(x_966);
+if (x_984 == 0)
+{
+return x_966;
+}
+else
+{
+lean_object* x_985; lean_object* x_986; lean_object* x_987; 
+x_985 = lean_ctor_get(x_966, 0);
+x_986 = lean_ctor_get(x_966, 1);
+lean_inc(x_986);
+lean_inc(x_985);
+lean_dec(x_966);
+x_987 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_987, 0, x_985);
+lean_ctor_set(x_987, 1, x_986);
+return x_987;
+}
+}
+}
+case 11:
+{
+lean_object* x_988; lean_object* x_989; 
+x_988 = lean_ctor_get(x_5, 2);
+lean_inc(x_988);
+x_989 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_988, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_989) == 0)
+{
+uint8_t x_990; 
+x_990 = !lean_is_exclusive(x_989);
+if (x_990 == 0)
+{
+lean_object* x_991; uint8_t x_992; 
+x_991 = lean_ctor_get(x_989, 0);
+x_992 = !lean_is_exclusive(x_991);
+if (x_992 == 0)
+{
+lean_object* x_993; lean_object* x_994; 
+x_993 = lean_ctor_get(x_991, 0);
+x_994 = lean_expr_update_proj(x_5, x_993);
+lean_ctor_set(x_991, 0, x_994);
+return x_989;
+}
+else
+{
+lean_object* x_995; lean_object* x_996; lean_object* x_997; lean_object* x_998; 
+x_995 = lean_ctor_get(x_991, 0);
+x_996 = lean_ctor_get(x_991, 1);
+lean_inc(x_996);
+lean_inc(x_995);
+lean_dec(x_991);
+x_997 = lean_expr_update_proj(x_5, x_995);
+x_998 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_998, 0, x_997);
+lean_ctor_set(x_998, 1, x_996);
+lean_ctor_set(x_989, 0, x_998);
+return x_989;
+}
+}
+else
+{
+lean_object* x_999; lean_object* x_1000; lean_object* x_1001; lean_object* x_1002; lean_object* x_1003; lean_object* x_1004; lean_object* x_1005; lean_object* x_1006; 
+x_999 = lean_ctor_get(x_989, 0);
+x_1000 = lean_ctor_get(x_989, 1);
+lean_inc(x_1000);
+lean_inc(x_999);
+lean_dec(x_989);
+x_1001 = lean_ctor_get(x_999, 0);
+lean_inc(x_1001);
+x_1002 = lean_ctor_get(x_999, 1);
+lean_inc(x_1002);
+if (lean_is_exclusive(x_999)) {
+ lean_ctor_release(x_999, 0);
+ lean_ctor_release(x_999, 1);
+ x_1003 = x_999;
+} else {
+ lean_dec_ref(x_999);
+ x_1003 = lean_box(0);
+}
+x_1004 = lean_expr_update_proj(x_5, x_1001);
+if (lean_is_scalar(x_1003)) {
+ x_1005 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_1005 = x_1003;
+}
+lean_ctor_set(x_1005, 0, x_1004);
+lean_ctor_set(x_1005, 1, x_1002);
+x_1006 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_1006, 0, x_1005);
+lean_ctor_set(x_1006, 1, x_1000);
+return x_1006;
+}
+}
+else
+{
+uint8_t x_1007; 
+lean_dec(x_5);
+x_1007 = !lean_is_exclusive(x_989);
+if (x_1007 == 0)
+{
+return x_989;
+}
+else
+{
+lean_object* x_1008; lean_object* x_1009; lean_object* x_1010; 
+x_1008 = lean_ctor_get(x_989, 0);
+x_1009 = lean_ctor_get(x_989, 1);
+lean_inc(x_1009);
+lean_inc(x_1008);
+lean_dec(x_989);
+x_1010 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_1010, 0, x_1008);
+lean_ctor_set(x_1010, 1, x_1009);
+return x_1010;
+}
+}
+}
+default: 
+{
+lean_object* x_1011; lean_object* x_1012; 
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_2);
+x_1011 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_1011, 0, x_5);
+lean_ctor_set(x_1011, 1, x_7);
+x_1012 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_1012, 0, x_1011);
+lean_ctor_set(x_1012, 1, x_9);
+return x_1012;
+}
+}
+}
+block_215:
+{
+lean_dec(x_10);
+switch (lean_obj_tag(x_5)) {
+case 5:
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_11 = lean_ctor_get(x_5, 0);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_5, 1);
+lean_inc(x_12);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_13 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_11, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_13) == 0)
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get(x_13, 1);
+lean_inc(x_15);
+lean_dec(x_13);
+x_16 = lean_ctor_get(x_14, 0);
+lean_inc(x_16);
+x_17 = lean_ctor_get(x_14, 1);
+lean_inc(x_17);
+lean_dec(x_14);
+x_18 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_12, x_6, x_17, x_8, x_15);
+if (lean_obj_tag(x_18) == 0)
+{
+uint8_t x_19; 
+x_19 = !lean_is_exclusive(x_18);
+if (x_19 == 0)
+{
+lean_object* x_20; uint8_t x_21; 
+x_20 = lean_ctor_get(x_18, 0);
+x_21 = !lean_is_exclusive(x_20);
+if (x_21 == 0)
+{
+lean_object* x_22; lean_object* x_23; 
+x_22 = lean_ctor_get(x_20, 0);
+x_23 = lean_expr_update_app(x_5, x_16, x_22);
+lean_ctor_set(x_20, 0, x_23);
+return x_18;
+}
+else
+{
+lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; 
+x_24 = lean_ctor_get(x_20, 0);
+x_25 = lean_ctor_get(x_20, 1);
+lean_inc(x_25);
+lean_inc(x_24);
+lean_dec(x_20);
+x_26 = lean_expr_update_app(x_5, x_16, x_24);
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_26);
+lean_ctor_set(x_27, 1, x_25);
+lean_ctor_set(x_18, 0, x_27);
+return x_18;
+}
+}
+else
+{
+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; 
+x_28 = lean_ctor_get(x_18, 0);
+x_29 = lean_ctor_get(x_18, 1);
+lean_inc(x_29);
+lean_inc(x_28);
+lean_dec(x_18);
+x_30 = lean_ctor_get(x_28, 0);
+lean_inc(x_30);
+x_31 = lean_ctor_get(x_28, 1);
+lean_inc(x_31);
+if (lean_is_exclusive(x_28)) {
+ lean_ctor_release(x_28, 0);
+ lean_ctor_release(x_28, 1);
+ x_32 = x_28;
+} else {
+ lean_dec_ref(x_28);
+ x_32 = lean_box(0);
+}
+x_33 = lean_expr_update_app(x_5, x_16, x_30);
+if (lean_is_scalar(x_32)) {
+ x_34 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_34 = x_32;
+}
+lean_ctor_set(x_34, 0, x_33);
+lean_ctor_set(x_34, 1, x_31);
+x_35 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_35, 0, x_34);
+lean_ctor_set(x_35, 1, x_29);
+return x_35;
+}
+}
+else
+{
+uint8_t x_36; 
+lean_dec(x_16);
+lean_dec(x_5);
+x_36 = !lean_is_exclusive(x_18);
+if (x_36 == 0)
+{
+return x_18;
+}
+else
+{
+lean_object* x_37; lean_object* x_38; lean_object* x_39; 
+x_37 = lean_ctor_get(x_18, 0);
+x_38 = lean_ctor_get(x_18, 1);
+lean_inc(x_38);
+lean_inc(x_37);
+lean_dec(x_18);
+x_39 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_39, 0, x_37);
+lean_ctor_set(x_39, 1, x_38);
+return x_39;
+}
+}
+}
+else
+{
+uint8_t x_40; 
+lean_dec(x_12);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_40 = !lean_is_exclusive(x_13);
+if (x_40 == 0)
+{
+return x_13;
+}
+else
+{
+lean_object* x_41; lean_object* x_42; lean_object* x_43; 
+x_41 = lean_ctor_get(x_13, 0);
+x_42 = lean_ctor_get(x_13, 1);
+lean_inc(x_42);
+lean_inc(x_41);
+lean_dec(x_13);
+x_43 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_43, 0, x_41);
+lean_ctor_set(x_43, 1, x_42);
+return x_43;
+}
+}
+}
+case 6:
+{
+lean_object* x_44; lean_object* x_45; uint64_t x_46; lean_object* x_47; 
+x_44 = lean_ctor_get(x_5, 1);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_5, 2);
+lean_inc(x_45);
+x_46 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_47 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_44, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_47) == 0)
+{
+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; 
+x_48 = lean_ctor_get(x_47, 0);
+lean_inc(x_48);
+x_49 = lean_ctor_get(x_47, 1);
+lean_inc(x_49);
+lean_dec(x_47);
+x_50 = lean_ctor_get(x_48, 0);
+lean_inc(x_50);
+x_51 = lean_ctor_get(x_48, 1);
+lean_inc(x_51);
+lean_dec(x_48);
+x_52 = lean_unsigned_to_nat(1u);
+x_53 = lean_nat_add(x_6, x_52);
+lean_dec(x_6);
+x_54 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_45, x_53, x_51, x_8, x_49);
+if (lean_obj_tag(x_54) == 0)
+{
+uint8_t x_55; 
+x_55 = !lean_is_exclusive(x_54);
+if (x_55 == 0)
+{
+lean_object* x_56; uint8_t x_57; 
+x_56 = lean_ctor_get(x_54, 0);
+x_57 = !lean_is_exclusive(x_56);
+if (x_57 == 0)
+{
+lean_object* x_58; uint8_t x_59; lean_object* x_60; 
+x_58 = lean_ctor_get(x_56, 0);
+x_59 = (uint8_t)((x_46 << 24) >> 61);
+x_60 = lean_expr_update_lambda(x_5, x_59, x_50, x_58);
+lean_ctor_set(x_56, 0, x_60);
+return x_54;
+}
+else
+{
+lean_object* x_61; lean_object* x_62; uint8_t x_63; lean_object* x_64; lean_object* x_65; 
+x_61 = lean_ctor_get(x_56, 0);
+x_62 = lean_ctor_get(x_56, 1);
+lean_inc(x_62);
+lean_inc(x_61);
+lean_dec(x_56);
+x_63 = (uint8_t)((x_46 << 24) >> 61);
+x_64 = lean_expr_update_lambda(x_5, x_63, x_50, x_61);
+x_65 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_65, 0, x_64);
+lean_ctor_set(x_65, 1, x_62);
+lean_ctor_set(x_54, 0, x_65);
+return x_54;
+}
+}
+else
+{
+lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; uint8_t x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_66 = lean_ctor_get(x_54, 0);
+x_67 = lean_ctor_get(x_54, 1);
+lean_inc(x_67);
+lean_inc(x_66);
+lean_dec(x_54);
+x_68 = lean_ctor_get(x_66, 0);
+lean_inc(x_68);
+x_69 = lean_ctor_get(x_66, 1);
+lean_inc(x_69);
+if (lean_is_exclusive(x_66)) {
+ lean_ctor_release(x_66, 0);
+ lean_ctor_release(x_66, 1);
+ x_70 = x_66;
+} else {
+ lean_dec_ref(x_66);
+ x_70 = lean_box(0);
+}
+x_71 = (uint8_t)((x_46 << 24) >> 61);
+x_72 = lean_expr_update_lambda(x_5, x_71, x_50, x_68);
+if (lean_is_scalar(x_70)) {
+ x_73 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_73 = x_70;
+}
+lean_ctor_set(x_73, 0, x_72);
+lean_ctor_set(x_73, 1, x_69);
+x_74 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_74, 0, x_73);
+lean_ctor_set(x_74, 1, x_67);
+return x_74;
+}
+}
+else
+{
+uint8_t x_75; 
+lean_dec(x_50);
+lean_dec(x_5);
+x_75 = !lean_is_exclusive(x_54);
+if (x_75 == 0)
+{
+return x_54;
+}
+else
+{
+lean_object* x_76; lean_object* x_77; lean_object* x_78; 
+x_76 = lean_ctor_get(x_54, 0);
+x_77 = lean_ctor_get(x_54, 1);
+lean_inc(x_77);
+lean_inc(x_76);
+lean_dec(x_54);
+x_78 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_78, 0, x_76);
+lean_ctor_set(x_78, 1, x_77);
+return x_78;
+}
+}
+}
+else
+{
+uint8_t x_79; 
+lean_dec(x_45);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_79 = !lean_is_exclusive(x_47);
+if (x_79 == 0)
+{
+return x_47;
+}
+else
+{
+lean_object* x_80; lean_object* x_81; lean_object* x_82; 
+x_80 = lean_ctor_get(x_47, 0);
+x_81 = lean_ctor_get(x_47, 1);
+lean_inc(x_81);
+lean_inc(x_80);
+lean_dec(x_47);
+x_82 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_82, 0, x_80);
+lean_ctor_set(x_82, 1, x_81);
+return x_82;
+}
+}
+}
+case 7:
+{
+lean_object* x_83; lean_object* x_84; uint64_t x_85; lean_object* x_86; 
+x_83 = lean_ctor_get(x_5, 1);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_5, 2);
+lean_inc(x_84);
+x_85 = lean_ctor_get_uint64(x_5, sizeof(void*)*3);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_86 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_83, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_86) == 0)
+{
+lean_object* x_87; lean_object* x_88; lean_object* x_89; lean_object* x_90; lean_object* x_91; lean_object* x_92; lean_object* x_93; 
+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_ctor_get(x_87, 0);
+lean_inc(x_89);
+x_90 = lean_ctor_get(x_87, 1);
+lean_inc(x_90);
+lean_dec(x_87);
+x_91 = lean_unsigned_to_nat(1u);
+x_92 = lean_nat_add(x_6, x_91);
+lean_dec(x_6);
+x_93 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_84, x_92, x_90, x_8, x_88);
+if (lean_obj_tag(x_93) == 0)
+{
+uint8_t x_94; 
+x_94 = !lean_is_exclusive(x_93);
+if (x_94 == 0)
+{
+lean_object* x_95; uint8_t x_96; 
+x_95 = lean_ctor_get(x_93, 0);
+x_96 = !lean_is_exclusive(x_95);
+if (x_96 == 0)
+{
+lean_object* x_97; uint8_t x_98; lean_object* x_99; 
+x_97 = lean_ctor_get(x_95, 0);
+x_98 = (uint8_t)((x_85 << 24) >> 61);
+x_99 = lean_expr_update_forall(x_5, x_98, x_89, x_97);
+lean_ctor_set(x_95, 0, x_99);
+return x_93;
+}
+else
+{
+lean_object* x_100; lean_object* x_101; uint8_t x_102; lean_object* x_103; lean_object* x_104; 
+x_100 = lean_ctor_get(x_95, 0);
+x_101 = lean_ctor_get(x_95, 1);
+lean_inc(x_101);
+lean_inc(x_100);
+lean_dec(x_95);
+x_102 = (uint8_t)((x_85 << 24) >> 61);
+x_103 = lean_expr_update_forall(x_5, x_102, x_89, x_100);
+x_104 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_104, 0, x_103);
+lean_ctor_set(x_104, 1, x_101);
+lean_ctor_set(x_93, 0, x_104);
+return x_93;
+}
+}
+else
+{
+lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; uint8_t x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; 
+x_105 = lean_ctor_get(x_93, 0);
+x_106 = lean_ctor_get(x_93, 1);
+lean_inc(x_106);
+lean_inc(x_105);
+lean_dec(x_93);
+x_107 = lean_ctor_get(x_105, 0);
+lean_inc(x_107);
+x_108 = lean_ctor_get(x_105, 1);
+lean_inc(x_108);
+if (lean_is_exclusive(x_105)) {
+ lean_ctor_release(x_105, 0);
+ lean_ctor_release(x_105, 1);
+ x_109 = x_105;
+} else {
+ lean_dec_ref(x_105);
+ x_109 = lean_box(0);
+}
+x_110 = (uint8_t)((x_85 << 24) >> 61);
+x_111 = lean_expr_update_forall(x_5, x_110, x_89, x_107);
+if (lean_is_scalar(x_109)) {
+ x_112 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_112 = x_109;
+}
+lean_ctor_set(x_112, 0, x_111);
+lean_ctor_set(x_112, 1, x_108);
+x_113 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_113, 0, x_112);
+lean_ctor_set(x_113, 1, x_106);
+return x_113;
+}
+}
+else
+{
+uint8_t x_114; 
+lean_dec(x_89);
+lean_dec(x_5);
+x_114 = !lean_is_exclusive(x_93);
+if (x_114 == 0)
+{
+return x_93;
+}
+else
+{
+lean_object* x_115; lean_object* x_116; lean_object* x_117; 
+x_115 = lean_ctor_get(x_93, 0);
+x_116 = lean_ctor_get(x_93, 1);
+lean_inc(x_116);
+lean_inc(x_115);
+lean_dec(x_93);
+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;
+}
+}
+}
+else
+{
+uint8_t x_118; 
+lean_dec(x_84);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_118 = !lean_is_exclusive(x_86);
+if (x_118 == 0)
+{
+return x_86;
+}
+else
+{
+lean_object* x_119; lean_object* x_120; lean_object* x_121; 
+x_119 = lean_ctor_get(x_86, 0);
+x_120 = lean_ctor_get(x_86, 1);
+lean_inc(x_120);
+lean_inc(x_119);
+lean_dec(x_86);
+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;
+}
+}
+}
+case 8:
+{
+lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; 
+x_122 = lean_ctor_get(x_5, 1);
+lean_inc(x_122);
+x_123 = lean_ctor_get(x_5, 2);
+lean_inc(x_123);
+x_124 = lean_ctor_get(x_5, 3);
+lean_inc(x_124);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_125 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_122, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_125) == 0)
+{
+lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; 
+x_126 = lean_ctor_get(x_125, 0);
+lean_inc(x_126);
+x_127 = lean_ctor_get(x_125, 1);
+lean_inc(x_127);
+lean_dec(x_125);
+x_128 = lean_ctor_get(x_126, 0);
+lean_inc(x_128);
+x_129 = lean_ctor_get(x_126, 1);
+lean_inc(x_129);
+lean_dec(x_126);
+lean_inc(x_8);
+lean_inc(x_6);
+lean_inc(x_2);
+x_130 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_123, x_6, x_129, x_8, x_127);
+if (lean_obj_tag(x_130) == 0)
+{
+lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; 
+x_131 = lean_ctor_get(x_130, 0);
+lean_inc(x_131);
+x_132 = lean_ctor_get(x_130, 1);
+lean_inc(x_132);
+lean_dec(x_130);
+x_133 = lean_ctor_get(x_131, 0);
+lean_inc(x_133);
+x_134 = lean_ctor_get(x_131, 1);
+lean_inc(x_134);
+lean_dec(x_131);
+x_135 = lean_unsigned_to_nat(1u);
+x_136 = lean_nat_add(x_6, x_135);
+lean_dec(x_6);
+x_137 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_124, x_136, x_134, x_8, x_132);
+if (lean_obj_tag(x_137) == 0)
+{
+uint8_t x_138; 
+x_138 = !lean_is_exclusive(x_137);
+if (x_138 == 0)
+{
+lean_object* x_139; uint8_t x_140; 
+x_139 = lean_ctor_get(x_137, 0);
+x_140 = !lean_is_exclusive(x_139);
+if (x_140 == 0)
+{
+lean_object* x_141; lean_object* x_142; 
+x_141 = lean_ctor_get(x_139, 0);
+x_142 = lean_expr_update_let(x_5, x_128, x_133, x_141);
+lean_ctor_set(x_139, 0, x_142);
+return x_137;
+}
+else
+{
+lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; 
+x_143 = lean_ctor_get(x_139, 0);
+x_144 = lean_ctor_get(x_139, 1);
+lean_inc(x_144);
+lean_inc(x_143);
+lean_dec(x_139);
+x_145 = lean_expr_update_let(x_5, x_128, x_133, x_143);
+x_146 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_146, 0, x_145);
+lean_ctor_set(x_146, 1, x_144);
+lean_ctor_set(x_137, 0, x_146);
+return x_137;
+}
+}
+else
+{
+lean_object* x_147; 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_147 = lean_ctor_get(x_137, 0);
+x_148 = lean_ctor_get(x_137, 1);
+lean_inc(x_148);
+lean_inc(x_147);
+lean_dec(x_137);
+x_149 = lean_ctor_get(x_147, 0);
+lean_inc(x_149);
+x_150 = lean_ctor_get(x_147, 1);
+lean_inc(x_150);
+if (lean_is_exclusive(x_147)) {
+ lean_ctor_release(x_147, 0);
+ lean_ctor_release(x_147, 1);
+ x_151 = x_147;
+} else {
+ lean_dec_ref(x_147);
+ x_151 = lean_box(0);
+}
+x_152 = lean_expr_update_let(x_5, x_128, x_133, x_149);
+if (lean_is_scalar(x_151)) {
+ x_153 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_153 = x_151;
+}
+lean_ctor_set(x_153, 0, x_152);
+lean_ctor_set(x_153, 1, x_150);
+x_154 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_154, 0, x_153);
+lean_ctor_set(x_154, 1, x_148);
+return x_154;
+}
+}
+else
+{
+uint8_t x_155; 
+lean_dec(x_133);
+lean_dec(x_128);
+lean_dec(x_5);
+x_155 = !lean_is_exclusive(x_137);
+if (x_155 == 0)
+{
+return x_137;
+}
+else
+{
+lean_object* x_156; lean_object* x_157; lean_object* x_158; 
+x_156 = lean_ctor_get(x_137, 0);
+x_157 = lean_ctor_get(x_137, 1);
+lean_inc(x_157);
+lean_inc(x_156);
+lean_dec(x_137);
+x_158 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_158, 0, x_156);
+lean_ctor_set(x_158, 1, x_157);
+return x_158;
+}
+}
+}
+else
+{
+uint8_t x_159; 
+lean_dec(x_128);
+lean_dec(x_124);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_159 = !lean_is_exclusive(x_130);
+if (x_159 == 0)
+{
+return x_130;
+}
+else
+{
+lean_object* x_160; lean_object* x_161; lean_object* x_162; 
+x_160 = lean_ctor_get(x_130, 0);
+x_161 = lean_ctor_get(x_130, 1);
+lean_inc(x_161);
+lean_inc(x_160);
+lean_dec(x_130);
+x_162 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_162, 0, x_160);
+lean_ctor_set(x_162, 1, x_161);
+return x_162;
+}
+}
+}
+else
+{
+uint8_t x_163; 
+lean_dec(x_124);
+lean_dec(x_123);
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_2);
+x_163 = !lean_is_exclusive(x_125);
+if (x_163 == 0)
+{
+return x_125;
+}
+else
+{
+lean_object* x_164; lean_object* x_165; lean_object* x_166; 
+x_164 = lean_ctor_get(x_125, 0);
+x_165 = lean_ctor_get(x_125, 1);
+lean_inc(x_165);
+lean_inc(x_164);
+lean_dec(x_125);
+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;
+}
+}
+}
+case 10:
+{
+lean_object* x_167; lean_object* x_168; 
+x_167 = lean_ctor_get(x_5, 1);
+lean_inc(x_167);
+x_168 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_167, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_168) == 0)
+{
+uint8_t x_169; 
+x_169 = !lean_is_exclusive(x_168);
+if (x_169 == 0)
+{
+lean_object* x_170; uint8_t x_171; 
+x_170 = lean_ctor_get(x_168, 0);
+x_171 = !lean_is_exclusive(x_170);
+if (x_171 == 0)
+{
+lean_object* x_172; lean_object* x_173; 
+x_172 = lean_ctor_get(x_170, 0);
+x_173 = lean_expr_update_mdata(x_5, x_172);
+lean_ctor_set(x_170, 0, x_173);
+return x_168;
+}
+else
+{
+lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; 
+x_174 = lean_ctor_get(x_170, 0);
+x_175 = lean_ctor_get(x_170, 1);
+lean_inc(x_175);
+lean_inc(x_174);
+lean_dec(x_170);
+x_176 = lean_expr_update_mdata(x_5, x_174);
+x_177 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_177, 0, x_176);
+lean_ctor_set(x_177, 1, x_175);
+lean_ctor_set(x_168, 0, x_177);
+return x_168;
+}
+}
+else
+{
+lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; 
+x_178 = lean_ctor_get(x_168, 0);
+x_179 = lean_ctor_get(x_168, 1);
+lean_inc(x_179);
+lean_inc(x_178);
+lean_dec(x_168);
+x_180 = lean_ctor_get(x_178, 0);
+lean_inc(x_180);
+x_181 = lean_ctor_get(x_178, 1);
+lean_inc(x_181);
+if (lean_is_exclusive(x_178)) {
+ lean_ctor_release(x_178, 0);
+ lean_ctor_release(x_178, 1);
+ x_182 = x_178;
+} else {
+ lean_dec_ref(x_178);
+ x_182 = lean_box(0);
+}
+x_183 = lean_expr_update_mdata(x_5, x_180);
+if (lean_is_scalar(x_182)) {
+ x_184 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_184 = x_182;
+}
+lean_ctor_set(x_184, 0, x_183);
+lean_ctor_set(x_184, 1, x_181);
+x_185 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_185, 0, x_184);
+lean_ctor_set(x_185, 1, x_179);
+return x_185;
+}
+}
+else
+{
+uint8_t x_186; 
+lean_dec(x_5);
+x_186 = !lean_is_exclusive(x_168);
+if (x_186 == 0)
+{
+return x_168;
+}
+else
+{
+lean_object* x_187; lean_object* x_188; lean_object* x_189; 
+x_187 = lean_ctor_get(x_168, 0);
+x_188 = lean_ctor_get(x_168, 1);
+lean_inc(x_188);
+lean_inc(x_187);
+lean_dec(x_168);
+x_189 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_189, 0, x_187);
+lean_ctor_set(x_189, 1, x_188);
+return x_189;
+}
+}
+}
+case 11:
+{
+lean_object* x_190; lean_object* x_191; 
+x_190 = lean_ctor_get(x_5, 2);
+lean_inc(x_190);
+x_191 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_190, x_6, x_7, x_8, x_9);
+if (lean_obj_tag(x_191) == 0)
+{
+uint8_t x_192; 
+x_192 = !lean_is_exclusive(x_191);
+if (x_192 == 0)
+{
+lean_object* x_193; uint8_t x_194; 
+x_193 = lean_ctor_get(x_191, 0);
+x_194 = !lean_is_exclusive(x_193);
+if (x_194 == 0)
+{
+lean_object* x_195; lean_object* x_196; 
+x_195 = lean_ctor_get(x_193, 0);
+x_196 = lean_expr_update_proj(x_5, x_195);
+lean_ctor_set(x_193, 0, x_196);
+return x_191;
+}
+else
+{
+lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; 
+x_197 = lean_ctor_get(x_193, 0);
+x_198 = lean_ctor_get(x_193, 1);
+lean_inc(x_198);
+lean_inc(x_197);
+lean_dec(x_193);
+x_199 = lean_expr_update_proj(x_5, x_197);
+x_200 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_200, 0, x_199);
+lean_ctor_set(x_200, 1, x_198);
+lean_ctor_set(x_191, 0, x_200);
+return x_191;
+}
+}
+else
+{
+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; 
+x_201 = lean_ctor_get(x_191, 0);
+x_202 = lean_ctor_get(x_191, 1);
+lean_inc(x_202);
+lean_inc(x_201);
+lean_dec(x_191);
+x_203 = lean_ctor_get(x_201, 0);
+lean_inc(x_203);
+x_204 = lean_ctor_get(x_201, 1);
+lean_inc(x_204);
+if (lean_is_exclusive(x_201)) {
+ lean_ctor_release(x_201, 0);
+ lean_ctor_release(x_201, 1);
+ x_205 = x_201;
+} else {
+ lean_dec_ref(x_201);
+ x_205 = lean_box(0);
+}
+x_206 = lean_expr_update_proj(x_5, x_203);
+if (lean_is_scalar(x_205)) {
+ x_207 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_207 = x_205;
+}
+lean_ctor_set(x_207, 0, x_206);
+lean_ctor_set(x_207, 1, x_204);
+x_208 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_208, 0, x_207);
+lean_ctor_set(x_208, 1, x_202);
+return x_208;
+}
+}
+else
+{
+uint8_t x_209; 
+lean_dec(x_5);
+x_209 = !lean_is_exclusive(x_191);
+if (x_209 == 0)
+{
+return x_191;
+}
+else
+{
+lean_object* x_210; lean_object* x_211; lean_object* x_212; 
+x_210 = lean_ctor_get(x_191, 0);
+x_211 = lean_ctor_get(x_191, 1);
+lean_inc(x_211);
+lean_inc(x_210);
+lean_dec(x_191);
+x_212 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_212, 0, x_210);
+lean_ctor_set(x_212, 1, x_211);
+return x_212;
+}
+}
+}
+default: 
+{
+lean_object* x_213; lean_object* x_214; 
+lean_dec(x_8);
+lean_dec(x_6);
+lean_dec(x_2);
+x_213 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_213, 0, x_5);
+lean_ctor_set(x_213, 1, x_7);
+x_214 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_214, 0, x_213);
+lean_ctor_set(x_214, 1, x_9);
+return x_214;
+}
+}
+}
+}
+}
+lean_object* l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_10;
+}
+}
+lean_object* l___private_Init_Lean_Meta_KAbstract_1__kabstractAux(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+return x_10;
+}
+}
+lean_object* l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_1);
+return x_10;
+}
+}
+lean_object* l_Lean_Meta_kabstract(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; 
+x_6 = l_Lean_Expr_toHeadIndex___main(x_2);
+x_7 = lean_unsigned_to_nat(0u);
+x_8 = l___private_Init_Lean_HeadIndex_1__headNumArgsAux___main(x_2, x_7);
+x_9 = lean_unsigned_to_nat(1u);
+x_10 = l___private_Init_Lean_Meta_KAbstract_1__kabstractAux___main(x_3, x_2, x_6, x_8, x_1, x_7, x_9, x_4, x_5);
+lean_dec(x_8);
+lean_dec(x_6);
+if (lean_obj_tag(x_10) == 0)
+{
+uint8_t x_11; 
+x_11 = !lean_is_exclusive(x_10);
+if (x_11 == 0)
+{
+lean_object* x_12; lean_object* x_13; 
+x_12 = lean_ctor_get(x_10, 0);
+x_13 = lean_ctor_get(x_12, 0);
+lean_inc(x_13);
+lean_dec(x_12);
+lean_ctor_set(x_10, 0, x_13);
+return x_10;
+}
+else
+{
+lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_14 = lean_ctor_get(x_10, 0);
+x_15 = lean_ctor_get(x_10, 1);
+lean_inc(x_15);
+lean_inc(x_14);
+lean_dec(x_10);
+x_16 = lean_ctor_get(x_14, 0);
+lean_inc(x_16);
+lean_dec(x_14);
+x_17 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_17, 0, x_16);
+lean_ctor_set(x_17, 1, x_15);
+return x_17;
+}
+}
+else
+{
+uint8_t x_18; 
+x_18 = !lean_is_exclusive(x_10);
+if (x_18 == 0)
+{
+return x_10;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_10, 0);
+x_20 = lean_ctor_get(x_10, 1);
+lean_inc(x_20);
+lean_inc(x_19);
+lean_dec(x_10);
+x_21 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_21, 0, x_19);
+lean_ctor_set(x_21, 1, x_20);
+return x_21;
+}
+}
+}
+}
+lean_object* l_Lean_Meta_kabstract___boxed(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; 
+x_6 = l_Lean_Meta_kabstract(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_3);
+return x_6;
+}
+}
+lean_object* initialize_Init_Lean_Data_Occurrences(lean_object*);
+lean_object* initialize_Init_Lean_HeadIndex(lean_object*);
+lean_object* initialize_Init_Lean_Meta_ExprDefEq(lean_object*);
+static bool _G_initialized = false;
+lean_object* initialize_Init_Lean_Meta_KAbstract(lean_object* w) {
+lean_object * res;
+if (_G_initialized) return lean_mk_io_result(lean_box(0));
+_G_initialized = true;
+res = initialize_Init_Lean_Data_Occurrences(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+res = initialize_Init_Lean_HeadIndex(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+res = initialize_Init_Lean_Meta_ExprDefEq(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+return lean_mk_io_result(lean_box(0));
+}
+#ifdef __cplusplus
+}
+#endif
diff --git a/stage0/stdlib/Init/Lean/Meta/LevelDefEq.c b/stage0/stdlib/Init/Lean/Meta/LevelDefEq.c
index e91fac0a4a..730908401b 100644
--- a/stage0/stdlib/Init/Lean/Meta/LevelDefEq.c
+++ b/stage0/stdlib/Init/Lean/Meta/LevelDefEq.c
@@ -25,6 +25,7 @@ lean_object* l_Lean_Meta_isExprDefEq___closed__2;
 lean_object* l___private_Init_Lean_Meta_LevelDefEq_5__solveSelfMax(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_try___at_Lean_Meta_isLevelDefEq___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Init_Lean_Meta_LevelDefEq_2__strictOccursMaxAux___main(lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 lean_object* l_Lean_Meta_isExprDefEqAux(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
@@ -64,7 +65,6 @@ lean_object* l_Lean_MonadTracerAdapter_addTrace___at_Lean_Meta_isLevelDefEqAux__
 lean_object* l_Lean_Meta_isLevelDefEq___closed__7;
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Meta_LevelDefEq_10__processPostponedStep___spec__3(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* lean_metavar_ctx_get_level_assignment(lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
 lean_object* l_Lean_Meta_isLevelDefEqAux___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_LevelDefEq_9__getResetPostponed(lean_object*);
 lean_object* l_Lean_mkLevelMax(lean_object*, lean_object*);
@@ -1524,7 +1524,7 @@ lean_object* _init_l_Lean_Meta_isLevelDefEqAux___main___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
+x_1 = l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 x_2 = l_Lean_Meta_isLevelDefEqAux___main___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -11544,7 +11544,7 @@ lean_object* _init_l_Lean_Meta_isExprDefEq___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
+x_1 = l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 x_2 = l_Lean_Meta_isExprDefEq___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
diff --git a/stage0/stdlib/Init/Lean/Meta/Offset.c b/stage0/stdlib/Init/Lean/Meta/Offset.c
index edb2fbf31b..eb67bad655 100644
--- a/stage0/stdlib/Init/Lean/Meta/Offset.c
+++ b/stage0/stdlib/Init/Lean/Meta/Offset.c
@@ -14,47 +14,50 @@
 extern "C" {
 #endif
 extern lean_object* l___private_Init_Lean_Syntax_10__decodeNatLitVal___closed__1;
+lean_object* l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isExprDefEqAux(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_evalNat___main___closed__10;
-lean_object* l___private_Init_Lean_Meta_Offset_1__getOffset___main(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Offset_1__getOffset(lean_object*);
 lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Offset_3__isOffset(lean_object*);
 lean_object* l_Lean_Meta_evalNat(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Offset_2__getOffset(lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppNumArgsAux___main(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Offset_5__mkOffset(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_evalNat___main___closed__11;
-lean_object* l___private_Init_Lean_Meta_Offset_4__mkOffset(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_evalNat___main(lean_object*);
 lean_object* l_Lean_Meta_isDefEqOffset(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_evalNat___main___closed__12;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 extern lean_object* l_Lean_Literal_type___closed__1;
+lean_object* l___private_Init_Lean_Meta_Offset_1__getOffsetAux(lean_object*, uint8_t);
 lean_object* l_Lean_Meta_evalNat___main___closed__6;
 extern lean_object* l_Lean_Literal_type___closed__2;
 lean_object* l_Lean_Meta_evalNat___main___closed__13;
-lean_object* l___private_Init_Lean_Meta_Offset_4__mkOffset___closed__1;
+lean_object* l___private_Init_Lean_Meta_Offset_4__isNatZero___boxed(lean_object*);
 lean_object* l_Lean_Meta_evalNat___main___closed__4;
 lean_object* l_Lean_Expr_getRevArg_x21___main(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_evalNat___main___closed__2;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_Offset_5__mkOffset___closed__1;
 lean_object* l_Lean_Meta_evalNat___main___closed__9;
 uint8_t l_Bool_toLBool(uint8_t);
-uint8_t l___private_Init_Lean_Meta_Offset_3__isNatZero(lean_object*);
+uint8_t l___private_Init_Lean_Meta_Offset_4__isNatZero(lean_object*);
 lean_object* l_Lean_Meta_evalNat___main___closed__8;
 lean_object* lean_nat_mul(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_evalNat___main___closed__7;
+lean_object* l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(lean_object*, uint8_t);
 lean_object* l_Lean_Meta_evalNat___boxed(lean_object*);
 lean_object* l_Lean_Meta_evalNat___main___closed__3;
 lean_object* l_Lean_Meta_evalNat___main___closed__5;
 lean_object* l_Lean_Meta_evalNat___main___closed__14;
 lean_object* l_Lean_Meta_evalNat___main___closed__1;
 lean_object* l_Lean_Meta_evalNat___main___boxed(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Offset_3__isNatZero___boxed(lean_object*);
+lean_object* l___private_Init_Lean_Meta_Offset_1__getOffsetAux___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_mkNatLit(lean_object*);
-lean_object* l___private_Init_Lean_Meta_Offset_2__isOffset(lean_object*);
 lean_object* l_Lean_mkAppB(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
@@ -977,296 +980,492 @@ lean_dec(x_1);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Offset_1__getOffset___main(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(lean_object* x_1, uint8_t x_2) {
 _start:
 {
+lean_object* x_3; 
 if (lean_obj_tag(x_1) == 5)
 {
-lean_object* x_2; lean_object* x_3; 
-x_2 = lean_ctor_get(x_1, 1);
-lean_inc(x_2);
-x_3 = l_Lean_Expr_getAppFn___main(x_1);
-if (lean_obj_tag(x_3) == 4)
+lean_object* x_9; lean_object* x_10; 
+x_9 = lean_ctor_get(x_1, 1);
+lean_inc(x_9);
+x_10 = l_Lean_Expr_getAppFn___main(x_1);
+if (lean_obj_tag(x_10) == 4)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_34; lean_object* x_60; uint8_t x_61; 
-x_4 = lean_ctor_get(x_3, 0);
-lean_inc(x_4);
-lean_dec(x_3);
-x_5 = lean_unsigned_to_nat(0u);
-x_6 = l_Lean_Expr_getAppNumArgsAux___main(x_1, x_5);
-x_60 = l_Lean_Meta_evalNat___main___closed__14;
-x_61 = lean_name_eq(x_4, x_60);
-if (x_61 == 0)
+lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_53; lean_object* x_90; uint8_t x_91; 
+x_11 = lean_ctor_get(x_10, 0);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = lean_unsigned_to_nat(0u);
+x_13 = l_Lean_Expr_getAppNumArgsAux___main(x_1, x_12);
+x_90 = l_Lean_Meta_evalNat___main___closed__14;
+x_91 = lean_name_eq(x_11, x_90);
+if (x_91 == 0)
 {
-lean_object* x_62; 
-lean_dec(x_2);
-x_62 = lean_box(0);
-x_34 = x_62;
-goto block_59;
+lean_object* x_92; 
+lean_dec(x_9);
+x_92 = lean_box(0);
+x_53 = x_92;
+goto block_89;
 }
 else
 {
-lean_object* x_63; uint8_t x_64; 
-x_63 = lean_unsigned_to_nat(1u);
-x_64 = lean_nat_dec_eq(x_6, x_63);
-if (x_64 == 0)
+lean_object* x_93; uint8_t x_94; 
+x_93 = lean_unsigned_to_nat(1u);
+x_94 = lean_nat_dec_eq(x_13, x_93);
+if (x_94 == 0)
 {
-lean_object* x_65; 
-lean_dec(x_2);
-x_65 = lean_box(0);
-x_34 = x_65;
-goto block_59;
+lean_object* x_95; 
+lean_dec(x_9);
+x_95 = lean_box(0);
+x_53 = x_95;
+goto block_89;
 }
 else
 {
-lean_object* x_66; uint8_t x_67; 
-lean_dec(x_6);
-lean_dec(x_4);
+uint8_t x_96; lean_object* x_97; 
+lean_dec(x_13);
+lean_dec(x_11);
 lean_dec(x_1);
-x_66 = l___private_Init_Lean_Meta_Offset_1__getOffset___main(x_2);
-x_67 = !lean_is_exclusive(x_66);
-if (x_67 == 0)
+x_96 = 0;
+x_97 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_9, x_96);
+if (lean_obj_tag(x_97) == 0)
 {
-lean_object* x_68; lean_object* x_69; 
-x_68 = lean_ctor_get(x_66, 1);
-x_69 = lean_nat_add(x_68, x_63);
-lean_dec(x_68);
-lean_ctor_set(x_66, 1, x_69);
-return x_66;
+lean_object* x_98; 
+x_98 = lean_box(0);
+return x_98;
 }
 else
 {
-lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_70 = lean_ctor_get(x_66, 0);
-x_71 = lean_ctor_get(x_66, 1);
-lean_inc(x_71);
-lean_inc(x_70);
-lean_dec(x_66);
-x_72 = lean_nat_add(x_71, x_63);
-lean_dec(x_71);
-x_73 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_73, 0, x_70);
-lean_ctor_set(x_73, 1, x_72);
-return x_73;
-}
-}
-}
-block_33:
+uint8_t x_99; 
+x_99 = !lean_is_exclusive(x_97);
+if (x_99 == 0)
 {
-lean_object* x_8; uint8_t x_9; 
-lean_dec(x_7);
-x_8 = l_Lean_Meta_evalNat___main___closed__9;
-x_9 = lean_name_eq(x_4, x_8);
-lean_dec(x_4);
-if (x_9 == 0)
+lean_object* x_100; uint8_t x_101; 
+x_100 = lean_ctor_get(x_97, 0);
+x_101 = !lean_is_exclusive(x_100);
+if (x_101 == 0)
 {
-lean_object* x_10; 
-lean_dec(x_6);
-x_10 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_10, 0, x_1);
-lean_ctor_set(x_10, 1, x_5);
-return x_10;
+lean_object* x_102; lean_object* x_103; 
+x_102 = lean_ctor_get(x_100, 1);
+x_103 = lean_nat_add(x_102, x_93);
+lean_dec(x_102);
+lean_ctor_set(x_100, 1, x_103);
+return x_97;
 }
 else
 {
-lean_object* x_11; uint8_t x_12; 
-x_11 = lean_unsigned_to_nat(4u);
-x_12 = lean_nat_dec_eq(x_6, x_11);
-if (x_12 == 0)
-{
-lean_object* x_13; 
-lean_dec(x_6);
-x_13 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_13, 0, x_1);
-lean_ctor_set(x_13, 1, x_5);
-return x_13;
+lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; 
+x_104 = lean_ctor_get(x_100, 0);
+x_105 = lean_ctor_get(x_100, 1);
+lean_inc(x_105);
+lean_inc(x_104);
+lean_dec(x_100);
+x_106 = lean_nat_add(x_105, x_93);
+lean_dec(x_105);
+x_107 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_107, 0, x_104);
+lean_ctor_set(x_107, 1, x_106);
+lean_ctor_set(x_97, 0, x_107);
+return x_97;
+}
 }
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_14 = lean_unsigned_to_nat(3u);
-x_15 = lean_nat_sub(x_6, x_14);
-x_16 = lean_unsigned_to_nat(1u);
-x_17 = lean_nat_sub(x_15, x_16);
-lean_dec(x_15);
-x_18 = l_Lean_Expr_getRevArg_x21___main(x_1, x_17);
-x_19 = l_Lean_Meta_evalNat___main(x_18);
-lean_dec(x_18);
-if (lean_obj_tag(x_19) == 0)
+lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; 
+x_108 = lean_ctor_get(x_97, 0);
+lean_inc(x_108);
+lean_dec(x_97);
+x_109 = lean_ctor_get(x_108, 0);
+lean_inc(x_109);
+x_110 = lean_ctor_get(x_108, 1);
+lean_inc(x_110);
+if (lean_is_exclusive(x_108)) {
+ lean_ctor_release(x_108, 0);
+ lean_ctor_release(x_108, 1);
+ x_111 = x_108;
+} else {
+ lean_dec_ref(x_108);
+ x_111 = lean_box(0);
+}
+x_112 = lean_nat_add(x_110, x_93);
+lean_dec(x_110);
+if (lean_is_scalar(x_111)) {
+ x_113 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_113 = x_111;
+}
+lean_ctor_set(x_113, 0, x_109);
+lean_ctor_set(x_113, 1, x_112);
+x_114 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_114, 0, x_113);
+return x_114;
+}
+}
+}
+}
+block_52:
+{
+lean_object* x_15; uint8_t x_16; 
+lean_dec(x_14);
+x_15 = l_Lean_Meta_evalNat___main___closed__9;
+x_16 = lean_name_eq(x_11, x_15);
+lean_dec(x_11);
+if (x_16 == 0)
+{
+lean_object* x_17; 
+lean_dec(x_13);
+x_17 = lean_box(0);
+x_3 = x_17;
+goto block_8;
+}
+else
+{
+lean_object* x_18; uint8_t x_19; 
+x_18 = lean_unsigned_to_nat(4u);
+x_19 = lean_nat_dec_eq(x_13, x_18);
+if (x_19 == 0)
 {
 lean_object* x_20; 
-lean_dec(x_6);
-x_20 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_20, 0, x_1);
-lean_ctor_set(x_20, 1, x_5);
-return x_20;
+lean_dec(x_13);
+x_20 = lean_box(0);
+x_3 = x_20;
+goto block_8;
 }
 else
 {
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; 
-x_21 = lean_ctor_get(x_19, 0);
-lean_inc(x_21);
-lean_dec(x_19);
-x_22 = lean_nat_sub(x_6, x_5);
-lean_dec(x_6);
-x_23 = lean_nat_sub(x_22, x_16);
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_21 = lean_unsigned_to_nat(3u);
+x_22 = lean_nat_sub(x_13, x_21);
+x_23 = lean_unsigned_to_nat(1u);
+x_24 = lean_nat_sub(x_22, x_23);
 lean_dec(x_22);
-x_24 = l_Lean_Expr_getRevArg_x21___main(x_1, x_23);
-lean_dec(x_1);
-x_25 = l___private_Init_Lean_Meta_Offset_1__getOffset___main(x_24);
-x_26 = !lean_is_exclusive(x_25);
-if (x_26 == 0)
+x_25 = l_Lean_Expr_getRevArg_x21___main(x_1, x_24);
+x_26 = l_Lean_Meta_evalNat___main(x_25);
+lean_dec(x_25);
+if (lean_obj_tag(x_26) == 0)
 {
-lean_object* x_27; lean_object* x_28; 
-x_27 = lean_ctor_get(x_25, 1);
-x_28 = lean_nat_add(x_27, x_21);
-lean_dec(x_21);
-lean_dec(x_27);
-lean_ctor_set(x_25, 1, x_28);
-return x_25;
+lean_object* x_27; 
+lean_dec(x_13);
+lean_dec(x_1);
+x_27 = lean_box(0);
+return x_27;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
-x_29 = lean_ctor_get(x_25, 0);
-x_30 = lean_ctor_get(x_25, 1);
-lean_inc(x_30);
-lean_inc(x_29);
-lean_dec(x_25);
-x_31 = lean_nat_add(x_30, x_21);
-lean_dec(x_21);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; uint8_t x_33; lean_object* x_34; 
+x_28 = lean_ctor_get(x_26, 0);
+lean_inc(x_28);
+lean_dec(x_26);
+x_29 = lean_unsigned_to_nat(2u);
+x_30 = lean_nat_sub(x_13, x_29);
+lean_dec(x_13);
+x_31 = lean_nat_sub(x_30, x_23);
 lean_dec(x_30);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_29);
-lean_ctor_set(x_32, 1, x_31);
-return x_32;
-}
-}
-}
-}
-}
-block_59:
+x_32 = l_Lean_Expr_getRevArg_x21___main(x_1, x_31);
+lean_dec(x_1);
+x_33 = 0;
+x_34 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_32, x_33);
+if (lean_obj_tag(x_34) == 0)
 {
-lean_object* x_35; uint8_t x_36; 
-lean_dec(x_34);
-x_35 = l_Lean_Meta_evalNat___main___closed__12;
-x_36 = lean_name_eq(x_4, x_35);
+lean_object* x_35; 
+lean_dec(x_28);
+x_35 = lean_box(0);
+return x_35;
+}
+else
+{
+uint8_t x_36; 
+x_36 = !lean_is_exclusive(x_34);
 if (x_36 == 0)
 {
-lean_object* x_37; 
-x_37 = lean_box(0);
-x_7 = x_37;
-goto block_33;
+lean_object* x_37; uint8_t x_38; 
+x_37 = lean_ctor_get(x_34, 0);
+x_38 = !lean_is_exclusive(x_37);
+if (x_38 == 0)
+{
+lean_object* x_39; lean_object* x_40; 
+x_39 = lean_ctor_get(x_37, 1);
+x_40 = lean_nat_add(x_39, x_28);
+lean_dec(x_28);
+lean_dec(x_39);
+lean_ctor_set(x_37, 1, x_40);
+return x_34;
 }
 else
 {
-lean_object* x_38; uint8_t x_39; 
-x_38 = lean_unsigned_to_nat(2u);
-x_39 = lean_nat_dec_eq(x_6, x_38);
-if (x_39 == 0)
-{
-lean_object* x_40; 
-x_40 = lean_box(0);
-x_7 = x_40;
-goto block_33;
-}
-else
-{
-lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; 
-lean_dec(x_4);
-x_41 = lean_unsigned_to_nat(1u);
-x_42 = lean_nat_sub(x_6, x_41);
-x_43 = lean_nat_sub(x_42, x_41);
+lean_object* x_41; lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_41 = lean_ctor_get(x_37, 0);
+x_42 = lean_ctor_get(x_37, 1);
+lean_inc(x_42);
+lean_inc(x_41);
+lean_dec(x_37);
+x_43 = lean_nat_add(x_42, x_28);
+lean_dec(x_28);
 lean_dec(x_42);
-x_44 = l_Lean_Expr_getRevArg_x21___main(x_1, x_43);
-x_45 = l_Lean_Meta_evalNat___main(x_44);
-lean_dec(x_44);
-if (lean_obj_tag(x_45) == 0)
-{
-lean_object* x_46; 
-lean_dec(x_6);
-x_46 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_46, 0, x_1);
-lean_ctor_set(x_46, 1, x_5);
-return x_46;
+x_44 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_44, 0, x_41);
+lean_ctor_set(x_44, 1, x_43);
+lean_ctor_set(x_34, 0, x_44);
+return x_34;
+}
 }
 else
 {
-lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; lean_object* x_51; uint8_t x_52; 
-x_47 = lean_ctor_get(x_45, 0);
+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; 
+x_45 = lean_ctor_get(x_34, 0);
+lean_inc(x_45);
+lean_dec(x_34);
+x_46 = lean_ctor_get(x_45, 0);
+lean_inc(x_46);
+x_47 = lean_ctor_get(x_45, 1);
 lean_inc(x_47);
-lean_dec(x_45);
-x_48 = lean_nat_sub(x_6, x_5);
-lean_dec(x_6);
-x_49 = lean_nat_sub(x_48, x_41);
-lean_dec(x_48);
-x_50 = l_Lean_Expr_getRevArg_x21___main(x_1, x_49);
-lean_dec(x_1);
-x_51 = l___private_Init_Lean_Meta_Offset_1__getOffset___main(x_50);
-x_52 = !lean_is_exclusive(x_51);
-if (x_52 == 0)
-{
-lean_object* x_53; lean_object* x_54; 
-x_53 = lean_ctor_get(x_51, 1);
-x_54 = lean_nat_add(x_53, x_47);
+if (lean_is_exclusive(x_45)) {
+ lean_ctor_release(x_45, 0);
+ lean_ctor_release(x_45, 1);
+ x_48 = x_45;
+} else {
+ lean_dec_ref(x_45);
+ x_48 = lean_box(0);
+}
+x_49 = lean_nat_add(x_47, x_28);
+lean_dec(x_28);
 lean_dec(x_47);
-lean_dec(x_53);
-lean_ctor_set(x_51, 1, x_54);
+if (lean_is_scalar(x_48)) {
+ x_50 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_50 = x_48;
+}
+lean_ctor_set(x_50, 0, x_46);
+lean_ctor_set(x_50, 1, x_49);
+x_51 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_51, 0, x_50);
 return x_51;
 }
-else
+}
+}
+}
+}
+}
+block_89:
 {
-lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
-x_55 = lean_ctor_get(x_51, 0);
-x_56 = lean_ctor_get(x_51, 1);
-lean_inc(x_56);
-lean_inc(x_55);
-lean_dec(x_51);
-x_57 = lean_nat_add(x_56, x_47);
-lean_dec(x_47);
-lean_dec(x_56);
-x_58 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_58, 0, x_55);
-lean_ctor_set(x_58, 1, x_57);
-return x_58;
-}
-}
-}
-}
-}
+lean_object* x_54; uint8_t x_55; 
+lean_dec(x_53);
+x_54 = l_Lean_Meta_evalNat___main___closed__12;
+x_55 = lean_name_eq(x_11, x_54);
+if (x_55 == 0)
+{
+lean_object* x_56; 
+x_56 = lean_box(0);
+x_14 = x_56;
+goto block_52;
 }
 else
 {
-lean_object* x_74; lean_object* x_75; 
-lean_dec(x_3);
-lean_dec(x_2);
-x_74 = lean_unsigned_to_nat(0u);
-x_75 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_75, 0, x_1);
-lean_ctor_set(x_75, 1, x_74);
-return x_75;
-}
+lean_object* x_57; uint8_t x_58; 
+x_57 = lean_unsigned_to_nat(2u);
+x_58 = lean_nat_dec_eq(x_13, x_57);
+if (x_58 == 0)
+{
+lean_object* x_59; 
+x_59 = lean_box(0);
+x_14 = x_59;
+goto block_52;
 }
 else
 {
+lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+lean_dec(x_11);
+x_60 = lean_unsigned_to_nat(1u);
+x_61 = lean_nat_sub(x_13, x_60);
+x_62 = lean_nat_sub(x_61, x_60);
+lean_dec(x_61);
+x_63 = l_Lean_Expr_getRevArg_x21___main(x_1, x_62);
+x_64 = l_Lean_Meta_evalNat___main(x_63);
+lean_dec(x_63);
+if (lean_obj_tag(x_64) == 0)
+{
+lean_object* x_65; 
+lean_dec(x_13);
+lean_dec(x_1);
+x_65 = lean_box(0);
+return x_65;
+}
+else
+{
+lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; uint8_t x_70; lean_object* x_71; 
+x_66 = lean_ctor_get(x_64, 0);
+lean_inc(x_66);
+lean_dec(x_64);
+x_67 = lean_nat_sub(x_13, x_12);
+lean_dec(x_13);
+x_68 = lean_nat_sub(x_67, x_60);
+lean_dec(x_67);
+x_69 = l_Lean_Expr_getRevArg_x21___main(x_1, x_68);
+lean_dec(x_1);
+x_70 = 0;
+x_71 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_69, x_70);
+if (lean_obj_tag(x_71) == 0)
+{
+lean_object* x_72; 
+lean_dec(x_66);
+x_72 = lean_box(0);
+return x_72;
+}
+else
+{
+uint8_t x_73; 
+x_73 = !lean_is_exclusive(x_71);
+if (x_73 == 0)
+{
+lean_object* x_74; uint8_t x_75; 
+x_74 = lean_ctor_get(x_71, 0);
+x_75 = !lean_is_exclusive(x_74);
+if (x_75 == 0)
+{
 lean_object* x_76; lean_object* x_77; 
-x_76 = lean_unsigned_to_nat(0u);
-x_77 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_77, 0, x_1);
-lean_ctor_set(x_77, 1, x_76);
-return x_77;
+x_76 = lean_ctor_get(x_74, 1);
+x_77 = lean_nat_add(x_76, x_66);
+lean_dec(x_66);
+lean_dec(x_76);
+lean_ctor_set(x_74, 1, x_77);
+return x_71;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; 
+x_78 = lean_ctor_get(x_74, 0);
+x_79 = lean_ctor_get(x_74, 1);
+lean_inc(x_79);
+lean_inc(x_78);
+lean_dec(x_74);
+x_80 = lean_nat_add(x_79, x_66);
+lean_dec(x_66);
+lean_dec(x_79);
+x_81 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_81, 0, x_78);
+lean_ctor_set(x_81, 1, x_80);
+lean_ctor_set(x_71, 0, x_81);
+return x_71;
+}
+}
+else
+{
+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_82 = lean_ctor_get(x_71, 0);
+lean_inc(x_82);
+lean_dec(x_71);
+x_83 = lean_ctor_get(x_82, 0);
+lean_inc(x_83);
+x_84 = lean_ctor_get(x_82, 1);
+lean_inc(x_84);
+if (lean_is_exclusive(x_82)) {
+ lean_ctor_release(x_82, 0);
+ lean_ctor_release(x_82, 1);
+ x_85 = x_82;
+} else {
+ lean_dec_ref(x_82);
+ x_85 = lean_box(0);
+}
+x_86 = lean_nat_add(x_84, x_66);
+lean_dec(x_66);
+lean_dec(x_84);
+if (lean_is_scalar(x_85)) {
+ x_87 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_87 = x_85;
+}
+lean_ctor_set(x_87, 0, x_83);
+lean_ctor_set(x_87, 1, x_86);
+x_88 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_88, 0, x_87);
+return x_88;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Offset_1__getOffset(lean_object* x_1) {
+}
+}
+}
+}
+else
+{
+lean_object* x_115; 
+lean_dec(x_10);
+lean_dec(x_9);
+x_115 = lean_box(0);
+x_3 = x_115;
+goto block_8;
+}
+}
+else
+{
+lean_object* x_116; 
+x_116 = lean_box(0);
+x_3 = x_116;
+goto block_8;
+}
+block_8:
+{
+lean_dec(x_3);
+if (x_2 == 0)
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_4 = lean_unsigned_to_nat(0u);
+x_5 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_5, 0, x_1);
+lean_ctor_set(x_5, 1, x_4);
+x_6 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_6, 0, x_5);
+return x_6;
+}
+else
+{
+lean_object* x_7; 
+lean_dec(x_1);
+x_7 = lean_box(0);
+return x_7;
+}
+}
+}
+}
+lean_object* l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
-lean_object* x_2; 
-x_2 = l___private_Init_Lean_Meta_Offset_1__getOffset___main(x_1);
-return x_2;
+uint8_t x_3; lean_object* x_4; 
+x_3 = lean_unbox(x_2);
+lean_dec(x_2);
+x_4 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_1, x_3);
+return x_4;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Offset_2__isOffset(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Offset_1__getOffsetAux(lean_object* x_1, uint8_t x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_1, x_2);
+return x_3;
+}
+}
+lean_object* l___private_Init_Lean_Meta_Offset_1__getOffsetAux___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+uint8_t x_3; lean_object* x_4; 
+x_3 = lean_unbox(x_2);
+lean_dec(x_2);
+x_4 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux(x_1, x_3);
+return x_4;
+}
+}
+lean_object* l___private_Init_Lean_Meta_Offset_2__getOffset(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = 1;
+x_3 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_1, x_2);
+return x_3;
+}
+}
+lean_object* l___private_Init_Lean_Meta_Offset_3__isOffset(lean_object* x_1) {
 _start:
 {
 if (lean_obj_tag(x_1) == 5)
@@ -1307,12 +1506,11 @@ goto block_17;
 }
 else
 {
-lean_object* x_25; lean_object* x_26; 
+uint8_t x_25; lean_object* x_26; 
 lean_dec(x_5);
 lean_dec(x_3);
-x_25 = l___private_Init_Lean_Meta_Offset_1__getOffset___main(x_1);
-x_26 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_26, 0, x_25);
+x_25 = 1;
+x_26 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_1, x_25);
 return x_26;
 }
 }
@@ -1344,24 +1542,22 @@ goto block_17;
 }
 else
 {
-lean_object* x_33; lean_object* x_34; 
+uint8_t x_33; lean_object* x_34; 
 lean_dec(x_5);
 lean_dec(x_3);
-x_33 = l___private_Init_Lean_Meta_Offset_1__getOffset___main(x_1);
-x_34 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_34, 0, x_33);
+x_33 = 1;
+x_34 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_1, x_33);
 return x_34;
 }
 }
 }
 else
 {
-lean_object* x_35; lean_object* x_36; 
+uint8_t x_35; lean_object* x_36; 
 lean_dec(x_5);
 lean_dec(x_3);
-x_35 = l___private_Init_Lean_Meta_Offset_1__getOffset___main(x_1);
-x_36 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_36, 0, x_35);
+x_35 = 1;
+x_36 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_1, x_35);
 return x_36;
 }
 }
@@ -1383,10 +1579,9 @@ return x_9;
 }
 else
 {
-lean_object* x_10; lean_object* x_11; 
-x_10 = l___private_Init_Lean_Meta_Offset_1__getOffset___main(x_1);
-x_11 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_11, 0, x_10);
+uint8_t x_10; lean_object* x_11; 
+x_10 = 1;
+x_11 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_1, x_10);
 return x_11;
 }
 }
@@ -1405,10 +1600,9 @@ return x_14;
 }
 else
 {
-lean_object* x_15; lean_object* x_16; 
-x_15 = l___private_Init_Lean_Meta_Offset_1__getOffset___main(x_1);
-x_16 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_16, 0, x_15);
+uint8_t x_15; lean_object* x_16; 
+x_15 = 1;
+x_16 = l___private_Init_Lean_Meta_Offset_1__getOffsetAux___main(x_1, x_15);
 return x_16;
 }
 }
@@ -1432,7 +1626,7 @@ return x_38;
 }
 }
 }
-uint8_t l___private_Init_Lean_Meta_Offset_3__isNatZero(lean_object* x_1) {
+uint8_t l___private_Init_Lean_Meta_Offset_4__isNatZero(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
@@ -1456,17 +1650,17 @@ return x_6;
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_Offset_3__isNatZero___boxed(lean_object* x_1) {
+lean_object* l___private_Init_Lean_Meta_Offset_4__isNatZero___boxed(lean_object* x_1) {
 _start:
 {
 uint8_t x_2; lean_object* x_3; 
-x_2 = l___private_Init_Lean_Meta_Offset_3__isNatZero(x_1);
+x_2 = l___private_Init_Lean_Meta_Offset_4__isNatZero(x_1);
 lean_dec(x_1);
 x_3 = lean_box(x_2);
 return x_3;
 }
 }
-lean_object* _init_l___private_Init_Lean_Meta_Offset_4__mkOffset___closed__1() {
+lean_object* _init_l___private_Init_Lean_Meta_Offset_5__mkOffset___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
@@ -1476,7 +1670,7 @@ x_3 = l_Lean_mkConst(x_2, x_1);
 return x_3;
 }
 }
-lean_object* l___private_Init_Lean_Meta_Offset_4__mkOffset(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_Meta_Offset_5__mkOffset(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
@@ -1485,12 +1679,12 @@ x_4 = lean_nat_dec_eq(x_2, x_3);
 if (x_4 == 0)
 {
 uint8_t x_5; 
-x_5 = l___private_Init_Lean_Meta_Offset_3__isNatZero(x_1);
+x_5 = l___private_Init_Lean_Meta_Offset_4__isNatZero(x_1);
 if (x_5 == 0)
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
 x_6 = l_Lean_mkNatLit(x_2);
-x_7 = l___private_Init_Lean_Meta_Offset_4__mkOffset___closed__1;
+x_7 = l___private_Init_Lean_Meta_Offset_5__mkOffset___closed__1;
 x_8 = l_Lean_mkAppB(x_7, x_1, x_6);
 return x_8;
 }
@@ -1514,7 +1708,7 @@ _start:
 {
 lean_object* x_5; 
 lean_inc(x_1);
-x_5 = l___private_Init_Lean_Meta_Offset_2__isOffset(x_1);
+x_5 = l___private_Init_Lean_Meta_Offset_3__isOffset(x_1);
 if (lean_obj_tag(x_5) == 0)
 {
 lean_object* x_6; 
@@ -1539,7 +1733,7 @@ x_10 = lean_ctor_get(x_6, 0);
 lean_inc(x_10);
 lean_dec(x_6);
 lean_inc(x_2);
-x_11 = l___private_Init_Lean_Meta_Offset_2__isOffset(x_2);
+x_11 = l___private_Init_Lean_Meta_Offset_3__isOffset(x_2);
 if (lean_obj_tag(x_11) == 0)
 {
 lean_object* x_12; 
@@ -1681,7 +1875,7 @@ x_48 = lean_ctor_get(x_46, 1);
 lean_inc(x_48);
 lean_dec(x_46);
 lean_inc(x_2);
-x_49 = l___private_Init_Lean_Meta_Offset_2__isOffset(x_2);
+x_49 = l___private_Init_Lean_Meta_Offset_3__isOffset(x_2);
 if (lean_obj_tag(x_49) == 0)
 {
 lean_object* x_50; 
@@ -1810,7 +2004,7 @@ lean_object* x_82; lean_object* x_83; lean_object* x_84;
 x_82 = lean_nat_sub(x_48, x_79);
 lean_dec(x_79);
 lean_dec(x_48);
-x_83 = l___private_Init_Lean_Meta_Offset_4__mkOffset(x_47, x_82);
+x_83 = l___private_Init_Lean_Meta_Offset_5__mkOffset(x_47, x_82);
 x_84 = l_Lean_Meta_isExprDefEqAux(x_83, x_78, x_3, x_4);
 if (lean_obj_tag(x_84) == 0)
 {
@@ -1874,7 +2068,7 @@ lean_object* x_100; lean_object* x_101; lean_object* x_102;
 x_100 = lean_nat_sub(x_79, x_48);
 lean_dec(x_48);
 lean_dec(x_79);
-x_101 = l___private_Init_Lean_Meta_Offset_4__mkOffset(x_78, x_100);
+x_101 = l___private_Init_Lean_Meta_Offset_5__mkOffset(x_78, x_100);
 x_102 = l_Lean_Meta_isExprDefEqAux(x_47, x_101, x_3, x_4);
 if (lean_obj_tag(x_102) == 0)
 {
@@ -2040,8 +2234,8 @@ l_Lean_Meta_evalNat___main___closed__13 = _init_l_Lean_Meta_evalNat___main___clo
 lean_mark_persistent(l_Lean_Meta_evalNat___main___closed__13);
 l_Lean_Meta_evalNat___main___closed__14 = _init_l_Lean_Meta_evalNat___main___closed__14();
 lean_mark_persistent(l_Lean_Meta_evalNat___main___closed__14);
-l___private_Init_Lean_Meta_Offset_4__mkOffset___closed__1 = _init_l___private_Init_Lean_Meta_Offset_4__mkOffset___closed__1();
-lean_mark_persistent(l___private_Init_Lean_Meta_Offset_4__mkOffset___closed__1);
+l___private_Init_Lean_Meta_Offset_5__mkOffset___closed__1 = _init_l___private_Init_Lean_Meta_Offset_5__mkOffset___closed__1();
+lean_mark_persistent(l___private_Init_Lean_Meta_Offset_5__mkOffset___closed__1);
 return lean_mk_io_result(lean_box(0));
 }
 #ifdef __cplusplus
diff --git a/stage0/stdlib/Init/Lean/Meta/SynthInstance.c b/stage0/stdlib/Init/Lean/Meta/SynthInstance.c
index f8ad8b7eec..7a3451c9c7 100644
--- a/stage0/stdlib/Init/Lean/Meta/SynthInstance.c
+++ b/stage0/stdlib/Init/Lean/Meta/SynthInstance.c
@@ -39,6 +39,7 @@ lean_object* l___private_Init_Lean_Meta_SynthInstance_4__preprocessArgs___boxed(
 uint8_t l_AssocList_contains___main___at_Lean_Meta_SynthInstance_MkTableKey_normExpr___main___spec__4(lean_object*, lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
 lean_object* lean_expr_update_mdata(lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_SynthInstance_7__regTraceClasses(lean_object*);
 lean_object* l_HashMapImp_find_x3f___at_Lean_Meta_SynthInstance_MkTableKey_normLevel___main___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_generate___closed__5;
 lean_object* l_Array_iterateMAux___main___at_Lean_Meta_SynthInstance_getInstances___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -46,15 +47,17 @@ lean_object* l_HashMapImp_find_x3f___at_Lean_Meta_SynthInstance_findEntry_x3f___
 lean_object* l_Lean_Meta_mkForall(lean_object*, lean_object*, lean_object*, lean_object*);
 extern size_t l_PersistentHashMap_insertAux___main___rarg___closed__2;
 lean_object* l_Lean_Meta_SynthInstance_addAnswer___closed__1;
+lean_object* l_Lean_Meta_SynthInstance_synth___main___closed__7;
 lean_object* l_Lean_Meta_SynthInstance_mkTableKey___closed__3;
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_addAnswer___closed__2;
 lean_object* l_Lean_Meta_SynthInstance_tryResolveCore___lambda__1___closed__2;
-lean_object* l___private_Init_Lean_Meta_SynthInstance_6__regTraceClasses(lean_object*);
+extern lean_object* l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 lean_object* l_Lean_Meta_SynthInstance_SynthM_inhabited___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_getResult(lean_object*);
 size_t l_USize_sub(size_t, size_t);
 extern lean_object* l_Array_empty___closed__1;
+lean_object* l_Lean_Meta_maxStepsOption___closed__5;
 lean_object* l_HashMapImp_expand___at_Lean_Meta_SynthInstance_MkTableKey_normExpr___main___spec__5(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Meta_synthInstance_x3f___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__1;
@@ -71,6 +74,7 @@ lean_object* l_Lean_Meta_SynthInstance_mkTableKey___closed__1;
 lean_object* l_mkHashMap___at_Lean_Meta_SynthInstance_mkTableKey___spec__2(lean_object*);
 lean_object* l_Lean_Meta_instantiateLevelMVars(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_MkTableKey_normExpr___main(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_maxStepsOption(lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_tryResolveCore___lambda__1___closed__3;
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_getEntry___closed__3;
@@ -83,6 +87,7 @@ lean_object* l_Lean_Meta_SynthInstance_resume(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_getAppFn___main(lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_withMCtx(lean_object*);
 lean_object* l_PersistentArray_push___rarg(lean_object*, lean_object*);
+extern lean_object* l_String_splitAux___main___closed__1;
 lean_object* l___private_Init_Lean_Meta_SynthInstance_4__preprocessArgs___main___closed__1;
 extern lean_object* l_Lean_Expr_getAppArgs___closed__1;
 lean_object* l_Lean_Meta_SynthInstance_tryResolveCore___lambda__1___closed__5;
@@ -98,6 +103,7 @@ lean_object* l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__2;
 lean_object* l_List_mapM___main___at_Lean_Meta_SynthInstance_MkTableKey_normExpr___main___spec__9(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_FileMap_ofString___closed__1;
 lean_object* l_Lean_Meta_SynthInstance_getInstances___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_maxStepsOption___closed__3;
 lean_object* l_Lean_Meta_SynthInstance_newSubgoal___closed__1;
 lean_object* l___private_Init_Lean_Meta_SynthInstance_3__preprocessLevels(lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
@@ -115,6 +121,8 @@ lean_object* l___private_Init_Lean_Util_Trace_3__getResetTraces___at_Lean_Meta_S
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_Meta_synthInstance_x3f___spec__1(lean_object*, lean_object*);
 lean_object* l_AssocList_replace___main___at_Lean_Meta_SynthInstance_newSubgoal___spec__6(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_wakeUp(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_Meta_Exception_toTraceMessageData___closed__73;
+lean_object* l___private_Init_Lean_Meta_SynthInstance_6__getMaxSteps(lean_object*);
 lean_object* l___private_Init_Lean_Meta_SynthInstance_2__preprocess___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_AbstractMVarsResult_inhabited___closed__1;
 uint8_t l_Lean_Meta_SynthInstance_Waiter_isRoot(lean_object*);
@@ -126,6 +134,7 @@ uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_meta2Synth(lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_getTop___boxed(lean_object*);
 lean_object* l_Lean_Meta_abstractMVars(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_Meta_SynthInstance_6__getMaxSteps___boxed(lean_object*);
 lean_object* l___private_Init_Lean_Meta_SynthInstance_5__preprocessOutParam___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_synth___main___closed__6;
 lean_object* l_Lean_Meta_SynthInstance_getTraceState(lean_object*);
@@ -137,7 +146,6 @@ lean_object* l_List_mapM___main___at_Lean_Meta_SynthInstance_getInstances___spec
 lean_object* l_Lean_Meta_SynthInstance_getOptions(lean_object*, lean_object*);
 lean_object* l_HashMapImp_expand___at_Lean_Meta_SynthInstance_MkTableKey_normLevel___main___spec__5(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_generate___closed__3;
-extern lean_object* l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
 lean_object* l_HashMapImp_insert___at_Lean_Meta_SynthInstance_MkTableKey_normExpr___main___spec__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Meta_SynthInstance_MkTableKey_normLevel___main___spec__2(lean_object*, lean_object*);
 lean_object* lean_level_update_max(lean_object*, lean_object*, lean_object*);
@@ -155,6 +163,7 @@ lean_object* l_Array_iterateMAux___main___at_Lean_Meta_SynthInstance_consume___s
 uint8_t l_Array_anyRangeMAux___main___at_Lean_Meta_SynthInstance_isNewAnswer___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_getNextToResume___rarg(lean_object*);
 size_t l_Lean_Name_hash(lean_object*);
+lean_object* l_Nat_repr(lean_object*);
 extern lean_object* l_Lean_MessageData_coeOfArrayExpr___closed__2;
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_Meta_synthInstance_x3f___spec__1___boxed(lean_object*, lean_object*);
 extern lean_object* l_PersistentHashMap_insertAux___main___rarg___closed__3;
@@ -178,12 +187,13 @@ lean_object* l_Array_iterateMAux___main___at_Lean_Meta_synthInstance_x3f___spec_
 extern lean_object* l_Lean_Meta_Exception_toTraceMessageData___closed__4;
 lean_object* l_HashMapImp_find_x3f___at_Lean_Meta_SynthInstance_findEntry_x3f___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_step(lean_object*, lean_object*);
+lean_object* l_Lean_Meta_SynthInstance_synth___main___closed__9;
 size_t lean_usize_modn(size_t, lean_object*);
 lean_object* l_mkHashMap___at_Lean_Meta_SynthInstance_main___spec__1(lean_object*);
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Meta_SynthInstance_findEntry_x3f___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_resume___closed__5;
-lean_object* l_Lean_Meta_synthInstance_x3f(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_synthInstance_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_newSubgoal(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_mul(size_t, size_t);
 lean_object* l_HashMapImp_moveEntries___main___at_Lean_Meta_SynthInstance_newSubgoal___spec__4(lean_object*, lean_object*, lean_object*);
@@ -201,6 +211,7 @@ lean_object* l_Lean_Meta_SynthInstance_getNextToResume___boxed(lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_Meta_synthInstance_x3f___spec__2(lean_object*, size_t, lean_object*);
 lean_object* l_PersistentHashMap_insert___at_Lean_Meta_synthInstance_x3f___spec__4(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_resume___closed__7;
+lean_object* l_Lean_KVMap_getNat(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_synth___main___closed__1;
 lean_object* l_Array_iterateMAux___main___at_Lean_Meta_SynthInstance_consume___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_expr_update_proj(lean_object*, lean_object*);
@@ -228,9 +239,9 @@ lean_object* l_Lean_Meta_DiscrTree_getUnify___rarg(lean_object*, lean_object*, l
 lean_object* l_HashMapImp_find_x3f___at_Lean_Meta_SynthInstance_MkTableKey_normLevel___main___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_wakeUp___closed__2;
 lean_object* lean_level_update_imax(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_synthInstance(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_synthInstance(lean_object*, lean_object*, lean_object*);
 lean_object* l_HashMapImp_find_x3f___at_Lean_Meta_SynthInstance_MkTableKey_normExpr___main___spec__1___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_Meta_trySynthInstance(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_trySynthInstance(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_hasAssignableMVar(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_synth___main(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_back___at_Lean_Meta_SynthInstance_getTop___spec__1___boxed(lean_object*);
@@ -251,6 +262,7 @@ lean_object* l_Lean_Meta_mkFreshExprMVar(lean_object*, lean_object*, uint8_t, le
 lean_object* l_Lean_mkApp(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_newSubgoal___closed__2;
 uint8_t l_Lean_Expr_hasMVar(lean_object*);
+lean_object* l_Lean_Meta_SynthInstance_synth___main___closed__8;
 lean_object* l_Array_umapMAux___main___at_Lean_Meta_SynthInstance_getInstances___spec__2___closed__1;
 lean_object* l_List_foldlM___main___at___private_Init_Lean_Meta_SynthInstance_3__preprocessLevels___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_addContext___boxed(lean_object*, lean_object*, lean_object*);
@@ -263,6 +275,7 @@ lean_object* l_Lean_Meta_SynthInstance_getResult___boxed(lean_object*);
 lean_object* l___private_Init_Lean_Util_Trace_2__addNode___at_Lean_Meta_SynthInstance_tryResolve___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_umapMAux___main___at_Lean_Meta_SynthInstance_getInstances___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Meta_SynthInstance_5__preprocessOutParam___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* lean_register_option(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_synth___main___closed__2;
 lean_object* l_Lean_Meta_SynthInstance_tracer;
 lean_object* l_Lean_Meta_SynthInstance_mkTableKey(lean_object*, lean_object*);
@@ -294,11 +307,13 @@ lean_object* l_Lean_Meta_SynthInstance_mkTableKeyFor(lean_object*, lean_object*,
 lean_object* lean_array_pop(lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_MkTableKey_normLevel___main___closed__1;
 lean_object* lean_mk_array(lean_object*, lean_object*);
+lean_object* l_Lean_Meta_maxStepsOption___closed__1;
 lean_object* l_HashMapImp_moveEntries___main___at_Lean_Meta_SynthInstance_MkTableKey_normLevel___main___spec__6(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at_Lean_Meta_SynthInstance_addAnswer___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SynthInstance_tryResolveCore(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Meta_SynthInstance_MkTableKey_normLevel___main___spec__2___boxed(lean_object*, lean_object*);
 lean_object* l_HashMapImp_find_x3f___at_Lean_Meta_SynthInstance_MkTableKey_normExpr___main___spec__1(lean_object*, lean_object*);
+lean_object* l_Lean_Meta_maxStepsOption___closed__2;
 lean_object* l_Lean_Meta_SynthInstance_getInstances___closed__1;
 uint8_t l_Lean_MetavarContext_isExprAssignable(lean_object*, lean_object*);
 lean_object* l_Lean_MonadTracerAdapter_addTrace___at_Lean_Meta_isLevelDefEqAux___main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -347,6 +362,7 @@ lean_object* l_Lean_Meta_SynthInstance_resume___closed__1;
 lean_object* l_Lean_Meta_SynthInstance_wakeUp___closed__3;
 lean_object* l_AssocList_contains___main___at_Lean_Meta_SynthInstance_MkTableKey_normLevel___main___spec__4___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentArray_toArray___rarg(lean_object*);
+lean_object* l_Lean_Meta_maxStepsOption___closed__4;
 lean_object* l_Lean_Meta_SynthInstance_liftMeta(lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Meta_synthInstance_x3f___spec__5(lean_object*, size_t, size_t, lean_object*, lean_object*);
@@ -3705,7 +3721,7 @@ lean_object* _init_l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
+x_1 = l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 x_2 = l_Lean_Meta_Exception_toTraceMessageData___closed__72;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -17486,7 +17502,7 @@ lean_object* _init_l_Lean_Meta_SynthInstance_synth___main___closed__4() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("synthInstance is out of fuel");
+x_1 = lean_mk_string("remaining fuel ");
 return x_1;
 }
 }
@@ -17510,6 +17526,34 @@ lean_ctor_set(x_2, 0, x_1);
 return x_2;
 }
 }
+lean_object* _init_l_Lean_Meta_SynthInstance_synth___main___closed__7() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("synthInstance is out of fuel");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Meta_SynthInstance_synth___main___closed__8() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_SynthInstance_synth___main___closed__7;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Meta_SynthInstance_synth___main___closed__9() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_Meta_SynthInstance_synth___main___closed__8;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
 lean_object* l_Lean_Meta_SynthInstance_synth___main(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
@@ -17518,337 +17562,405 @@ x_4 = lean_unsigned_to_nat(0u);
 x_5 = lean_nat_dec_eq(x_1, x_4);
 if (x_5 == 0)
 {
-lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_62; lean_object* x_63; lean_object* x_73; lean_object* x_74; uint8_t x_75; 
 x_6 = lean_unsigned_to_nat(1u);
 x_7 = lean_nat_sub(x_1, x_6);
 lean_dec(x_1);
+x_73 = l_Lean_Meta_SynthInstance_getTraceState___rarg(x_3);
+x_74 = lean_ctor_get(x_73, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get_uint8(x_74, sizeof(void*)*1);
+lean_dec(x_74);
+if (x_75 == 0)
+{
+lean_object* x_76; uint8_t x_77; 
+x_76 = lean_ctor_get(x_73, 1);
+lean_inc(x_76);
+lean_dec(x_73);
+x_77 = 0;
+x_62 = x_77;
+x_63 = x_76;
+goto block_72;
+}
+else
+{
+lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; uint8_t x_83; 
+x_78 = lean_ctor_get(x_73, 1);
+lean_inc(x_78);
+lean_dec(x_73);
+x_79 = l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__1;
+x_80 = l___private_Init_Lean_Util_Trace_5__checkTraceOptionM___at_Lean_Meta_SynthInstance_newSubgoal___spec__7(x_79, x_2, x_78);
+x_81 = lean_ctor_get(x_80, 0);
+lean_inc(x_81);
+x_82 = lean_ctor_get(x_80, 1);
+lean_inc(x_82);
+lean_dec(x_80);
+x_83 = lean_unbox(x_81);
+lean_dec(x_81);
+x_62 = x_83;
+x_63 = x_82;
+goto block_72;
+}
+block_61:
+{
+lean_object* x_9; 
 lean_inc(x_2);
-x_8 = l_Lean_Meta_SynthInstance_step(x_2, x_3);
-if (lean_obj_tag(x_8) == 0)
+x_9 = l_Lean_Meta_SynthInstance_step(x_2, x_8);
+if (lean_obj_tag(x_9) == 0)
 {
-lean_object* x_9; uint8_t x_10; 
-x_9 = lean_ctor_get(x_8, 0);
-lean_inc(x_9);
-x_10 = lean_unbox(x_9);
-lean_dec(x_9);
-if (x_10 == 0)
+lean_object* x_10; uint8_t x_11; 
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+x_11 = lean_unbox(x_10);
+lean_dec(x_10);
+if (x_11 == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; uint8_t x_14; 
+lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
 lean_dec(x_7);
-x_11 = lean_ctor_get(x_8, 1);
-lean_inc(x_11);
-lean_dec(x_8);
-x_12 = l_Lean_Meta_SynthInstance_getTraceState___rarg(x_11);
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-x_14 = lean_ctor_get_uint8(x_13, sizeof(void*)*1);
-lean_dec(x_13);
-if (x_14 == 0)
-{
-uint8_t x_15; 
-lean_dec(x_2);
-x_15 = !lean_is_exclusive(x_12);
+x_12 = lean_ctor_get(x_9, 1);
+lean_inc(x_12);
+lean_dec(x_9);
+x_13 = l_Lean_Meta_SynthInstance_getTraceState___rarg(x_12);
+x_14 = lean_ctor_get(x_13, 0);
+lean_inc(x_14);
+x_15 = lean_ctor_get_uint8(x_14, sizeof(void*)*1);
+lean_dec(x_14);
 if (x_15 == 0)
 {
-lean_object* x_16; lean_object* x_17; 
-x_16 = lean_ctor_get(x_12, 0);
-lean_dec(x_16);
-x_17 = lean_box(0);
-lean_ctor_set(x_12, 0, x_17);
-return x_12;
-}
-else
-{
-lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_18 = lean_ctor_get(x_12, 1);
-lean_inc(x_18);
-lean_dec(x_12);
-x_19 = lean_box(0);
-x_20 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_20, 0, x_19);
-lean_ctor_set(x_20, 1, x_18);
-return x_20;
-}
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; 
-x_21 = lean_ctor_get(x_12, 1);
-lean_inc(x_21);
-lean_dec(x_12);
-x_22 = l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__1;
-x_23 = l___private_Init_Lean_Util_Trace_5__checkTraceOptionM___at_Lean_Meta_SynthInstance_newSubgoal___spec__7(x_22, x_2, x_21);
-x_24 = lean_ctor_get(x_23, 0);
-lean_inc(x_24);
-x_25 = lean_unbox(x_24);
-lean_dec(x_24);
-if (x_25 == 0)
-{
-uint8_t x_26; 
+uint8_t x_16; 
 lean_dec(x_2);
-x_26 = !lean_is_exclusive(x_23);
+x_16 = !lean_is_exclusive(x_13);
+if (x_16 == 0)
+{
+lean_object* x_17; lean_object* x_18; 
+x_17 = lean_ctor_get(x_13, 0);
+lean_dec(x_17);
+x_18 = lean_box(0);
+lean_ctor_set(x_13, 0, x_18);
+return x_13;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_13, 1);
+lean_inc(x_19);
+lean_dec(x_13);
+x_20 = lean_box(0);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_20);
+lean_ctor_set(x_21, 1, x_19);
+return x_21;
+}
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; uint8_t x_26; 
+x_22 = lean_ctor_get(x_13, 1);
+lean_inc(x_22);
+lean_dec(x_13);
+x_23 = l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__1;
+x_24 = l___private_Init_Lean_Util_Trace_5__checkTraceOptionM___at_Lean_Meta_SynthInstance_newSubgoal___spec__7(x_23, x_2, x_22);
+x_25 = lean_ctor_get(x_24, 0);
+lean_inc(x_25);
+x_26 = lean_unbox(x_25);
+lean_dec(x_25);
 if (x_26 == 0)
 {
-lean_object* x_27; lean_object* x_28; 
-x_27 = lean_ctor_get(x_23, 0);
-lean_dec(x_27);
-x_28 = lean_box(0);
-lean_ctor_set(x_23, 0, x_28);
-return x_23;
-}
-else
-{
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_23, 1);
-lean_inc(x_29);
-lean_dec(x_23);
-x_30 = lean_box(0);
-x_31 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_31, 0, x_30);
-lean_ctor_set(x_31, 1, x_29);
-return x_31;
-}
-}
-else
-{
-lean_object* x_32; lean_object* x_33; lean_object* x_34; uint8_t x_35; 
-x_32 = lean_ctor_get(x_23, 1);
-lean_inc(x_32);
-lean_dec(x_23);
-x_33 = l_Lean_Meta_SynthInstance_synth___main___closed__3;
-x_34 = l_Lean_MonadTracerAdapter_addTrace___at_Lean_Meta_SynthInstance_newSubgoal___spec__8(x_22, x_33, x_2, x_32);
+uint8_t x_27; 
 lean_dec(x_2);
-x_35 = !lean_is_exclusive(x_34);
-if (x_35 == 0)
+x_27 = !lean_is_exclusive(x_24);
+if (x_27 == 0)
 {
-lean_object* x_36; lean_object* x_37; 
-x_36 = lean_ctor_get(x_34, 0);
-lean_dec(x_36);
-x_37 = lean_box(0);
-lean_ctor_set(x_34, 0, x_37);
-return x_34;
+lean_object* x_28; lean_object* x_29; 
+x_28 = lean_ctor_get(x_24, 0);
+lean_dec(x_28);
+x_29 = lean_box(0);
+lean_ctor_set(x_24, 0, x_29);
+return x_24;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_34, 1);
-lean_inc(x_38);
-lean_dec(x_34);
-x_39 = lean_box(0);
-x_40 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_40, 0, x_39);
-lean_ctor_set(x_40, 1, x_38);
-return x_40;
+lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_30 = lean_ctor_get(x_24, 1);
+lean_inc(x_30);
+lean_dec(x_24);
+x_31 = lean_box(0);
+x_32 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_32, 0, x_31);
+lean_ctor_set(x_32, 1, x_30);
+return x_32;
+}
+}
+else
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; 
+x_33 = lean_ctor_get(x_24, 1);
+lean_inc(x_33);
+lean_dec(x_24);
+x_34 = l_Lean_Meta_SynthInstance_synth___main___closed__3;
+x_35 = l_Lean_MonadTracerAdapter_addTrace___at_Lean_Meta_SynthInstance_newSubgoal___spec__8(x_23, x_34, x_2, x_33);
+lean_dec(x_2);
+x_36 = !lean_is_exclusive(x_35);
+if (x_36 == 0)
+{
+lean_object* x_37; lean_object* x_38; 
+x_37 = lean_ctor_get(x_35, 0);
+lean_dec(x_37);
+x_38 = lean_box(0);
+lean_ctor_set(x_35, 0, x_38);
+return x_35;
+}
+else
+{
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_35, 1);
+lean_inc(x_39);
+lean_dec(x_35);
+x_40 = lean_box(0);
+x_41 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_41, 0, x_40);
+lean_ctor_set(x_41, 1, x_39);
+return x_41;
 }
 }
 }
 }
 else
 {
-lean_object* x_41; lean_object* x_42; lean_object* x_43; 
-x_41 = lean_ctor_get(x_8, 1);
-lean_inc(x_41);
-lean_dec(x_8);
-x_42 = l_Lean_Meta_SynthInstance_getResult___rarg(x_41);
-x_43 = lean_ctor_get(x_42, 0);
-lean_inc(x_43);
-if (lean_obj_tag(x_43) == 0)
-{
-lean_object* x_44; 
-x_44 = lean_ctor_get(x_42, 1);
+lean_object* x_42; lean_object* x_43; lean_object* x_44; 
+x_42 = lean_ctor_get(x_9, 1);
+lean_inc(x_42);
+lean_dec(x_9);
+x_43 = l_Lean_Meta_SynthInstance_getResult___rarg(x_42);
+x_44 = lean_ctor_get(x_43, 0);
 lean_inc(x_44);
-lean_dec(x_42);
+if (lean_obj_tag(x_44) == 0)
+{
+lean_object* x_45; 
+x_45 = lean_ctor_get(x_43, 1);
+lean_inc(x_45);
+lean_dec(x_43);
 x_1 = x_7;
-x_3 = x_44;
+x_3 = x_45;
 goto _start;
 }
 else
 {
-uint8_t x_46; 
+uint8_t x_47; 
 lean_dec(x_7);
 lean_dec(x_2);
-x_46 = !lean_is_exclusive(x_42);
-if (x_46 == 0)
+x_47 = !lean_is_exclusive(x_43);
+if (x_47 == 0)
 {
-lean_object* x_47; uint8_t x_48; 
-x_47 = lean_ctor_get(x_42, 0);
-lean_dec(x_47);
-x_48 = !lean_is_exclusive(x_43);
-if (x_48 == 0)
+lean_object* x_48; uint8_t x_49; 
+x_48 = lean_ctor_get(x_43, 0);
+lean_dec(x_48);
+x_49 = !lean_is_exclusive(x_44);
+if (x_49 == 0)
 {
-return x_42;
+return x_43;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; 
-x_49 = lean_ctor_get(x_43, 0);
-lean_inc(x_49);
-lean_dec(x_43);
-x_50 = lean_alloc_ctor(1, 1, 0);
-lean_ctor_set(x_50, 0, x_49);
-lean_ctor_set(x_42, 0, x_50);
-return x_42;
+lean_object* x_50; lean_object* x_51; 
+x_50 = lean_ctor_get(x_44, 0);
+lean_inc(x_50);
+lean_dec(x_44);
+x_51 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_51, 0, x_50);
+lean_ctor_set(x_43, 0, x_51);
+return x_43;
 }
 }
 else
 {
-lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; 
-x_51 = lean_ctor_get(x_42, 1);
-lean_inc(x_51);
-lean_dec(x_42);
-x_52 = lean_ctor_get(x_43, 0);
+lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_52 = lean_ctor_get(x_43, 1);
 lean_inc(x_52);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- x_53 = x_43;
+lean_dec(x_43);
+x_53 = lean_ctor_get(x_44, 0);
+lean_inc(x_53);
+if (lean_is_exclusive(x_44)) {
+ lean_ctor_release(x_44, 0);
+ x_54 = x_44;
 } else {
- lean_dec_ref(x_43);
- x_53 = lean_box(0);
+ lean_dec_ref(x_44);
+ x_54 = lean_box(0);
 }
-if (lean_is_scalar(x_53)) {
- x_54 = lean_alloc_ctor(1, 1, 0);
+if (lean_is_scalar(x_54)) {
+ x_55 = lean_alloc_ctor(1, 1, 0);
 } else {
- x_54 = x_53;
+ x_55 = x_54;
 }
-lean_ctor_set(x_54, 0, x_52);
-x_55 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_55, 0, x_54);
-lean_ctor_set(x_55, 1, x_51);
-return x_55;
+lean_ctor_set(x_55, 0, x_53);
+x_56 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_56, 0, x_55);
+lean_ctor_set(x_56, 1, x_52);
+return x_56;
 }
 }
 }
 }
 else
 {
-uint8_t x_56; 
+uint8_t x_57; 
 lean_dec(x_7);
 lean_dec(x_2);
-x_56 = !lean_is_exclusive(x_8);
-if (x_56 == 0)
+x_57 = !lean_is_exclusive(x_9);
+if (x_57 == 0)
 {
-return x_8;
+return x_9;
 }
 else
 {
-lean_object* x_57; lean_object* x_58; lean_object* x_59; 
-x_57 = lean_ctor_get(x_8, 0);
-x_58 = lean_ctor_get(x_8, 1);
+lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_58 = lean_ctor_get(x_9, 0);
+x_59 = lean_ctor_get(x_9, 1);
+lean_inc(x_59);
 lean_inc(x_58);
-lean_inc(x_57);
-lean_dec(x_8);
-x_59 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_59, 0, x_57);
-lean_ctor_set(x_59, 1, x_58);
-return x_59;
-}
-}
-}
-else
-{
-lean_object* x_60; lean_object* x_61; uint8_t x_62; 
-lean_dec(x_1);
-x_60 = l_Lean_Meta_SynthInstance_getTraceState___rarg(x_3);
-x_61 = lean_ctor_get(x_60, 0);
-lean_inc(x_61);
-x_62 = lean_ctor_get_uint8(x_61, sizeof(void*)*1);
-lean_dec(x_61);
-if (x_62 == 0)
-{
-uint8_t x_63; 
-lean_dec(x_2);
-x_63 = !lean_is_exclusive(x_60);
-if (x_63 == 0)
-{
-lean_object* x_64; lean_object* x_65; 
-x_64 = lean_ctor_get(x_60, 0);
-lean_dec(x_64);
-x_65 = lean_box(0);
-lean_ctor_set(x_60, 0, x_65);
+lean_dec(x_9);
+x_60 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_60, 0, x_58);
+lean_ctor_set(x_60, 1, x_59);
 return x_60;
 }
+}
+}
+block_72:
+{
+if (x_62 == 0)
+{
+x_8 = x_63;
+goto block_61;
+}
 else
 {
-lean_object* x_66; lean_object* x_67; lean_object* x_68; 
-x_66 = lean_ctor_get(x_60, 1);
-lean_inc(x_66);
-lean_dec(x_60);
-x_67 = lean_box(0);
-x_68 = lean_alloc_ctor(0, 2, 0);
+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_inc(x_7);
+x_64 = l_Nat_repr(x_7);
+x_65 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_65, 0, x_64);
+x_66 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_66, 0, x_65);
+x_67 = l_Lean_Meta_SynthInstance_synth___main___closed__6;
+x_68 = lean_alloc_ctor(8, 2, 0);
 lean_ctor_set(x_68, 0, x_67);
 lean_ctor_set(x_68, 1, x_66);
-return x_68;
+x_69 = l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__1;
+x_70 = l_Lean_MonadTracerAdapter_addTrace___at_Lean_Meta_SynthInstance_newSubgoal___spec__8(x_69, x_68, x_2, x_63);
+x_71 = lean_ctor_get(x_70, 1);
+lean_inc(x_71);
+lean_dec(x_70);
+x_8 = x_71;
+goto block_61;
+}
 }
 }
 else
 {
-lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; uint8_t x_73; 
-x_69 = lean_ctor_get(x_60, 1);
-lean_inc(x_69);
-lean_dec(x_60);
-x_70 = l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__1;
-x_71 = l___private_Init_Lean_Util_Trace_5__checkTraceOptionM___at_Lean_Meta_SynthInstance_newSubgoal___spec__7(x_70, x_2, x_69);
-x_72 = lean_ctor_get(x_71, 0);
-lean_inc(x_72);
-x_73 = lean_unbox(x_72);
-lean_dec(x_72);
-if (x_73 == 0)
+lean_object* x_84; lean_object* x_85; uint8_t x_86; 
+lean_dec(x_1);
+x_84 = l_Lean_Meta_SynthInstance_getTraceState___rarg(x_3);
+x_85 = lean_ctor_get(x_84, 0);
+lean_inc(x_85);
+x_86 = lean_ctor_get_uint8(x_85, sizeof(void*)*1);
+lean_dec(x_85);
+if (x_86 == 0)
 {
-uint8_t x_74; 
+uint8_t x_87; 
 lean_dec(x_2);
-x_74 = !lean_is_exclusive(x_71);
-if (x_74 == 0)
+x_87 = !lean_is_exclusive(x_84);
+if (x_87 == 0)
 {
-lean_object* x_75; lean_object* x_76; 
-x_75 = lean_ctor_get(x_71, 0);
-lean_dec(x_75);
-x_76 = lean_box(0);
-lean_ctor_set(x_71, 0, x_76);
-return x_71;
+lean_object* x_88; lean_object* x_89; 
+x_88 = lean_ctor_get(x_84, 0);
+lean_dec(x_88);
+x_89 = lean_box(0);
+lean_ctor_set(x_84, 0, x_89);
+return x_84;
 }
 else
 {
-lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_77 = lean_ctor_get(x_71, 1);
-lean_inc(x_77);
-lean_dec(x_71);
-x_78 = lean_box(0);
-x_79 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_79, 0, x_78);
-lean_ctor_set(x_79, 1, x_77);
-return x_79;
-}
-}
-else
-{
-lean_object* x_80; lean_object* x_81; lean_object* x_82; uint8_t x_83; 
-x_80 = lean_ctor_get(x_71, 1);
-lean_inc(x_80);
-lean_dec(x_71);
-x_81 = l_Lean_Meta_SynthInstance_synth___main___closed__6;
-x_82 = l_Lean_MonadTracerAdapter_addTrace___at_Lean_Meta_SynthInstance_newSubgoal___spec__8(x_70, x_81, x_2, x_80);
-lean_dec(x_2);
-x_83 = !lean_is_exclusive(x_82);
-if (x_83 == 0)
-{
-lean_object* x_84; lean_object* x_85; 
-x_84 = lean_ctor_get(x_82, 0);
+lean_object* x_90; lean_object* x_91; lean_object* x_92; 
+x_90 = lean_ctor_get(x_84, 1);
+lean_inc(x_90);
 lean_dec(x_84);
-x_85 = lean_box(0);
-lean_ctor_set(x_82, 0, x_85);
-return x_82;
+x_91 = lean_box(0);
+x_92 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_92, 0, x_91);
+lean_ctor_set(x_92, 1, x_90);
+return x_92;
+}
 }
 else
 {
-lean_object* x_86; lean_object* x_87; lean_object* x_88; 
-x_86 = lean_ctor_get(x_82, 1);
-lean_inc(x_86);
-lean_dec(x_82);
-x_87 = lean_box(0);
-x_88 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_88, 0, x_87);
-lean_ctor_set(x_88, 1, x_86);
-return x_88;
+lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; uint8_t x_97; 
+x_93 = lean_ctor_get(x_84, 1);
+lean_inc(x_93);
+lean_dec(x_84);
+x_94 = l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__1;
+x_95 = l___private_Init_Lean_Util_Trace_5__checkTraceOptionM___at_Lean_Meta_SynthInstance_newSubgoal___spec__7(x_94, x_2, x_93);
+x_96 = lean_ctor_get(x_95, 0);
+lean_inc(x_96);
+x_97 = lean_unbox(x_96);
+lean_dec(x_96);
+if (x_97 == 0)
+{
+uint8_t x_98; 
+lean_dec(x_2);
+x_98 = !lean_is_exclusive(x_95);
+if (x_98 == 0)
+{
+lean_object* x_99; lean_object* x_100; 
+x_99 = lean_ctor_get(x_95, 0);
+lean_dec(x_99);
+x_100 = lean_box(0);
+lean_ctor_set(x_95, 0, x_100);
+return x_95;
+}
+else
+{
+lean_object* x_101; lean_object* x_102; lean_object* x_103; 
+x_101 = lean_ctor_get(x_95, 1);
+lean_inc(x_101);
+lean_dec(x_95);
+x_102 = lean_box(0);
+x_103 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_103, 0, x_102);
+lean_ctor_set(x_103, 1, x_101);
+return x_103;
+}
+}
+else
+{
+lean_object* x_104; lean_object* x_105; lean_object* x_106; uint8_t x_107; 
+x_104 = lean_ctor_get(x_95, 1);
+lean_inc(x_104);
+lean_dec(x_95);
+x_105 = l_Lean_Meta_SynthInstance_synth___main___closed__9;
+x_106 = l_Lean_MonadTracerAdapter_addTrace___at_Lean_Meta_SynthInstance_newSubgoal___spec__8(x_94, x_105, x_2, x_104);
+lean_dec(x_2);
+x_107 = !lean_is_exclusive(x_106);
+if (x_107 == 0)
+{
+lean_object* x_108; lean_object* x_109; 
+x_108 = lean_ctor_get(x_106, 0);
+lean_dec(x_108);
+x_109 = lean_box(0);
+lean_ctor_set(x_106, 0, x_109);
+return x_106;
+}
+else
+{
+lean_object* x_110; lean_object* x_111; lean_object* x_112; 
+x_110 = lean_ctor_get(x_106, 1);
+lean_inc(x_110);
+lean_dec(x_106);
+x_111 = lean_box(0);
+x_112 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_112, 0, x_111);
+lean_ctor_set(x_112, 1, x_110);
+return x_112;
 }
 }
 }
@@ -20032,6 +20144,85 @@ lean_dec(x_5);
 return x_9;
 }
 }
+lean_object* _init_l_Lean_Meta_maxStepsOption___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("maxSteps");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Meta_maxStepsOption___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_Meta_Exception_toTraceMessageData___closed__73;
+x_2 = l_Lean_Meta_maxStepsOption___closed__1;
+x_3 = lean_name_mk_string(x_1, x_2);
+return x_3;
+}
+}
+lean_object* _init_l_Lean_Meta_maxStepsOption___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(10000u);
+x_2 = lean_alloc_ctor(3, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* _init_l_Lean_Meta_maxStepsOption___closed__4() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("maximum steps for the type class instance synthesis procedure");
+return x_1;
+}
+}
+lean_object* _init_l_Lean_Meta_maxStepsOption___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_1 = l_Lean_Meta_maxStepsOption___closed__3;
+x_2 = l_String_splitAux___main___closed__1;
+x_3 = l_Lean_Meta_maxStepsOption___closed__4;
+x_4 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_4, 0, x_1);
+lean_ctor_set(x_4, 1, x_2);
+lean_ctor_set(x_4, 2, x_3);
+return x_4;
+}
+}
+lean_object* l_Lean_Meta_maxStepsOption(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_2 = l_Lean_Meta_maxStepsOption___closed__2;
+x_3 = l_Lean_Meta_maxStepsOption___closed__5;
+x_4 = lean_register_option(x_2, x_3, x_1);
+return x_4;
+}
+}
+lean_object* l___private_Init_Lean_Meta_SynthInstance_6__getMaxSteps(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_2 = l_Lean_Meta_maxStepsOption___closed__2;
+x_3 = lean_unsigned_to_nat(10000u);
+x_4 = l_Lean_KVMap_getNat(x_1, x_2, x_3);
+return x_4;
+}
+}
+lean_object* l___private_Init_Lean_Meta_SynthInstance_6__getMaxSteps___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l___private_Init_Lean_Meta_SynthInstance_6__getMaxSteps(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Meta_synthInstance_x3f___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
@@ -20643,38 +20834,39 @@ return x_19;
 }
 }
 }
-lean_object* l_Lean_Meta_synthInstance_x3f(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_Meta_synthInstance_x3f(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-uint8_t x_5; 
-x_5 = !lean_is_exclusive(x_3);
-if (x_5 == 0)
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_2);
+if (x_4 == 0)
 {
-lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; uint8_t x_13; uint8_t x_14; uint8_t 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; 
-x_6 = lean_ctor_get(x_3, 0);
-x_7 = lean_ctor_get(x_3, 1);
-x_8 = lean_ctor_get(x_3, 2);
-x_9 = lean_ctor_get(x_6, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get_uint8(x_6, sizeof(void*)*1 + 2);
-x_11 = lean_ctor_get_uint8(x_6, sizeof(void*)*1 + 3);
-x_12 = lean_ctor_get_uint8(x_6, sizeof(void*)*1 + 4);
-x_13 = lean_ctor_get_uint8(x_6, sizeof(void*)*1 + 5);
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; uint8_t x_10; uint8_t x_11; uint8_t x_12; lean_object* x_13; uint8_t x_14; uint8_t 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; 
+x_5 = lean_ctor_get(x_2, 0);
+x_6 = lean_ctor_get(x_2, 1);
+x_7 = lean_ctor_get(x_2, 2);
+x_8 = lean_ctor_get(x_5, 0);
+lean_inc(x_8);
+x_9 = lean_ctor_get_uint8(x_5, sizeof(void*)*1 + 2);
+x_10 = lean_ctor_get_uint8(x_5, sizeof(void*)*1 + 3);
+x_11 = lean_ctor_get_uint8(x_5, sizeof(void*)*1 + 4);
+x_12 = lean_ctor_get_uint8(x_5, sizeof(void*)*1 + 5);
+x_13 = l___private_Init_Lean_Meta_SynthInstance_6__getMaxSteps(x_8);
 x_14 = 1;
 x_15 = 2;
 x_16 = lean_alloc_ctor(0, 1, 7);
-lean_ctor_set(x_16, 0, x_9);
+lean_ctor_set(x_16, 0, x_8);
 lean_ctor_set_uint8(x_16, sizeof(void*)*1, x_14);
 lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 1, x_14);
-lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 2, x_10);
-lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 3, x_11);
-lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 4, x_12);
-lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 5, x_13);
+lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 2, x_9);
+lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 3, x_10);
+lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 4, x_11);
+lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 5, x_12);
 lean_ctor_set_uint8(x_16, sizeof(void*)*1 + 6, x_15);
-lean_inc(x_8);
 lean_inc(x_7);
-lean_ctor_set(x_3, 0, x_16);
-x_17 = l_Lean_Meta_instantiateMVars(x_1, x_3, x_4);
+lean_inc(x_6);
+lean_ctor_set(x_2, 0, x_16);
+x_17 = l_Lean_Meta_instantiateMVars(x_1, x_2, x_3);
 x_18 = lean_ctor_get(x_17, 0);
 lean_inc(x_18);
 x_19 = lean_ctor_get(x_17, 1);
@@ -20688,8 +20880,8 @@ if (lean_is_exclusive(x_17)) {
  x_20 = lean_box(0);
 }
 x_21 = l___private_Init_Lean_Meta_SynthInstance_2__preprocess___closed__1;
-lean_inc(x_3);
-x_22 = l_Lean_Meta_forallTelescopeReducing___rarg(x_18, x_21, x_3, x_19);
+lean_inc(x_2);
+x_22 = l_Lean_Meta_forallTelescopeReducing___rarg(x_18, x_21, x_2, x_19);
 if (lean_obj_tag(x_22) == 0)
 {
 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; 
@@ -20744,9 +20936,9 @@ lean_ctor_set(x_89, 2, x_28);
 lean_ctor_set(x_89, 3, x_29);
 lean_ctor_set(x_89, 4, x_30);
 lean_ctor_set(x_89, 5, x_31);
-lean_inc(x_3);
+lean_inc(x_2);
 lean_inc(x_24);
-x_90 = l___private_Init_Lean_Meta_SynthInstance_5__preprocessOutParam(x_24, x_3, x_89);
+x_90 = l___private_Init_Lean_Meta_SynthInstance_5__preprocessOutParam(x_24, x_2, x_89);
 if (lean_obj_tag(x_90) == 0)
 {
 lean_object* x_91; lean_object* x_92; lean_object* x_93; 
@@ -20755,8 +20947,8 @@ lean_inc(x_91);
 x_92 = lean_ctor_get(x_90, 1);
 lean_inc(x_92);
 lean_dec(x_90);
-lean_inc(x_3);
-x_93 = l_Lean_Meta_SynthInstance_main(x_91, x_2, x_3, x_92);
+lean_inc(x_2);
+x_93 = l_Lean_Meta_SynthInstance_main(x_91, x_13, x_2, x_92);
 if (lean_obj_tag(x_93) == 0)
 {
 lean_object* x_94; 
@@ -20766,10 +20958,10 @@ if (lean_obj_tag(x_94) == 0)
 {
 lean_object* x_95; 
 lean_dec(x_20);
-lean_dec(x_3);
-lean_dec(x_8);
+lean_dec(x_2);
 lean_dec(x_7);
 lean_dec(x_6);
+lean_dec(x_5);
 x_95 = lean_ctor_get(x_93, 1);
 lean_inc(x_95);
 lean_dec(x_93);
@@ -20788,9 +20980,9 @@ if (x_97 == 0)
 {
 lean_object* x_98; lean_object* x_99; 
 x_98 = lean_ctor_get(x_94, 0);
-lean_inc(x_3);
+lean_inc(x_2);
 lean_inc(x_98);
-x_99 = l_Lean_Meta_inferType(x_98, x_3, x_96);
+x_99 = l_Lean_Meta_inferType(x_98, x_2, x_96);
 if (lean_obj_tag(x_99) == 0)
 {
 lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; 
@@ -20800,9 +20992,9 @@ x_101 = lean_ctor_get(x_99, 1);
 lean_inc(x_101);
 lean_dec(x_99);
 x_102 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_102, 0, x_6);
-lean_ctor_set(x_102, 1, x_7);
-lean_ctor_set(x_102, 2, x_8);
+lean_ctor_set(x_102, 0, x_5);
+lean_ctor_set(x_102, 1, x_6);
+lean_ctor_set(x_102, 2, x_7);
 lean_inc(x_24);
 x_103 = l_Lean_Meta_isExprDefEq(x_24, x_100, x_102, x_101);
 if (lean_obj_tag(x_103) == 0)
@@ -20818,7 +21010,7 @@ if (x_105 == 0)
 lean_object* x_106; lean_object* x_107; 
 lean_free_object(x_94);
 lean_dec(x_98);
-lean_dec(x_3);
+lean_dec(x_2);
 x_106 = lean_ctor_get(x_103, 1);
 lean_inc(x_106);
 lean_dec(x_103);
@@ -20833,14 +21025,14 @@ lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111;
 x_108 = lean_ctor_get(x_103, 1);
 lean_inc(x_108);
 lean_dec(x_103);
-x_109 = l_Lean_Meta_instantiateMVars(x_98, x_3, x_108);
+x_109 = l_Lean_Meta_instantiateMVars(x_98, x_2, x_108);
 x_110 = lean_ctor_get(x_109, 0);
 lean_inc(x_110);
 x_111 = lean_ctor_get(x_109, 1);
 lean_inc(x_111);
 lean_dec(x_109);
-x_112 = l_Lean_Meta_hasAssignableMVar(x_110, x_3, x_111);
-lean_dec(x_3);
+x_112 = l_Lean_Meta_hasAssignableMVar(x_110, x_2, x_111);
+lean_dec(x_2);
 x_113 = lean_ctor_get(x_112, 0);
 lean_inc(x_113);
 x_114 = lean_unbox(x_113);
@@ -20879,7 +21071,7 @@ lean_dec(x_98);
 lean_dec(x_34);
 lean_dec(x_25);
 lean_dec(x_24);
-lean_dec(x_3);
+lean_dec(x_2);
 x_118 = lean_ctor_get(x_103, 0);
 lean_inc(x_118);
 x_119 = lean_ctor_get(x_103, 1);
@@ -20898,10 +21090,10 @@ lean_dec(x_98);
 lean_dec(x_34);
 lean_dec(x_25);
 lean_dec(x_24);
-lean_dec(x_3);
-lean_dec(x_8);
+lean_dec(x_2);
 lean_dec(x_7);
 lean_dec(x_6);
+lean_dec(x_5);
 x_120 = lean_ctor_get(x_99, 0);
 lean_inc(x_120);
 x_121 = lean_ctor_get(x_99, 1);
@@ -20918,9 +21110,9 @@ lean_object* x_122; lean_object* x_123;
 x_122 = lean_ctor_get(x_94, 0);
 lean_inc(x_122);
 lean_dec(x_94);
-lean_inc(x_3);
+lean_inc(x_2);
 lean_inc(x_122);
-x_123 = l_Lean_Meta_inferType(x_122, x_3, x_96);
+x_123 = l_Lean_Meta_inferType(x_122, x_2, x_96);
 if (lean_obj_tag(x_123) == 0)
 {
 lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; 
@@ -20930,9 +21122,9 @@ x_125 = lean_ctor_get(x_123, 1);
 lean_inc(x_125);
 lean_dec(x_123);
 x_126 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_126, 0, x_6);
-lean_ctor_set(x_126, 1, x_7);
-lean_ctor_set(x_126, 2, x_8);
+lean_ctor_set(x_126, 0, x_5);
+lean_ctor_set(x_126, 1, x_6);
+lean_ctor_set(x_126, 2, x_7);
 lean_inc(x_24);
 x_127 = l_Lean_Meta_isExprDefEq(x_24, x_124, x_126, x_125);
 if (lean_obj_tag(x_127) == 0)
@@ -20947,7 +21139,7 @@ if (x_129 == 0)
 {
 lean_object* x_130; lean_object* x_131; 
 lean_dec(x_122);
-lean_dec(x_3);
+lean_dec(x_2);
 x_130 = lean_ctor_get(x_127, 1);
 lean_inc(x_130);
 lean_dec(x_127);
@@ -20962,14 +21154,14 @@ lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135;
 x_132 = lean_ctor_get(x_127, 1);
 lean_inc(x_132);
 lean_dec(x_127);
-x_133 = l_Lean_Meta_instantiateMVars(x_122, x_3, x_132);
+x_133 = l_Lean_Meta_instantiateMVars(x_122, x_2, x_132);
 x_134 = lean_ctor_get(x_133, 0);
 lean_inc(x_134);
 x_135 = lean_ctor_get(x_133, 1);
 lean_inc(x_135);
 lean_dec(x_133);
-x_136 = l_Lean_Meta_hasAssignableMVar(x_134, x_3, x_135);
-lean_dec(x_3);
+x_136 = l_Lean_Meta_hasAssignableMVar(x_134, x_2, x_135);
+lean_dec(x_2);
 x_137 = lean_ctor_get(x_136, 0);
 lean_inc(x_137);
 x_138 = lean_unbox(x_137);
@@ -21007,7 +21199,7 @@ lean_dec(x_122);
 lean_dec(x_34);
 lean_dec(x_25);
 lean_dec(x_24);
-lean_dec(x_3);
+lean_dec(x_2);
 x_143 = lean_ctor_get(x_127, 0);
 lean_inc(x_143);
 x_144 = lean_ctor_get(x_127, 1);
@@ -21025,10 +21217,10 @@ lean_dec(x_122);
 lean_dec(x_34);
 lean_dec(x_25);
 lean_dec(x_24);
-lean_dec(x_3);
-lean_dec(x_8);
+lean_dec(x_2);
 lean_dec(x_7);
 lean_dec(x_6);
+lean_dec(x_5);
 x_145 = lean_ctor_get(x_123, 0);
 lean_inc(x_145);
 x_146 = lean_ctor_get(x_123, 1);
@@ -21047,10 +21239,10 @@ lean_object* x_147; lean_object* x_148;
 lean_dec(x_34);
 lean_dec(x_25);
 lean_dec(x_24);
-lean_dec(x_3);
-lean_dec(x_8);
+lean_dec(x_2);
 lean_dec(x_7);
 lean_dec(x_6);
+lean_dec(x_5);
 x_147 = lean_ctor_get(x_93, 0);
 lean_inc(x_147);
 x_148 = lean_ctor_get(x_93, 1);
@@ -21067,11 +21259,11 @@ lean_object* x_149; lean_object* x_150;
 lean_dec(x_34);
 lean_dec(x_25);
 lean_dec(x_24);
-lean_dec(x_3);
-lean_dec(x_8);
+lean_dec(x_2);
+lean_dec(x_13);
 lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_2);
+lean_dec(x_5);
 x_149 = lean_ctor_get(x_90, 0);
 lean_inc(x_149);
 x_150 = lean_ctor_get(x_90, 1);
@@ -21356,11 +21548,11 @@ lean_dec(x_27);
 lean_dec(x_26);
 lean_dec(x_24);
 lean_dec(x_20);
-lean_dec(x_3);
-lean_dec(x_8);
+lean_dec(x_2);
+lean_dec(x_13);
 lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_2);
+lean_dec(x_5);
 x_151 = lean_ctor_get(x_33, 0);
 lean_inc(x_151);
 lean_dec(x_33);
@@ -21378,11 +21570,11 @@ else
 {
 uint8_t x_153; 
 lean_dec(x_20);
-lean_dec(x_3);
-lean_dec(x_8);
+lean_dec(x_2);
+lean_dec(x_13);
 lean_dec(x_7);
 lean_dec(x_6);
-lean_dec(x_2);
+lean_dec(x_5);
 x_153 = !lean_is_exclusive(x_22);
 if (x_153 == 0)
 {
@@ -21405,543 +21597,544 @@ return x_156;
 }
 else
 {
-lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; uint8_t x_161; uint8_t x_162; uint8_t x_163; uint8_t x_164; uint8_t x_165; uint8_t x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; 
-x_157 = lean_ctor_get(x_3, 0);
-x_158 = lean_ctor_get(x_3, 1);
-x_159 = lean_ctor_get(x_3, 2);
+lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; uint8_t x_161; uint8_t x_162; uint8_t x_163; uint8_t x_164; lean_object* x_165; uint8_t x_166; uint8_t x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; 
+x_157 = lean_ctor_get(x_2, 0);
+x_158 = lean_ctor_get(x_2, 1);
+x_159 = lean_ctor_get(x_2, 2);
 lean_inc(x_159);
 lean_inc(x_158);
 lean_inc(x_157);
-lean_dec(x_3);
+lean_dec(x_2);
 x_160 = lean_ctor_get(x_157, 0);
 lean_inc(x_160);
 x_161 = lean_ctor_get_uint8(x_157, sizeof(void*)*1 + 2);
 x_162 = lean_ctor_get_uint8(x_157, sizeof(void*)*1 + 3);
 x_163 = lean_ctor_get_uint8(x_157, sizeof(void*)*1 + 4);
 x_164 = lean_ctor_get_uint8(x_157, sizeof(void*)*1 + 5);
-x_165 = 1;
-x_166 = 2;
-x_167 = lean_alloc_ctor(0, 1, 7);
-lean_ctor_set(x_167, 0, x_160);
-lean_ctor_set_uint8(x_167, sizeof(void*)*1, x_165);
-lean_ctor_set_uint8(x_167, sizeof(void*)*1 + 1, x_165);
-lean_ctor_set_uint8(x_167, sizeof(void*)*1 + 2, x_161);
-lean_ctor_set_uint8(x_167, sizeof(void*)*1 + 3, x_162);
-lean_ctor_set_uint8(x_167, sizeof(void*)*1 + 4, x_163);
-lean_ctor_set_uint8(x_167, sizeof(void*)*1 + 5, x_164);
-lean_ctor_set_uint8(x_167, sizeof(void*)*1 + 6, x_166);
+x_165 = l___private_Init_Lean_Meta_SynthInstance_6__getMaxSteps(x_160);
+x_166 = 1;
+x_167 = 2;
+x_168 = lean_alloc_ctor(0, 1, 7);
+lean_ctor_set(x_168, 0, x_160);
+lean_ctor_set_uint8(x_168, sizeof(void*)*1, x_166);
+lean_ctor_set_uint8(x_168, sizeof(void*)*1 + 1, x_166);
+lean_ctor_set_uint8(x_168, sizeof(void*)*1 + 2, x_161);
+lean_ctor_set_uint8(x_168, sizeof(void*)*1 + 3, x_162);
+lean_ctor_set_uint8(x_168, sizeof(void*)*1 + 4, x_163);
+lean_ctor_set_uint8(x_168, sizeof(void*)*1 + 5, x_164);
+lean_ctor_set_uint8(x_168, sizeof(void*)*1 + 6, x_167);
 lean_inc(x_159);
 lean_inc(x_158);
-x_168 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_168, 0, x_167);
-lean_ctor_set(x_168, 1, x_158);
-lean_ctor_set(x_168, 2, x_159);
-x_169 = l_Lean_Meta_instantiateMVars(x_1, x_168, x_4);
-x_170 = lean_ctor_get(x_169, 0);
-lean_inc(x_170);
-x_171 = lean_ctor_get(x_169, 1);
+x_169 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_169, 0, x_168);
+lean_ctor_set(x_169, 1, x_158);
+lean_ctor_set(x_169, 2, x_159);
+x_170 = l_Lean_Meta_instantiateMVars(x_1, x_169, x_3);
+x_171 = lean_ctor_get(x_170, 0);
 lean_inc(x_171);
-if (lean_is_exclusive(x_169)) {
- lean_ctor_release(x_169, 0);
- lean_ctor_release(x_169, 1);
- x_172 = x_169;
+x_172 = lean_ctor_get(x_170, 1);
+lean_inc(x_172);
+if (lean_is_exclusive(x_170)) {
+ lean_ctor_release(x_170, 0);
+ lean_ctor_release(x_170, 1);
+ x_173 = x_170;
 } else {
- lean_dec_ref(x_169);
- x_172 = lean_box(0);
+ lean_dec_ref(x_170);
+ x_173 = lean_box(0);
 }
-x_173 = l___private_Init_Lean_Meta_SynthInstance_2__preprocess___closed__1;
-lean_inc(x_168);
-x_174 = l_Lean_Meta_forallTelescopeReducing___rarg(x_170, x_173, x_168, x_171);
-if (lean_obj_tag(x_174) == 0)
+x_174 = l___private_Init_Lean_Meta_SynthInstance_2__preprocess___closed__1;
+lean_inc(x_169);
+x_175 = l_Lean_Meta_forallTelescopeReducing___rarg(x_171, x_174, x_169, x_172);
+if (lean_obj_tag(x_175) == 0)
 {
-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_183; lean_object* x_184; lean_object* x_185; 
-x_175 = lean_ctor_get(x_174, 1);
-lean_inc(x_175);
-x_176 = lean_ctor_get(x_174, 0);
+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_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; 
+x_176 = lean_ctor_get(x_175, 1);
 lean_inc(x_176);
-if (lean_is_exclusive(x_174)) {
- lean_ctor_release(x_174, 0);
- lean_ctor_release(x_174, 1);
- x_177 = x_174;
-} else {
- lean_dec_ref(x_174);
- x_177 = lean_box(0);
-}
-x_178 = lean_ctor_get(x_175, 0);
-lean_inc(x_178);
-x_179 = lean_ctor_get(x_175, 1);
-lean_inc(x_179);
-x_180 = lean_ctor_get(x_175, 2);
-lean_inc(x_180);
-x_181 = lean_ctor_get(x_175, 3);
-lean_inc(x_181);
-x_182 = lean_ctor_get(x_175, 4);
-lean_inc(x_182);
-x_183 = lean_ctor_get(x_175, 5);
-lean_inc(x_183);
-x_184 = lean_ctor_get(x_180, 2);
-lean_inc(x_184);
-x_185 = l_PersistentHashMap_find_x3f___at_Lean_Meta_synthInstance_x3f___spec__1(x_184, x_176);
-if (lean_obj_tag(x_185) == 0)
-{
-lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_207; lean_object* x_208; lean_object* x_218; lean_object* x_219; lean_object* x_220; 
+x_177 = lean_ctor_get(x_175, 0);
+lean_inc(x_177);
 if (lean_is_exclusive(x_175)) {
  lean_ctor_release(x_175, 0);
  lean_ctor_release(x_175, 1);
- lean_ctor_release(x_175, 2);
- lean_ctor_release(x_175, 3);
- lean_ctor_release(x_175, 4);
- lean_ctor_release(x_175, 5);
- x_186 = x_175;
+ x_178 = x_175;
 } else {
  lean_dec_ref(x_175);
- x_186 = lean_box(0);
+ x_178 = lean_box(0);
 }
+x_179 = lean_ctor_get(x_176, 0);
 lean_inc(x_179);
-x_218 = l_Lean_MetavarContext_incDepth(x_179);
-x_219 = lean_alloc_ctor(0, 6, 0);
-lean_ctor_set(x_219, 0, x_178);
-lean_ctor_set(x_219, 1, x_218);
-lean_ctor_set(x_219, 2, x_180);
-lean_ctor_set(x_219, 3, x_181);
-lean_ctor_set(x_219, 4, x_182);
-lean_ctor_set(x_219, 5, x_183);
-lean_inc(x_168);
-lean_inc(x_176);
-x_220 = l___private_Init_Lean_Meta_SynthInstance_5__preprocessOutParam(x_176, x_168, x_219);
-if (lean_obj_tag(x_220) == 0)
+x_180 = lean_ctor_get(x_176, 1);
+lean_inc(x_180);
+x_181 = lean_ctor_get(x_176, 2);
+lean_inc(x_181);
+x_182 = lean_ctor_get(x_176, 3);
+lean_inc(x_182);
+x_183 = lean_ctor_get(x_176, 4);
+lean_inc(x_183);
+x_184 = lean_ctor_get(x_176, 5);
+lean_inc(x_184);
+x_185 = lean_ctor_get(x_181, 2);
+lean_inc(x_185);
+x_186 = l_PersistentHashMap_find_x3f___at_Lean_Meta_synthInstance_x3f___spec__1(x_185, x_177);
+if (lean_obj_tag(x_186) == 0)
 {
-lean_object* x_221; lean_object* x_222; lean_object* x_223; 
-x_221 = lean_ctor_get(x_220, 0);
-lean_inc(x_221);
-x_222 = lean_ctor_get(x_220, 1);
+lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_208; lean_object* x_209; lean_object* x_219; lean_object* x_220; lean_object* x_221; 
+if (lean_is_exclusive(x_176)) {
+ lean_ctor_release(x_176, 0);
+ lean_ctor_release(x_176, 1);
+ lean_ctor_release(x_176, 2);
+ lean_ctor_release(x_176, 3);
+ lean_ctor_release(x_176, 4);
+ lean_ctor_release(x_176, 5);
+ x_187 = x_176;
+} else {
+ lean_dec_ref(x_176);
+ x_187 = lean_box(0);
+}
+lean_inc(x_180);
+x_219 = l_Lean_MetavarContext_incDepth(x_180);
+x_220 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_220, 0, x_179);
+lean_ctor_set(x_220, 1, x_219);
+lean_ctor_set(x_220, 2, x_181);
+lean_ctor_set(x_220, 3, x_182);
+lean_ctor_set(x_220, 4, x_183);
+lean_ctor_set(x_220, 5, x_184);
+lean_inc(x_169);
+lean_inc(x_177);
+x_221 = l___private_Init_Lean_Meta_SynthInstance_5__preprocessOutParam(x_177, x_169, x_220);
+if (lean_obj_tag(x_221) == 0)
+{
+lean_object* x_222; lean_object* x_223; lean_object* x_224; 
+x_222 = lean_ctor_get(x_221, 0);
 lean_inc(x_222);
-lean_dec(x_220);
-lean_inc(x_168);
-x_223 = l_Lean_Meta_SynthInstance_main(x_221, x_2, x_168, x_222);
-if (lean_obj_tag(x_223) == 0)
-{
-lean_object* x_224; 
-x_224 = lean_ctor_get(x_223, 0);
-lean_inc(x_224);
+x_223 = lean_ctor_get(x_221, 1);
+lean_inc(x_223);
+lean_dec(x_221);
+lean_inc(x_169);
+x_224 = l_Lean_Meta_SynthInstance_main(x_222, x_165, x_169, x_223);
 if (lean_obj_tag(x_224) == 0)
 {
 lean_object* x_225; 
-lean_dec(x_172);
-lean_dec(x_168);
-lean_dec(x_159);
-lean_dec(x_158);
-lean_dec(x_157);
-x_225 = lean_ctor_get(x_223, 1);
+x_225 = lean_ctor_get(x_224, 0);
 lean_inc(x_225);
-lean_dec(x_223);
-x_187 = x_224;
-x_188 = x_225;
-goto block_206;
-}
-else
+if (lean_obj_tag(x_225) == 0)
 {
-lean_object* x_226; lean_object* x_227; lean_object* x_228; lean_object* x_229; 
-x_226 = lean_ctor_get(x_223, 1);
+lean_object* x_226; 
+lean_dec(x_173);
+lean_dec(x_169);
+lean_dec(x_159);
+lean_dec(x_158);
+lean_dec(x_157);
+x_226 = lean_ctor_get(x_224, 1);
 lean_inc(x_226);
-lean_dec(x_223);
-x_227 = lean_ctor_get(x_224, 0);
-lean_inc(x_227);
-if (lean_is_exclusive(x_224)) {
- lean_ctor_release(x_224, 0);
- x_228 = x_224;
-} else {
- lean_dec_ref(x_224);
- x_228 = lean_box(0);
+lean_dec(x_224);
+x_188 = x_225;
+x_189 = x_226;
+goto block_207;
 }
-lean_inc(x_168);
-lean_inc(x_227);
-x_229 = l_Lean_Meta_inferType(x_227, x_168, x_226);
-if (lean_obj_tag(x_229) == 0)
+else
 {
-lean_object* x_230; lean_object* x_231; lean_object* x_232; lean_object* x_233; 
-x_230 = lean_ctor_get(x_229, 0);
-lean_inc(x_230);
-x_231 = lean_ctor_get(x_229, 1);
+lean_object* x_227; lean_object* x_228; lean_object* x_229; lean_object* x_230; 
+x_227 = lean_ctor_get(x_224, 1);
+lean_inc(x_227);
+lean_dec(x_224);
+x_228 = lean_ctor_get(x_225, 0);
+lean_inc(x_228);
+if (lean_is_exclusive(x_225)) {
+ lean_ctor_release(x_225, 0);
+ x_229 = x_225;
+} else {
+ lean_dec_ref(x_225);
+ x_229 = lean_box(0);
+}
+lean_inc(x_169);
+lean_inc(x_228);
+x_230 = l_Lean_Meta_inferType(x_228, x_169, x_227);
+if (lean_obj_tag(x_230) == 0)
+{
+lean_object* x_231; lean_object* x_232; lean_object* x_233; lean_object* x_234; 
+x_231 = lean_ctor_get(x_230, 0);
 lean_inc(x_231);
-lean_dec(x_229);
-x_232 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_232, 0, x_157);
-lean_ctor_set(x_232, 1, x_158);
-lean_ctor_set(x_232, 2, x_159);
-lean_inc(x_176);
-x_233 = l_Lean_Meta_isExprDefEq(x_176, x_230, x_232, x_231);
-if (lean_obj_tag(x_233) == 0)
+x_232 = lean_ctor_get(x_230, 1);
+lean_inc(x_232);
+lean_dec(x_230);
+x_233 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_233, 0, x_157);
+lean_ctor_set(x_233, 1, x_158);
+lean_ctor_set(x_233, 2, x_159);
+lean_inc(x_177);
+x_234 = l_Lean_Meta_isExprDefEq(x_177, x_231, x_233, x_232);
+if (lean_obj_tag(x_234) == 0)
 {
-lean_object* x_234; uint8_t x_235; 
-lean_dec(x_172);
-x_234 = lean_ctor_get(x_233, 0);
-lean_inc(x_234);
-x_235 = lean_unbox(x_234);
+lean_object* x_235; uint8_t x_236; 
+lean_dec(x_173);
+x_235 = lean_ctor_get(x_234, 0);
+lean_inc(x_235);
+x_236 = lean_unbox(x_235);
+lean_dec(x_235);
+if (x_236 == 0)
+{
+lean_object* x_237; lean_object* x_238; 
+lean_dec(x_229);
+lean_dec(x_228);
+lean_dec(x_169);
+x_237 = lean_ctor_get(x_234, 1);
+lean_inc(x_237);
 lean_dec(x_234);
-if (x_235 == 0)
-{
-lean_object* x_236; lean_object* x_237; 
-lean_dec(x_228);
-lean_dec(x_227);
-lean_dec(x_168);
-x_236 = lean_ctor_get(x_233, 1);
-lean_inc(x_236);
-lean_dec(x_233);
-x_237 = lean_box(0);
-x_187 = x_237;
-x_188 = x_236;
-goto block_206;
+x_238 = lean_box(0);
+x_188 = x_238;
+x_189 = x_237;
+goto block_207;
 }
 else
 {
-lean_object* x_238; lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; uint8_t x_244; 
-x_238 = lean_ctor_get(x_233, 1);
-lean_inc(x_238);
-lean_dec(x_233);
-x_239 = l_Lean_Meta_instantiateMVars(x_227, x_168, x_238);
-x_240 = lean_ctor_get(x_239, 0);
-lean_inc(x_240);
-x_241 = lean_ctor_get(x_239, 1);
+lean_object* x_239; lean_object* x_240; lean_object* x_241; lean_object* x_242; lean_object* x_243; lean_object* x_244; uint8_t x_245; 
+x_239 = lean_ctor_get(x_234, 1);
+lean_inc(x_239);
+lean_dec(x_234);
+x_240 = l_Lean_Meta_instantiateMVars(x_228, x_169, x_239);
+x_241 = lean_ctor_get(x_240, 0);
 lean_inc(x_241);
-lean_dec(x_239);
-x_242 = l_Lean_Meta_hasAssignableMVar(x_240, x_168, x_241);
-lean_dec(x_168);
-x_243 = lean_ctor_get(x_242, 0);
-lean_inc(x_243);
-x_244 = lean_unbox(x_243);
-lean_dec(x_243);
-if (x_244 == 0)
-{
-lean_object* x_245; lean_object* x_246; 
-x_245 = lean_ctor_get(x_242, 1);
-lean_inc(x_245);
-lean_dec(x_242);
-if (lean_is_scalar(x_228)) {
- x_246 = lean_alloc_ctor(1, 1, 0);
-} else {
- x_246 = x_228;
-}
-lean_ctor_set(x_246, 0, x_240);
-x_187 = x_246;
-x_188 = x_245;
-goto block_206;
-}
-else
-{
-lean_object* x_247; lean_object* x_248; 
+x_242 = lean_ctor_get(x_240, 1);
+lean_inc(x_242);
 lean_dec(x_240);
-lean_dec(x_228);
-x_247 = lean_ctor_get(x_242, 1);
-lean_inc(x_247);
-lean_dec(x_242);
-x_248 = lean_box(0);
-x_187 = x_248;
+x_243 = l_Lean_Meta_hasAssignableMVar(x_241, x_169, x_242);
+lean_dec(x_169);
+x_244 = lean_ctor_get(x_243, 0);
+lean_inc(x_244);
+x_245 = lean_unbox(x_244);
+lean_dec(x_244);
+if (x_245 == 0)
+{
+lean_object* x_246; lean_object* x_247; 
+x_246 = lean_ctor_get(x_243, 1);
+lean_inc(x_246);
+lean_dec(x_243);
+if (lean_is_scalar(x_229)) {
+ x_247 = lean_alloc_ctor(1, 1, 0);
+} else {
+ x_247 = x_229;
+}
+lean_ctor_set(x_247, 0, x_241);
 x_188 = x_247;
-goto block_206;
-}
-}
+x_189 = x_246;
+goto block_207;
 }
 else
 {
-lean_object* x_249; lean_object* x_250; 
-lean_dec(x_228);
-lean_dec(x_227);
-lean_dec(x_186);
-lean_dec(x_177);
-lean_dec(x_176);
-lean_dec(x_168);
-x_249 = lean_ctor_get(x_233, 0);
-lean_inc(x_249);
-x_250 = lean_ctor_get(x_233, 1);
-lean_inc(x_250);
-lean_dec(x_233);
-x_207 = x_249;
-x_208 = x_250;
-goto block_217;
-}
-}
-else
-{
-lean_object* x_251; lean_object* x_252; 
-lean_dec(x_228);
-lean_dec(x_227);
-lean_dec(x_186);
-lean_dec(x_177);
-lean_dec(x_176);
-lean_dec(x_168);
-lean_dec(x_159);
-lean_dec(x_158);
-lean_dec(x_157);
-x_251 = lean_ctor_get(x_229, 0);
-lean_inc(x_251);
-x_252 = lean_ctor_get(x_229, 1);
-lean_inc(x_252);
+lean_object* x_248; lean_object* x_249; 
+lean_dec(x_241);
 lean_dec(x_229);
-x_207 = x_251;
-x_208 = x_252;
-goto block_217;
+x_248 = lean_ctor_get(x_243, 1);
+lean_inc(x_248);
+lean_dec(x_243);
+x_249 = lean_box(0);
+x_188 = x_249;
+x_189 = x_248;
+goto block_207;
 }
 }
 }
 else
 {
-lean_object* x_253; lean_object* x_254; 
-lean_dec(x_186);
+lean_object* x_250; lean_object* x_251; 
+lean_dec(x_229);
+lean_dec(x_228);
+lean_dec(x_187);
+lean_dec(x_178);
 lean_dec(x_177);
-lean_dec(x_176);
-lean_dec(x_168);
+lean_dec(x_169);
+x_250 = lean_ctor_get(x_234, 0);
+lean_inc(x_250);
+x_251 = lean_ctor_get(x_234, 1);
+lean_inc(x_251);
+lean_dec(x_234);
+x_208 = x_250;
+x_209 = x_251;
+goto block_218;
+}
+}
+else
+{
+lean_object* x_252; lean_object* x_253; 
+lean_dec(x_229);
+lean_dec(x_228);
+lean_dec(x_187);
+lean_dec(x_178);
+lean_dec(x_177);
+lean_dec(x_169);
 lean_dec(x_159);
 lean_dec(x_158);
 lean_dec(x_157);
-x_253 = lean_ctor_get(x_223, 0);
+x_252 = lean_ctor_get(x_230, 0);
+lean_inc(x_252);
+x_253 = lean_ctor_get(x_230, 1);
 lean_inc(x_253);
-x_254 = lean_ctor_get(x_223, 1);
-lean_inc(x_254);
-lean_dec(x_223);
-x_207 = x_253;
-x_208 = x_254;
-goto block_217;
+lean_dec(x_230);
+x_208 = x_252;
+x_209 = x_253;
+goto block_218;
+}
 }
 }
 else
 {
-lean_object* x_255; lean_object* x_256; 
-lean_dec(x_186);
+lean_object* x_254; lean_object* x_255; 
+lean_dec(x_187);
+lean_dec(x_178);
 lean_dec(x_177);
-lean_dec(x_176);
-lean_dec(x_168);
+lean_dec(x_169);
 lean_dec(x_159);
 lean_dec(x_158);
 lean_dec(x_157);
-lean_dec(x_2);
-x_255 = lean_ctor_get(x_220, 0);
+x_254 = lean_ctor_get(x_224, 0);
+lean_inc(x_254);
+x_255 = lean_ctor_get(x_224, 1);
 lean_inc(x_255);
-x_256 = lean_ctor_get(x_220, 1);
-lean_inc(x_256);
-lean_dec(x_220);
-x_207 = x_255;
-x_208 = x_256;
-goto block_217;
+lean_dec(x_224);
+x_208 = x_254;
+x_209 = x_255;
+goto block_218;
 }
-block_206:
-{
-lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; uint8_t x_196; 
-x_189 = lean_ctor_get(x_188, 0);
-lean_inc(x_189);
-x_190 = lean_ctor_get(x_188, 2);
-lean_inc(x_190);
-x_191 = lean_ctor_get(x_188, 3);
-lean_inc(x_191);
-x_192 = lean_ctor_get(x_188, 4);
-lean_inc(x_192);
-x_193 = lean_ctor_get(x_188, 5);
-lean_inc(x_193);
-if (lean_is_exclusive(x_188)) {
- lean_ctor_release(x_188, 0);
- lean_ctor_release(x_188, 1);
- lean_ctor_release(x_188, 2);
- lean_ctor_release(x_188, 3);
- lean_ctor_release(x_188, 4);
- lean_ctor_release(x_188, 5);
- x_194 = x_188;
-} else {
- lean_dec_ref(x_188);
- x_194 = lean_box(0);
-}
-lean_inc(x_193);
-lean_inc(x_192);
-lean_inc(x_191);
-lean_inc(x_190);
-lean_inc(x_179);
-lean_inc(x_189);
-if (lean_is_scalar(x_194)) {
- x_195 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_195 = x_194;
-}
-lean_ctor_set(x_195, 0, x_189);
-lean_ctor_set(x_195, 1, x_179);
-lean_ctor_set(x_195, 2, x_190);
-lean_ctor_set(x_195, 3, x_191);
-lean_ctor_set(x_195, 4, x_192);
-lean_ctor_set(x_195, 5, x_193);
-x_196 = l_Lean_Expr_hasMVar(x_176);
-if (x_196 == 0)
-{
-lean_object* x_197; 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_dec(x_195);
-x_197 = lean_ctor_get(x_190, 0);
-lean_inc(x_197);
-x_198 = lean_ctor_get(x_190, 1);
-lean_inc(x_198);
-x_199 = lean_ctor_get(x_190, 2);
-lean_inc(x_199);
-if (lean_is_exclusive(x_190)) {
- lean_ctor_release(x_190, 0);
- lean_ctor_release(x_190, 1);
- lean_ctor_release(x_190, 2);
- x_200 = x_190;
-} else {
- lean_dec_ref(x_190);
- x_200 = lean_box(0);
-}
-lean_inc(x_187);
-x_201 = l_PersistentHashMap_insert___at_Lean_Meta_synthInstance_x3f___spec__4(x_199, x_176, x_187);
-if (lean_is_scalar(x_200)) {
- x_202 = lean_alloc_ctor(0, 3, 0);
-} else {
- x_202 = x_200;
-}
-lean_ctor_set(x_202, 0, x_197);
-lean_ctor_set(x_202, 1, x_198);
-lean_ctor_set(x_202, 2, x_201);
-if (lean_is_scalar(x_186)) {
- x_203 = lean_alloc_ctor(0, 6, 0);
-} else {
- x_203 = x_186;
-}
-lean_ctor_set(x_203, 0, x_189);
-lean_ctor_set(x_203, 1, x_179);
-lean_ctor_set(x_203, 2, x_202);
-lean_ctor_set(x_203, 3, x_191);
-lean_ctor_set(x_203, 4, x_192);
-lean_ctor_set(x_203, 5, x_193);
-if (lean_is_scalar(x_177)) {
- x_204 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_204 = x_177;
-}
-lean_ctor_set(x_204, 0, x_187);
-lean_ctor_set(x_204, 1, x_203);
-return x_204;
 }
 else
 {
-lean_object* x_205; 
+lean_object* x_256; lean_object* x_257; 
+lean_dec(x_187);
+lean_dec(x_178);
+lean_dec(x_177);
+lean_dec(x_169);
+lean_dec(x_165);
+lean_dec(x_159);
+lean_dec(x_158);
+lean_dec(x_157);
+x_256 = lean_ctor_get(x_221, 0);
+lean_inc(x_256);
+x_257 = lean_ctor_get(x_221, 1);
+lean_inc(x_257);
+lean_dec(x_221);
+x_208 = x_256;
+x_209 = x_257;
+goto block_218;
+}
+block_207:
+{
+lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; uint8_t x_197; 
+x_190 = lean_ctor_get(x_189, 0);
+lean_inc(x_190);
+x_191 = lean_ctor_get(x_189, 2);
+lean_inc(x_191);
+x_192 = lean_ctor_get(x_189, 3);
+lean_inc(x_192);
+x_193 = lean_ctor_get(x_189, 4);
+lean_inc(x_193);
+x_194 = lean_ctor_get(x_189, 5);
+lean_inc(x_194);
+if (lean_is_exclusive(x_189)) {
+ lean_ctor_release(x_189, 0);
+ lean_ctor_release(x_189, 1);
+ lean_ctor_release(x_189, 2);
+ lean_ctor_release(x_189, 3);
+ lean_ctor_release(x_189, 4);
+ lean_ctor_release(x_189, 5);
+ x_195 = x_189;
+} else {
+ lean_dec_ref(x_189);
+ x_195 = lean_box(0);
+}
+lean_inc(x_194);
+lean_inc(x_193);
+lean_inc(x_192);
+lean_inc(x_191);
+lean_inc(x_180);
+lean_inc(x_190);
+if (lean_is_scalar(x_195)) {
+ x_196 = lean_alloc_ctor(0, 6, 0);
+} else {
+ x_196 = x_195;
+}
+lean_ctor_set(x_196, 0, x_190);
+lean_ctor_set(x_196, 1, x_180);
+lean_ctor_set(x_196, 2, x_191);
+lean_ctor_set(x_196, 3, x_192);
+lean_ctor_set(x_196, 4, x_193);
+lean_ctor_set(x_196, 5, x_194);
+x_197 = l_Lean_Expr_hasMVar(x_177);
+if (x_197 == 0)
+{
+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_dec(x_196);
+x_198 = lean_ctor_get(x_191, 0);
+lean_inc(x_198);
+x_199 = lean_ctor_get(x_191, 1);
+lean_inc(x_199);
+x_200 = lean_ctor_get(x_191, 2);
+lean_inc(x_200);
+if (lean_is_exclusive(x_191)) {
+ lean_ctor_release(x_191, 0);
+ lean_ctor_release(x_191, 1);
+ lean_ctor_release(x_191, 2);
+ x_201 = x_191;
+} else {
+ lean_dec_ref(x_191);
+ x_201 = lean_box(0);
+}
+lean_inc(x_188);
+x_202 = l_PersistentHashMap_insert___at_Lean_Meta_synthInstance_x3f___spec__4(x_200, x_177, x_188);
+if (lean_is_scalar(x_201)) {
+ x_203 = lean_alloc_ctor(0, 3, 0);
+} else {
+ x_203 = x_201;
+}
+lean_ctor_set(x_203, 0, x_198);
+lean_ctor_set(x_203, 1, x_199);
+lean_ctor_set(x_203, 2, x_202);
+if (lean_is_scalar(x_187)) {
+ x_204 = lean_alloc_ctor(0, 6, 0);
+} else {
+ x_204 = x_187;
+}
+lean_ctor_set(x_204, 0, x_190);
+lean_ctor_set(x_204, 1, x_180);
+lean_ctor_set(x_204, 2, x_203);
+lean_ctor_set(x_204, 3, x_192);
+lean_ctor_set(x_204, 4, x_193);
+lean_ctor_set(x_204, 5, x_194);
+if (lean_is_scalar(x_178)) {
+ x_205 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_205 = x_178;
+}
+lean_ctor_set(x_205, 0, x_188);
+lean_ctor_set(x_205, 1, x_204);
+return x_205;
+}
+else
+{
+lean_object* x_206; 
+lean_dec(x_194);
 lean_dec(x_193);
 lean_dec(x_192);
 lean_dec(x_191);
 lean_dec(x_190);
-lean_dec(x_189);
-lean_dec(x_186);
-lean_dec(x_179);
-lean_dec(x_176);
-if (lean_is_scalar(x_177)) {
- x_205 = lean_alloc_ctor(0, 2, 0);
+lean_dec(x_187);
+lean_dec(x_180);
+lean_dec(x_177);
+if (lean_is_scalar(x_178)) {
+ x_206 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_205 = x_177;
+ x_206 = x_178;
 }
-lean_ctor_set(x_205, 0, x_187);
-lean_ctor_set(x_205, 1, x_195);
-return x_205;
+lean_ctor_set(x_206, 0, x_188);
+lean_ctor_set(x_206, 1, x_196);
+return x_206;
 }
 }
-block_217:
+block_218:
 {
-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; 
-x_209 = lean_ctor_get(x_208, 0);
-lean_inc(x_209);
-x_210 = lean_ctor_get(x_208, 2);
+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; 
+x_210 = lean_ctor_get(x_209, 0);
 lean_inc(x_210);
-x_211 = lean_ctor_get(x_208, 3);
+x_211 = lean_ctor_get(x_209, 2);
 lean_inc(x_211);
-x_212 = lean_ctor_get(x_208, 4);
+x_212 = lean_ctor_get(x_209, 3);
 lean_inc(x_212);
-x_213 = lean_ctor_get(x_208, 5);
+x_213 = lean_ctor_get(x_209, 4);
 lean_inc(x_213);
-if (lean_is_exclusive(x_208)) {
- lean_ctor_release(x_208, 0);
- lean_ctor_release(x_208, 1);
- lean_ctor_release(x_208, 2);
- lean_ctor_release(x_208, 3);
- lean_ctor_release(x_208, 4);
- lean_ctor_release(x_208, 5);
- x_214 = x_208;
+x_214 = lean_ctor_get(x_209, 5);
+lean_inc(x_214);
+if (lean_is_exclusive(x_209)) {
+ lean_ctor_release(x_209, 0);
+ lean_ctor_release(x_209, 1);
+ lean_ctor_release(x_209, 2);
+ lean_ctor_release(x_209, 3);
+ lean_ctor_release(x_209, 4);
+ lean_ctor_release(x_209, 5);
+ x_215 = x_209;
 } else {
- lean_dec_ref(x_208);
- x_214 = lean_box(0);
+ lean_dec_ref(x_209);
+ x_215 = lean_box(0);
 }
-if (lean_is_scalar(x_214)) {
- x_215 = lean_alloc_ctor(0, 6, 0);
+if (lean_is_scalar(x_215)) {
+ x_216 = lean_alloc_ctor(0, 6, 0);
 } else {
- x_215 = x_214;
+ x_216 = x_215;
 }
-lean_ctor_set(x_215, 0, x_209);
-lean_ctor_set(x_215, 1, x_179);
-lean_ctor_set(x_215, 2, x_210);
-lean_ctor_set(x_215, 3, x_211);
-lean_ctor_set(x_215, 4, x_212);
-lean_ctor_set(x_215, 5, x_213);
-if (lean_is_scalar(x_172)) {
- x_216 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_216, 0, x_210);
+lean_ctor_set(x_216, 1, x_180);
+lean_ctor_set(x_216, 2, x_211);
+lean_ctor_set(x_216, 3, x_212);
+lean_ctor_set(x_216, 4, x_213);
+lean_ctor_set(x_216, 5, x_214);
+if (lean_is_scalar(x_173)) {
+ x_217 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_216 = x_172;
- lean_ctor_set_tag(x_216, 1);
+ x_217 = x_173;
+ lean_ctor_set_tag(x_217, 1);
 }
-lean_ctor_set(x_216, 0, x_207);
-lean_ctor_set(x_216, 1, x_215);
-return x_216;
+lean_ctor_set(x_217, 0, x_208);
+lean_ctor_set(x_217, 1, x_216);
+return x_217;
 }
 }
 else
 {
-lean_object* x_257; lean_object* x_258; 
+lean_object* x_258; lean_object* x_259; 
+lean_dec(x_184);
 lean_dec(x_183);
 lean_dec(x_182);
 lean_dec(x_181);
 lean_dec(x_180);
 lean_dec(x_179);
-lean_dec(x_178);
-lean_dec(x_176);
-lean_dec(x_172);
-lean_dec(x_168);
+lean_dec(x_177);
+lean_dec(x_173);
+lean_dec(x_169);
+lean_dec(x_165);
 lean_dec(x_159);
 lean_dec(x_158);
 lean_dec(x_157);
-lean_dec(x_2);
-x_257 = lean_ctor_get(x_185, 0);
-lean_inc(x_257);
-lean_dec(x_185);
-if (lean_is_scalar(x_177)) {
- x_258 = lean_alloc_ctor(0, 2, 0);
+x_258 = lean_ctor_get(x_186, 0);
+lean_inc(x_258);
+lean_dec(x_186);
+if (lean_is_scalar(x_178)) {
+ x_259 = lean_alloc_ctor(0, 2, 0);
 } else {
- x_258 = x_177;
+ x_259 = x_178;
 }
-lean_ctor_set(x_258, 0, x_257);
-lean_ctor_set(x_258, 1, x_175);
-return x_258;
+lean_ctor_set(x_259, 0, x_258);
+lean_ctor_set(x_259, 1, x_176);
+return x_259;
 }
 }
 else
 {
-lean_object* x_259; lean_object* x_260; lean_object* x_261; lean_object* x_262; 
-lean_dec(x_172);
-lean_dec(x_168);
+lean_object* x_260; lean_object* x_261; lean_object* x_262; lean_object* x_263; 
+lean_dec(x_173);
+lean_dec(x_169);
+lean_dec(x_165);
 lean_dec(x_159);
 lean_dec(x_158);
 lean_dec(x_157);
-lean_dec(x_2);
-x_259 = lean_ctor_get(x_174, 0);
-lean_inc(x_259);
-x_260 = lean_ctor_get(x_174, 1);
+x_260 = lean_ctor_get(x_175, 0);
 lean_inc(x_260);
-if (lean_is_exclusive(x_174)) {
- lean_ctor_release(x_174, 0);
- lean_ctor_release(x_174, 1);
- x_261 = x_174;
+x_261 = lean_ctor_get(x_175, 1);
+lean_inc(x_261);
+if (lean_is_exclusive(x_175)) {
+ lean_ctor_release(x_175, 0);
+ lean_ctor_release(x_175, 1);
+ x_262 = x_175;
 } else {
- lean_dec_ref(x_174);
- x_261 = lean_box(0);
+ lean_dec_ref(x_175);
+ x_262 = lean_box(0);
 }
-if (lean_is_scalar(x_261)) {
- x_262 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_262)) {
+ x_263 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_262 = x_261;
+ x_263 = x_262;
 }
-lean_ctor_set(x_262, 0, x_259);
-lean_ctor_set(x_262, 1, x_260);
-return x_262;
+lean_ctor_set(x_263, 0, x_260);
+lean_ctor_set(x_263, 1, x_261);
+return x_263;
 }
 }
 }
@@ -22002,562 +22195,562 @@ x_8 = l_PersistentHashMap_insertAux___main___at_Lean_Meta_synthInstance_x3f___sp
 return x_8;
 }
 }
-lean_object* l_Lean_Meta_trySynthInstance(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_Meta_trySynthInstance(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
-uint8_t x_5; 
-x_5 = !lean_is_exclusive(x_3);
-if (x_5 == 0)
+uint8_t x_4; 
+x_4 = !lean_is_exclusive(x_2);
+if (x_4 == 0)
 {
-lean_object* x_6; uint8_t x_7; 
-x_6 = lean_ctor_get(x_3, 0);
-x_7 = !lean_is_exclusive(x_6);
-if (x_7 == 0)
+lean_object* x_5; uint8_t x_6; 
+x_5 = lean_ctor_get(x_2, 0);
+x_6 = !lean_is_exclusive(x_5);
+if (x_6 == 0)
 {
-uint8_t x_8; lean_object* x_9; 
-x_8 = 1;
-lean_ctor_set_uint8(x_6, sizeof(void*)*1 + 4, x_8);
-x_9 = l_Lean_Meta_synthInstance_x3f(x_1, x_2, x_3, x_4);
-if (lean_obj_tag(x_9) == 0)
+uint8_t x_7; lean_object* x_8; 
+x_7 = 1;
+lean_ctor_set_uint8(x_5, sizeof(void*)*1 + 4, x_7);
+x_8 = l_Lean_Meta_synthInstance_x3f(x_1, x_2, x_3);
+if (lean_obj_tag(x_8) == 0)
 {
-uint8_t x_10; 
-x_10 = !lean_is_exclusive(x_9);
-if (x_10 == 0)
+uint8_t x_9; 
+x_9 = !lean_is_exclusive(x_8);
+if (x_9 == 0)
 {
-lean_object* x_11; lean_object* x_12; 
-x_11 = lean_ctor_get(x_9, 0);
-x_12 = l_Option_toLOption___rarg(x_11);
-lean_dec(x_11);
-lean_ctor_set(x_9, 0, x_12);
-return x_9;
-}
-else
-{
-lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
-x_13 = lean_ctor_get(x_9, 0);
-x_14 = lean_ctor_get(x_9, 1);
-lean_inc(x_14);
-lean_inc(x_13);
-lean_dec(x_9);
-x_15 = l_Option_toLOption___rarg(x_13);
-lean_dec(x_13);
-x_16 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_16, 0, x_15);
-lean_ctor_set(x_16, 1, x_14);
-return x_16;
-}
-}
-else
-{
-lean_object* x_17; 
-x_17 = lean_ctor_get(x_9, 0);
-lean_inc(x_17);
-switch (lean_obj_tag(x_17)) {
-case 11:
-{
-uint8_t x_18; 
-lean_dec(x_17);
-x_18 = !lean_is_exclusive(x_9);
-if (x_18 == 0)
-{
-lean_object* x_19; lean_object* x_20; 
-x_19 = lean_ctor_get(x_9, 0);
-lean_dec(x_19);
-x_20 = lean_box(2);
-lean_ctor_set_tag(x_9, 0);
-lean_ctor_set(x_9, 0, x_20);
-return x_9;
-}
-else
-{
-lean_object* x_21; lean_object* x_22; lean_object* x_23; 
-x_21 = lean_ctor_get(x_9, 1);
-lean_inc(x_21);
-lean_dec(x_9);
-x_22 = lean_box(2);
-x_23 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_23, 0, x_22);
-lean_ctor_set(x_23, 1, x_21);
-return x_23;
-}
-}
-case 12:
-{
-uint8_t x_24; 
-lean_dec(x_17);
-x_24 = !lean_is_exclusive(x_9);
-if (x_24 == 0)
-{
-lean_object* x_25; lean_object* x_26; 
-x_25 = lean_ctor_get(x_9, 0);
-lean_dec(x_25);
-x_26 = lean_box(2);
-lean_ctor_set_tag(x_9, 0);
-lean_ctor_set(x_9, 0, x_26);
-return x_9;
-}
-else
-{
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_9, 1);
-lean_inc(x_27);
-lean_dec(x_9);
-x_28 = lean_box(2);
-x_29 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_27);
-return x_29;
-}
-}
-default: 
-{
-uint8_t x_30; 
-x_30 = !lean_is_exclusive(x_9);
-if (x_30 == 0)
-{
-lean_object* x_31; 
-x_31 = lean_ctor_get(x_9, 0);
-lean_dec(x_31);
-return x_9;
-}
-else
-{
-lean_object* x_32; lean_object* x_33; 
-x_32 = lean_ctor_get(x_9, 1);
-lean_inc(x_32);
-lean_dec(x_9);
-x_33 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_33, 0, x_17);
-lean_ctor_set(x_33, 1, x_32);
-return x_33;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_34; uint8_t x_35; uint8_t x_36; uint8_t x_37; uint8_t x_38; uint8_t x_39; uint8_t x_40; uint8_t x_41; lean_object* x_42; lean_object* x_43; 
-x_34 = lean_ctor_get(x_6, 0);
-x_35 = lean_ctor_get_uint8(x_6, sizeof(void*)*1);
-x_36 = lean_ctor_get_uint8(x_6, sizeof(void*)*1 + 1);
-x_37 = lean_ctor_get_uint8(x_6, sizeof(void*)*1 + 2);
-x_38 = lean_ctor_get_uint8(x_6, sizeof(void*)*1 + 3);
-x_39 = lean_ctor_get_uint8(x_6, sizeof(void*)*1 + 5);
-x_40 = lean_ctor_get_uint8(x_6, sizeof(void*)*1 + 6);
-lean_inc(x_34);
-lean_dec(x_6);
-x_41 = 1;
-x_42 = lean_alloc_ctor(0, 1, 7);
-lean_ctor_set(x_42, 0, x_34);
-lean_ctor_set_uint8(x_42, sizeof(void*)*1, x_35);
-lean_ctor_set_uint8(x_42, sizeof(void*)*1 + 1, x_36);
-lean_ctor_set_uint8(x_42, sizeof(void*)*1 + 2, x_37);
-lean_ctor_set_uint8(x_42, sizeof(void*)*1 + 3, x_38);
-lean_ctor_set_uint8(x_42, sizeof(void*)*1 + 4, x_41);
-lean_ctor_set_uint8(x_42, sizeof(void*)*1 + 5, x_39);
-lean_ctor_set_uint8(x_42, sizeof(void*)*1 + 6, x_40);
-lean_ctor_set(x_3, 0, x_42);
-x_43 = l_Lean_Meta_synthInstance_x3f(x_1, x_2, x_3, x_4);
-if (lean_obj_tag(x_43) == 0)
-{
-lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_44 = lean_ctor_get(x_43, 0);
-lean_inc(x_44);
-x_45 = lean_ctor_get(x_43, 1);
-lean_inc(x_45);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- lean_ctor_release(x_43, 1);
- x_46 = x_43;
-} else {
- lean_dec_ref(x_43);
- x_46 = lean_box(0);
-}
-x_47 = l_Option_toLOption___rarg(x_44);
-lean_dec(x_44);
-if (lean_is_scalar(x_46)) {
- x_48 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_48 = x_46;
-}
-lean_ctor_set(x_48, 0, x_47);
-lean_ctor_set(x_48, 1, x_45);
-return x_48;
-}
-else
-{
-lean_object* x_49; 
-x_49 = lean_ctor_get(x_43, 0);
-lean_inc(x_49);
-switch (lean_obj_tag(x_49)) {
-case 11:
-{
-lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
-lean_dec(x_49);
-x_50 = lean_ctor_get(x_43, 1);
-lean_inc(x_50);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- lean_ctor_release(x_43, 1);
- x_51 = x_43;
-} else {
- lean_dec_ref(x_43);
- x_51 = lean_box(0);
-}
-x_52 = lean_box(2);
-if (lean_is_scalar(x_51)) {
- x_53 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_53 = x_51;
- lean_ctor_set_tag(x_53, 0);
-}
-lean_ctor_set(x_53, 0, x_52);
-lean_ctor_set(x_53, 1, x_50);
-return x_53;
-}
-case 12:
-{
-lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; 
-lean_dec(x_49);
-x_54 = lean_ctor_get(x_43, 1);
-lean_inc(x_54);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- lean_ctor_release(x_43, 1);
- x_55 = x_43;
-} else {
- lean_dec_ref(x_43);
- x_55 = lean_box(0);
-}
-x_56 = lean_box(2);
-if (lean_is_scalar(x_55)) {
- x_57 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_57 = x_55;
- lean_ctor_set_tag(x_57, 0);
-}
-lean_ctor_set(x_57, 0, x_56);
-lean_ctor_set(x_57, 1, x_54);
-return x_57;
-}
-default: 
-{
-lean_object* x_58; lean_object* x_59; lean_object* x_60; 
-x_58 = lean_ctor_get(x_43, 1);
-lean_inc(x_58);
-if (lean_is_exclusive(x_43)) {
- lean_ctor_release(x_43, 0);
- lean_ctor_release(x_43, 1);
- x_59 = x_43;
-} else {
- lean_dec_ref(x_43);
- x_59 = lean_box(0);
-}
-if (lean_is_scalar(x_59)) {
- x_60 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_60 = x_59;
-}
-lean_ctor_set(x_60, 0, x_49);
-lean_ctor_set(x_60, 1, x_58);
-return x_60;
-}
-}
-}
-}
-}
-else
-{
-lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; uint8_t x_65; uint8_t x_66; uint8_t x_67; uint8_t x_68; uint8_t x_69; uint8_t x_70; lean_object* x_71; uint8_t 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);
-x_63 = lean_ctor_get(x_3, 2);
-lean_inc(x_63);
-lean_inc(x_62);
-lean_inc(x_61);
-lean_dec(x_3);
-x_64 = lean_ctor_get(x_61, 0);
-lean_inc(x_64);
-x_65 = lean_ctor_get_uint8(x_61, sizeof(void*)*1);
-x_66 = lean_ctor_get_uint8(x_61, sizeof(void*)*1 + 1);
-x_67 = lean_ctor_get_uint8(x_61, sizeof(void*)*1 + 2);
-x_68 = lean_ctor_get_uint8(x_61, sizeof(void*)*1 + 3);
-x_69 = lean_ctor_get_uint8(x_61, sizeof(void*)*1 + 5);
-x_70 = lean_ctor_get_uint8(x_61, sizeof(void*)*1 + 6);
-if (lean_is_exclusive(x_61)) {
- lean_ctor_release(x_61, 0);
- x_71 = x_61;
-} else {
- lean_dec_ref(x_61);
- x_71 = lean_box(0);
-}
-x_72 = 1;
-if (lean_is_scalar(x_71)) {
- x_73 = lean_alloc_ctor(0, 1, 7);
-} else {
- x_73 = x_71;
-}
-lean_ctor_set(x_73, 0, x_64);
-lean_ctor_set_uint8(x_73, sizeof(void*)*1, x_65);
-lean_ctor_set_uint8(x_73, sizeof(void*)*1 + 1, x_66);
-lean_ctor_set_uint8(x_73, sizeof(void*)*1 + 2, x_67);
-lean_ctor_set_uint8(x_73, sizeof(void*)*1 + 3, x_68);
-lean_ctor_set_uint8(x_73, sizeof(void*)*1 + 4, x_72);
-lean_ctor_set_uint8(x_73, sizeof(void*)*1 + 5, x_69);
-lean_ctor_set_uint8(x_73, sizeof(void*)*1 + 6, x_70);
-x_74 = lean_alloc_ctor(0, 3, 0);
-lean_ctor_set(x_74, 0, x_73);
-lean_ctor_set(x_74, 1, x_62);
-lean_ctor_set(x_74, 2, x_63);
-x_75 = l_Lean_Meta_synthInstance_x3f(x_1, x_2, x_74, x_4);
-if (lean_obj_tag(x_75) == 0)
-{
-lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; 
-x_76 = lean_ctor_get(x_75, 0);
-lean_inc(x_76);
-x_77 = lean_ctor_get(x_75, 1);
-lean_inc(x_77);
-if (lean_is_exclusive(x_75)) {
- lean_ctor_release(x_75, 0);
- lean_ctor_release(x_75, 1);
- x_78 = x_75;
-} else {
- lean_dec_ref(x_75);
- x_78 = lean_box(0);
-}
-x_79 = l_Option_toLOption___rarg(x_76);
-lean_dec(x_76);
-if (lean_is_scalar(x_78)) {
- x_80 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_80 = x_78;
-}
-lean_ctor_set(x_80, 0, x_79);
-lean_ctor_set(x_80, 1, x_77);
-return x_80;
-}
-else
-{
-lean_object* x_81; 
-x_81 = lean_ctor_get(x_75, 0);
-lean_inc(x_81);
-switch (lean_obj_tag(x_81)) {
-case 11:
-{
-lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; 
-lean_dec(x_81);
-x_82 = lean_ctor_get(x_75, 1);
-lean_inc(x_82);
-if (lean_is_exclusive(x_75)) {
- lean_ctor_release(x_75, 0);
- lean_ctor_release(x_75, 1);
- x_83 = x_75;
-} else {
- lean_dec_ref(x_75);
- x_83 = lean_box(0);
-}
-x_84 = lean_box(2);
-if (lean_is_scalar(x_83)) {
- x_85 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_85 = x_83;
- lean_ctor_set_tag(x_85, 0);
-}
-lean_ctor_set(x_85, 0, x_84);
-lean_ctor_set(x_85, 1, x_82);
-return x_85;
-}
-case 12:
-{
-lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
-lean_dec(x_81);
-x_86 = lean_ctor_get(x_75, 1);
-lean_inc(x_86);
-if (lean_is_exclusive(x_75)) {
- lean_ctor_release(x_75, 0);
- lean_ctor_release(x_75, 1);
- x_87 = x_75;
-} else {
- lean_dec_ref(x_75);
- x_87 = lean_box(0);
-}
-x_88 = lean_box(2);
-if (lean_is_scalar(x_87)) {
- x_89 = lean_alloc_ctor(0, 2, 0);
-} else {
- x_89 = x_87;
- lean_ctor_set_tag(x_89, 0);
-}
-lean_ctor_set(x_89, 0, x_88);
-lean_ctor_set(x_89, 1, x_86);
-return x_89;
-}
-default: 
-{
-lean_object* x_90; lean_object* x_91; lean_object* x_92; 
-x_90 = lean_ctor_get(x_75, 1);
-lean_inc(x_90);
-if (lean_is_exclusive(x_75)) {
- lean_ctor_release(x_75, 0);
- lean_ctor_release(x_75, 1);
- x_91 = x_75;
-} else {
- lean_dec_ref(x_75);
- x_91 = lean_box(0);
-}
-if (lean_is_scalar(x_91)) {
- x_92 = lean_alloc_ctor(1, 2, 0);
-} else {
- x_92 = x_91;
-}
-lean_ctor_set(x_92, 0, x_81);
-lean_ctor_set(x_92, 1, x_90);
-return x_92;
-}
-}
-}
-}
-}
-}
-lean_object* l_Lean_Meta_synthInstance(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-lean_inc(x_3);
-lean_inc(x_1);
-x_5 = l_Lean_Meta_synthInstance_x3f(x_1, x_2, x_3, x_4);
-if (lean_obj_tag(x_5) == 0)
-{
-lean_object* x_6; 
-x_6 = lean_ctor_get(x_5, 0);
-lean_inc(x_6);
-if (lean_obj_tag(x_6) == 0)
-{
-uint8_t x_7; 
-x_7 = !lean_is_exclusive(x_5);
-if (x_7 == 0)
-{
-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; 
-x_8 = lean_ctor_get(x_5, 1);
-x_9 = lean_ctor_get(x_5, 0);
-lean_dec(x_9);
+lean_object* x_10; lean_object* x_11; 
 x_10 = lean_ctor_get(x_8, 0);
-lean_inc(x_10);
-x_11 = lean_ctor_get(x_8, 1);
-lean_inc(x_11);
-x_12 = lean_ctor_get(x_3, 1);
-lean_inc(x_12);
-x_13 = lean_ctor_get(x_3, 0);
+x_11 = l_Option_toLOption___rarg(x_10);
+lean_dec(x_10);
+lean_ctor_set(x_8, 0, x_11);
+return x_8;
+}
+else
+{
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_12 = lean_ctor_get(x_8, 0);
+x_13 = lean_ctor_get(x_8, 1);
 lean_inc(x_13);
-lean_dec(x_3);
-x_14 = lean_ctor_get(x_13, 0);
-lean_inc(x_14);
-lean_dec(x_13);
-x_15 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_15, 0, x_10);
-lean_ctor_set(x_15, 1, x_11);
-lean_ctor_set(x_15, 2, x_12);
-lean_ctor_set(x_15, 3, x_14);
-x_16 = lean_alloc_ctor(17, 2, 0);
-lean_ctor_set(x_16, 0, x_1);
-lean_ctor_set(x_16, 1, x_15);
-lean_ctor_set_tag(x_5, 1);
-lean_ctor_set(x_5, 0, x_16);
-return x_5;
+lean_inc(x_12);
+lean_dec(x_8);
+x_14 = l_Option_toLOption___rarg(x_12);
+lean_dec(x_12);
+x_15 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_15, 0, x_14);
+lean_ctor_set(x_15, 1, x_13);
+return x_15;
+}
 }
 else
 {
-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; 
-x_17 = lean_ctor_get(x_5, 1);
-lean_inc(x_17);
-lean_dec(x_5);
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-x_19 = lean_ctor_get(x_17, 1);
-lean_inc(x_19);
-x_20 = lean_ctor_get(x_3, 1);
+lean_object* x_16; 
+x_16 = lean_ctor_get(x_8, 0);
+lean_inc(x_16);
+switch (lean_obj_tag(x_16)) {
+case 11:
+{
+uint8_t x_17; 
+lean_dec(x_16);
+x_17 = !lean_is_exclusive(x_8);
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; 
+x_18 = lean_ctor_get(x_8, 0);
+lean_dec(x_18);
+x_19 = lean_box(2);
+lean_ctor_set_tag(x_8, 0);
+lean_ctor_set(x_8, 0, x_19);
+return x_8;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_ctor_get(x_8, 1);
 lean_inc(x_20);
-x_21 = lean_ctor_get(x_3, 0);
-lean_inc(x_21);
-lean_dec(x_3);
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-lean_dec(x_21);
-x_23 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_23, 0, x_18);
-lean_ctor_set(x_23, 1, x_19);
-lean_ctor_set(x_23, 2, x_20);
-lean_ctor_set(x_23, 3, x_22);
-x_24 = lean_alloc_ctor(17, 2, 0);
-lean_ctor_set(x_24, 0, x_1);
-lean_ctor_set(x_24, 1, x_23);
-x_25 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_25, 0, x_24);
-lean_ctor_set(x_25, 1, x_17);
-return x_25;
+lean_dec(x_8);
+x_21 = lean_box(2);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_21);
+lean_ctor_set(x_22, 1, x_20);
+return x_22;
 }
 }
+case 12:
+{
+uint8_t x_23; 
+lean_dec(x_16);
+x_23 = !lean_is_exclusive(x_8);
+if (x_23 == 0)
+{
+lean_object* x_24; lean_object* x_25; 
+x_24 = lean_ctor_get(x_8, 0);
+lean_dec(x_24);
+x_25 = lean_box(2);
+lean_ctor_set_tag(x_8, 0);
+lean_ctor_set(x_8, 0, x_25);
+return x_8;
+}
 else
 {
-uint8_t x_26; 
-lean_dec(x_3);
-lean_dec(x_1);
-x_26 = !lean_is_exclusive(x_5);
-if (x_26 == 0)
+lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_26 = lean_ctor_get(x_8, 1);
+lean_inc(x_26);
+lean_dec(x_8);
+x_27 = lean_box(2);
+x_28 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_28, 0, x_27);
+lean_ctor_set(x_28, 1, x_26);
+return x_28;
+}
+}
+default: 
 {
-lean_object* x_27; lean_object* x_28; 
-x_27 = lean_ctor_get(x_5, 0);
-lean_dec(x_27);
-x_28 = lean_ctor_get(x_6, 0);
-lean_inc(x_28);
-lean_dec(x_6);
-lean_ctor_set(x_5, 0, x_28);
-return x_5;
+uint8_t x_29; 
+x_29 = !lean_is_exclusive(x_8);
+if (x_29 == 0)
+{
+lean_object* x_30; 
+x_30 = lean_ctor_get(x_8, 0);
+lean_dec(x_30);
+return x_8;
 }
 else
 {
-lean_object* x_29; lean_object* x_30; lean_object* x_31; 
-x_29 = lean_ctor_get(x_5, 1);
-lean_inc(x_29);
-lean_dec(x_5);
-x_30 = lean_ctor_get(x_6, 0);
-lean_inc(x_30);
-lean_dec(x_6);
-x_31 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_31, 0, x_30);
-lean_ctor_set(x_31, 1, x_29);
-return x_31;
+lean_object* x_31; lean_object* x_32; 
+x_31 = lean_ctor_get(x_8, 1);
+lean_inc(x_31);
+lean_dec(x_8);
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_16);
+lean_ctor_set(x_32, 1, x_31);
+return x_32;
+}
+}
 }
 }
 }
 else
 {
-uint8_t x_32; 
-lean_dec(x_3);
-lean_dec(x_1);
-x_32 = !lean_is_exclusive(x_5);
-if (x_32 == 0)
-{
-return x_5;
-}
-else
-{
-lean_object* x_33; lean_object* x_34; lean_object* x_35; 
+lean_object* x_33; uint8_t x_34; uint8_t x_35; uint8_t x_36; uint8_t x_37; uint8_t x_38; uint8_t x_39; uint8_t x_40; lean_object* x_41; lean_object* x_42; 
 x_33 = lean_ctor_get(x_5, 0);
-x_34 = lean_ctor_get(x_5, 1);
-lean_inc(x_34);
+x_34 = lean_ctor_get_uint8(x_5, sizeof(void*)*1);
+x_35 = lean_ctor_get_uint8(x_5, sizeof(void*)*1 + 1);
+x_36 = lean_ctor_get_uint8(x_5, sizeof(void*)*1 + 2);
+x_37 = lean_ctor_get_uint8(x_5, sizeof(void*)*1 + 3);
+x_38 = lean_ctor_get_uint8(x_5, sizeof(void*)*1 + 5);
+x_39 = lean_ctor_get_uint8(x_5, sizeof(void*)*1 + 6);
 lean_inc(x_33);
 lean_dec(x_5);
-x_35 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_35, 0, x_33);
-lean_ctor_set(x_35, 1, x_34);
-return x_35;
+x_40 = 1;
+x_41 = lean_alloc_ctor(0, 1, 7);
+lean_ctor_set(x_41, 0, x_33);
+lean_ctor_set_uint8(x_41, sizeof(void*)*1, x_34);
+lean_ctor_set_uint8(x_41, sizeof(void*)*1 + 1, x_35);
+lean_ctor_set_uint8(x_41, sizeof(void*)*1 + 2, x_36);
+lean_ctor_set_uint8(x_41, sizeof(void*)*1 + 3, x_37);
+lean_ctor_set_uint8(x_41, sizeof(void*)*1 + 4, x_40);
+lean_ctor_set_uint8(x_41, sizeof(void*)*1 + 5, x_38);
+lean_ctor_set_uint8(x_41, sizeof(void*)*1 + 6, x_39);
+lean_ctor_set(x_2, 0, x_41);
+x_42 = l_Lean_Meta_synthInstance_x3f(x_1, x_2, x_3);
+if (lean_obj_tag(x_42) == 0)
+{
+lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; 
+x_43 = lean_ctor_get(x_42, 0);
+lean_inc(x_43);
+x_44 = lean_ctor_get(x_42, 1);
+lean_inc(x_44);
+if (lean_is_exclusive(x_42)) {
+ lean_ctor_release(x_42, 0);
+ lean_ctor_release(x_42, 1);
+ x_45 = x_42;
+} else {
+ lean_dec_ref(x_42);
+ x_45 = lean_box(0);
+}
+x_46 = l_Option_toLOption___rarg(x_43);
+lean_dec(x_43);
+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;
+}
+else
+{
+lean_object* x_48; 
+x_48 = lean_ctor_get(x_42, 0);
+lean_inc(x_48);
+switch (lean_obj_tag(x_48)) {
+case 11:
+{
+lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; 
+lean_dec(x_48);
+x_49 = lean_ctor_get(x_42, 1);
+lean_inc(x_49);
+if (lean_is_exclusive(x_42)) {
+ lean_ctor_release(x_42, 0);
+ lean_ctor_release(x_42, 1);
+ x_50 = x_42;
+} else {
+ lean_dec_ref(x_42);
+ x_50 = lean_box(0);
+}
+x_51 = lean_box(2);
+if (lean_is_scalar(x_50)) {
+ x_52 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_52 = x_50;
+ lean_ctor_set_tag(x_52, 0);
+}
+lean_ctor_set(x_52, 0, x_51);
+lean_ctor_set(x_52, 1, x_49);
+return x_52;
+}
+case 12:
+{
+lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+lean_dec(x_48);
+x_53 = lean_ctor_get(x_42, 1);
+lean_inc(x_53);
+if (lean_is_exclusive(x_42)) {
+ lean_ctor_release(x_42, 0);
+ lean_ctor_release(x_42, 1);
+ x_54 = x_42;
+} else {
+ lean_dec_ref(x_42);
+ x_54 = lean_box(0);
+}
+x_55 = lean_box(2);
+if (lean_is_scalar(x_54)) {
+ x_56 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_56 = x_54;
+ lean_ctor_set_tag(x_56, 0);
+}
+lean_ctor_set(x_56, 0, x_55);
+lean_ctor_set(x_56, 1, x_53);
+return x_56;
+}
+default: 
+{
+lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+x_57 = lean_ctor_get(x_42, 1);
+lean_inc(x_57);
+if (lean_is_exclusive(x_42)) {
+ lean_ctor_release(x_42, 0);
+ lean_ctor_release(x_42, 1);
+ x_58 = x_42;
+} else {
+ lean_dec_ref(x_42);
+ x_58 = lean_box(0);
+}
+if (lean_is_scalar(x_58)) {
+ x_59 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_59 = x_58;
+}
+lean_ctor_set(x_59, 0, x_48);
+lean_ctor_set(x_59, 1, x_57);
+return x_59;
 }
 }
 }
 }
-lean_object* l___private_Init_Lean_Meta_SynthInstance_6__regTraceClasses(lean_object* x_1) {
+}
+else
+{
+lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; uint8_t x_64; uint8_t x_65; uint8_t x_66; uint8_t x_67; uint8_t x_68; uint8_t x_69; lean_object* x_70; uint8_t x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; 
+x_60 = lean_ctor_get(x_2, 0);
+x_61 = lean_ctor_get(x_2, 1);
+x_62 = lean_ctor_get(x_2, 2);
+lean_inc(x_62);
+lean_inc(x_61);
+lean_inc(x_60);
+lean_dec(x_2);
+x_63 = lean_ctor_get(x_60, 0);
+lean_inc(x_63);
+x_64 = lean_ctor_get_uint8(x_60, sizeof(void*)*1);
+x_65 = lean_ctor_get_uint8(x_60, sizeof(void*)*1 + 1);
+x_66 = lean_ctor_get_uint8(x_60, sizeof(void*)*1 + 2);
+x_67 = lean_ctor_get_uint8(x_60, sizeof(void*)*1 + 3);
+x_68 = lean_ctor_get_uint8(x_60, sizeof(void*)*1 + 5);
+x_69 = lean_ctor_get_uint8(x_60, sizeof(void*)*1 + 6);
+if (lean_is_exclusive(x_60)) {
+ lean_ctor_release(x_60, 0);
+ x_70 = x_60;
+} else {
+ lean_dec_ref(x_60);
+ x_70 = lean_box(0);
+}
+x_71 = 1;
+if (lean_is_scalar(x_70)) {
+ x_72 = lean_alloc_ctor(0, 1, 7);
+} else {
+ x_72 = x_70;
+}
+lean_ctor_set(x_72, 0, x_63);
+lean_ctor_set_uint8(x_72, sizeof(void*)*1, x_64);
+lean_ctor_set_uint8(x_72, sizeof(void*)*1 + 1, x_65);
+lean_ctor_set_uint8(x_72, sizeof(void*)*1 + 2, x_66);
+lean_ctor_set_uint8(x_72, sizeof(void*)*1 + 3, x_67);
+lean_ctor_set_uint8(x_72, sizeof(void*)*1 + 4, x_71);
+lean_ctor_set_uint8(x_72, sizeof(void*)*1 + 5, x_68);
+lean_ctor_set_uint8(x_72, sizeof(void*)*1 + 6, x_69);
+x_73 = lean_alloc_ctor(0, 3, 0);
+lean_ctor_set(x_73, 0, x_72);
+lean_ctor_set(x_73, 1, x_61);
+lean_ctor_set(x_73, 2, x_62);
+x_74 = l_Lean_Meta_synthInstance_x3f(x_1, x_73, x_3);
+if (lean_obj_tag(x_74) == 0)
+{
+lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
+x_75 = lean_ctor_get(x_74, 0);
+lean_inc(x_75);
+x_76 = lean_ctor_get(x_74, 1);
+lean_inc(x_76);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_77 = x_74;
+} else {
+ lean_dec_ref(x_74);
+ x_77 = lean_box(0);
+}
+x_78 = l_Option_toLOption___rarg(x_75);
+lean_dec(x_75);
+if (lean_is_scalar(x_77)) {
+ x_79 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_79 = x_77;
+}
+lean_ctor_set(x_79, 0, x_78);
+lean_ctor_set(x_79, 1, x_76);
+return x_79;
+}
+else
+{
+lean_object* x_80; 
+x_80 = lean_ctor_get(x_74, 0);
+lean_inc(x_80);
+switch (lean_obj_tag(x_80)) {
+case 11:
+{
+lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; 
+lean_dec(x_80);
+x_81 = lean_ctor_get(x_74, 1);
+lean_inc(x_81);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_82 = x_74;
+} else {
+ lean_dec_ref(x_74);
+ x_82 = lean_box(0);
+}
+x_83 = lean_box(2);
+if (lean_is_scalar(x_82)) {
+ x_84 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_84 = x_82;
+ lean_ctor_set_tag(x_84, 0);
+}
+lean_ctor_set(x_84, 0, x_83);
+lean_ctor_set(x_84, 1, x_81);
+return x_84;
+}
+case 12:
+{
+lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; 
+lean_dec(x_80);
+x_85 = lean_ctor_get(x_74, 1);
+lean_inc(x_85);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_86 = x_74;
+} else {
+ lean_dec_ref(x_74);
+ x_86 = lean_box(0);
+}
+x_87 = lean_box(2);
+if (lean_is_scalar(x_86)) {
+ x_88 = lean_alloc_ctor(0, 2, 0);
+} else {
+ x_88 = x_86;
+ lean_ctor_set_tag(x_88, 0);
+}
+lean_ctor_set(x_88, 0, x_87);
+lean_ctor_set(x_88, 1, x_85);
+return x_88;
+}
+default: 
+{
+lean_object* x_89; lean_object* x_90; lean_object* x_91; 
+x_89 = lean_ctor_get(x_74, 1);
+lean_inc(x_89);
+if (lean_is_exclusive(x_74)) {
+ lean_ctor_release(x_74, 0);
+ lean_ctor_release(x_74, 1);
+ x_90 = x_74;
+} else {
+ lean_dec_ref(x_74);
+ x_90 = lean_box(0);
+}
+if (lean_is_scalar(x_90)) {
+ x_91 = lean_alloc_ctor(1, 2, 0);
+} else {
+ x_91 = x_90;
+}
+lean_ctor_set(x_91, 0, x_80);
+lean_ctor_set(x_91, 1, x_89);
+return x_91;
+}
+}
+}
+}
+}
+}
+lean_object* l_Lean_Meta_synthInstance(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+lean_inc(x_2);
+lean_inc(x_1);
+x_4 = l_Lean_Meta_synthInstance_x3f(x_1, x_2, x_3);
+if (lean_obj_tag(x_4) == 0)
+{
+lean_object* x_5; 
+x_5 = lean_ctor_get(x_4, 0);
+lean_inc(x_5);
+if (lean_obj_tag(x_5) == 0)
+{
+uint8_t x_6; 
+x_6 = !lean_is_exclusive(x_4);
+if (x_6 == 0)
+{
+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; 
+x_7 = lean_ctor_get(x_4, 1);
+x_8 = lean_ctor_get(x_4, 0);
+lean_dec(x_8);
+x_9 = lean_ctor_get(x_7, 0);
+lean_inc(x_9);
+x_10 = lean_ctor_get(x_7, 1);
+lean_inc(x_10);
+x_11 = lean_ctor_get(x_2, 1);
+lean_inc(x_11);
+x_12 = lean_ctor_get(x_2, 0);
+lean_inc(x_12);
+lean_dec(x_2);
+x_13 = lean_ctor_get(x_12, 0);
+lean_inc(x_13);
+lean_dec(x_12);
+x_14 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_14, 0, x_9);
+lean_ctor_set(x_14, 1, x_10);
+lean_ctor_set(x_14, 2, x_11);
+lean_ctor_set(x_14, 3, x_13);
+x_15 = lean_alloc_ctor(17, 2, 0);
+lean_ctor_set(x_15, 0, x_1);
+lean_ctor_set(x_15, 1, x_14);
+lean_ctor_set_tag(x_4, 1);
+lean_ctor_set(x_4, 0, x_15);
+return x_4;
+}
+else
+{
+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; 
+x_16 = lean_ctor_get(x_4, 1);
+lean_inc(x_16);
+lean_dec(x_4);
+x_17 = lean_ctor_get(x_16, 0);
+lean_inc(x_17);
+x_18 = lean_ctor_get(x_16, 1);
+lean_inc(x_18);
+x_19 = lean_ctor_get(x_2, 1);
+lean_inc(x_19);
+x_20 = lean_ctor_get(x_2, 0);
+lean_inc(x_20);
+lean_dec(x_2);
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+lean_dec(x_20);
+x_22 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_22, 0, x_17);
+lean_ctor_set(x_22, 1, x_18);
+lean_ctor_set(x_22, 2, x_19);
+lean_ctor_set(x_22, 3, x_21);
+x_23 = lean_alloc_ctor(17, 2, 0);
+lean_ctor_set(x_23, 0, x_1);
+lean_ctor_set(x_23, 1, x_22);
+x_24 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_24, 0, x_23);
+lean_ctor_set(x_24, 1, x_16);
+return x_24;
+}
+}
+else
+{
+uint8_t x_25; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_25 = !lean_is_exclusive(x_4);
+if (x_25 == 0)
+{
+lean_object* x_26; lean_object* x_27; 
+x_26 = lean_ctor_get(x_4, 0);
+lean_dec(x_26);
+x_27 = lean_ctor_get(x_5, 0);
+lean_inc(x_27);
+lean_dec(x_5);
+lean_ctor_set(x_4, 0, x_27);
+return x_4;
+}
+else
+{
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_4, 1);
+lean_inc(x_28);
+lean_dec(x_4);
+x_29 = lean_ctor_get(x_5, 0);
+lean_inc(x_29);
+lean_dec(x_5);
+x_30 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 1, x_28);
+return x_30;
+}
+}
+}
+else
+{
+uint8_t x_31; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_31 = !lean_is_exclusive(x_4);
+if (x_31 == 0)
+{
+return x_4;
+}
+else
+{
+lean_object* x_32; lean_object* x_33; lean_object* x_34; 
+x_32 = lean_ctor_get(x_4, 0);
+x_33 = lean_ctor_get(x_4, 1);
+lean_inc(x_33);
+lean_inc(x_32);
+lean_dec(x_4);
+x_34 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_34, 0, x_32);
+lean_ctor_set(x_34, 1, x_33);
+return x_34;
+}
+}
+}
+}
+lean_object* l___private_Init_Lean_Meta_SynthInstance_7__regTraceClasses(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
@@ -22866,6 +23059,12 @@ l_Lean_Meta_SynthInstance_synth___main___closed__5 = _init_l_Lean_Meta_SynthInst
 lean_mark_persistent(l_Lean_Meta_SynthInstance_synth___main___closed__5);
 l_Lean_Meta_SynthInstance_synth___main___closed__6 = _init_l_Lean_Meta_SynthInstance_synth___main___closed__6();
 lean_mark_persistent(l_Lean_Meta_SynthInstance_synth___main___closed__6);
+l_Lean_Meta_SynthInstance_synth___main___closed__7 = _init_l_Lean_Meta_SynthInstance_synth___main___closed__7();
+lean_mark_persistent(l_Lean_Meta_SynthInstance_synth___main___closed__7);
+l_Lean_Meta_SynthInstance_synth___main___closed__8 = _init_l_Lean_Meta_SynthInstance_synth___main___closed__8();
+lean_mark_persistent(l_Lean_Meta_SynthInstance_synth___main___closed__8);
+l_Lean_Meta_SynthInstance_synth___main___closed__9 = _init_l_Lean_Meta_SynthInstance_synth___main___closed__9();
+lean_mark_persistent(l_Lean_Meta_SynthInstance_synth___main___closed__9);
 l_Lean_Meta_SynthInstance_main___closed__1 = _init_l_Lean_Meta_SynthInstance_main___closed__1();
 lean_mark_persistent(l_Lean_Meta_SynthInstance_main___closed__1);
 l_Lean_Meta_SynthInstance_main___closed__2 = _init_l_Lean_Meta_SynthInstance_main___closed__2();
@@ -22880,7 +23079,20 @@ l___private_Init_Lean_Meta_SynthInstance_4__preprocessArgs___main___closed__1 =
 lean_mark_persistent(l___private_Init_Lean_Meta_SynthInstance_4__preprocessArgs___main___closed__1);
 l___private_Init_Lean_Meta_SynthInstance_4__preprocessArgs___main___closed__2 = _init_l___private_Init_Lean_Meta_SynthInstance_4__preprocessArgs___main___closed__2();
 lean_mark_persistent(l___private_Init_Lean_Meta_SynthInstance_4__preprocessArgs___main___closed__2);
-res = l___private_Init_Lean_Meta_SynthInstance_6__regTraceClasses(lean_io_mk_world());
+l_Lean_Meta_maxStepsOption___closed__1 = _init_l_Lean_Meta_maxStepsOption___closed__1();
+lean_mark_persistent(l_Lean_Meta_maxStepsOption___closed__1);
+l_Lean_Meta_maxStepsOption___closed__2 = _init_l_Lean_Meta_maxStepsOption___closed__2();
+lean_mark_persistent(l_Lean_Meta_maxStepsOption___closed__2);
+l_Lean_Meta_maxStepsOption___closed__3 = _init_l_Lean_Meta_maxStepsOption___closed__3();
+lean_mark_persistent(l_Lean_Meta_maxStepsOption___closed__3);
+l_Lean_Meta_maxStepsOption___closed__4 = _init_l_Lean_Meta_maxStepsOption___closed__4();
+lean_mark_persistent(l_Lean_Meta_maxStepsOption___closed__4);
+l_Lean_Meta_maxStepsOption___closed__5 = _init_l_Lean_Meta_maxStepsOption___closed__5();
+lean_mark_persistent(l_Lean_Meta_maxStepsOption___closed__5);
+res = l_Lean_Meta_maxStepsOption(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+res = l___private_Init_Lean_Meta_SynthInstance_7__regTraceClasses(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_mk_io_result(lean_box(0));
diff --git a/stage0/stdlib/Init/Lean/Meta/Tactic/Util.c b/stage0/stdlib/Init/Lean/Meta/Tactic/Util.c
index 51be908042..bfd3aff62c 100644
--- a/stage0/stdlib/Init/Lean/Meta/Tactic/Util.c
+++ b/stage0/stdlib/Init/Lean/Meta/Tactic/Util.c
@@ -14,13 +14,13 @@
 extern "C" {
 #endif
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 lean_object* l_Lean_Meta_checkNotAssigned___closed__1;
 extern lean_object* l_Lean_formatDataValue___closed__1;
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_checkNotAssigned___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_metavar_ctx_is_expr_assigned(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getMVarType(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
 lean_object* l___private_Init_Lean_Meta_Tactic_Util_1__regTraceClasses(lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getMVarType___boxed(lean_object*, lean_object*, lean_object*);
@@ -170,7 +170,7 @@ lean_object* _init_l___private_Init_Lean_Meta_Tactic_Util_1__regTraceClasses___c
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Meta_Basic_11__regTraceClasses___closed__2;
+x_1 = l___private_Init_Lean_Meta_Basic_10__regTraceClasses___closed__2;
 x_2 = l___private_Init_Lean_Meta_Tactic_Util_1__regTraceClasses___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
diff --git a/stage0/stdlib/Init/Lean/Parser/Module.c b/stage0/stdlib/Init/Lean/Parser/Module.c
index 92ace0d490..61ec59f9a9 100644
--- a/stage0/stdlib/Init/Lean/Parser/Module.c
+++ b/stage0/stdlib/Init/Lean/Parser/Module.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Lean.Parser.Module
-// Imports: Init.Lean.Util.Message Init.Lean.Parser.Command
+// Imports: Init.Lean.Message Init.Lean.Parser.Command
 #include "runtime/lean.h"
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -2999,14 +2999,14 @@ lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* initialize_Init_Lean_Util_Message(lean_object*);
+lean_object* initialize_Init_Lean_Message(lean_object*);
 lean_object* initialize_Init_Lean_Parser_Command(lean_object*);
 static bool _G_initialized = false;
 lean_object* initialize_Init_Lean_Parser_Module(lean_object* w) {
 lean_object * res;
 if (_G_initialized) return lean_mk_io_result(lean_box(0));
 _G_initialized = true;
-res = initialize_Init_Lean_Util_Message(lean_io_mk_world());
+res = initialize_Init_Lean_Message(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 res = initialize_Init_Lean_Parser_Command(lean_io_mk_world());
diff --git a/stage0/stdlib/Init/Lean/Parser/Parser.c b/stage0/stdlib/Init/Lean/Parser/Parser.c
index 1a3090ffab..3c06849f7d 100644
--- a/stage0/stdlib/Init/Lean/Parser/Parser.c
+++ b/stage0/stdlib/Init/Lean/Parser/Parser.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Lean.Parser.Parser
-// Imports: Init.Lean.Data.Trie Init.Lean.Data.Position Init.Lean.Syntax Init.Lean.ToExpr Init.Lean.Environment Init.Lean.Attributes Init.Lean.Util.Message Init.Lean.Parser.Identifier Init.Lean.Compiler.InitAttr
+// Imports: Init.Lean.Data.Trie Init.Lean.Data.Position Init.Lean.Syntax Init.Lean.ToExpr Init.Lean.Environment Init.Lean.Attributes Init.Lean.Message Init.Lean.Parser.Identifier Init.Lean.Compiler.InitAttr
 #include "runtime/lean.h"
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -36143,7 +36143,7 @@ lean_object* initialize_Init_Lean_Syntax(lean_object*);
 lean_object* initialize_Init_Lean_ToExpr(lean_object*);
 lean_object* initialize_Init_Lean_Environment(lean_object*);
 lean_object* initialize_Init_Lean_Attributes(lean_object*);
-lean_object* initialize_Init_Lean_Util_Message(lean_object*);
+lean_object* initialize_Init_Lean_Message(lean_object*);
 lean_object* initialize_Init_Lean_Parser_Identifier(lean_object*);
 lean_object* initialize_Init_Lean_Compiler_InitAttr(lean_object*);
 static bool _G_initialized = false;
@@ -36169,7 +36169,7 @@ lean_dec_ref(res);
 res = initialize_Init_Lean_Attributes(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = initialize_Init_Lean_Util_Message(lean_io_mk_world());
+res = initialize_Init_Lean_Message(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 res = initialize_Init_Lean_Parser_Identifier(lean_io_mk_world());
diff --git a/stage0/stdlib/Init/Lean/Util/Sorry.c b/stage0/stdlib/Init/Lean/Util/Sorry.c
index 8b5efa8599..ccd2d33424 100644
--- a/stage0/stdlib/Init/Lean/Util/Sorry.c
+++ b/stage0/stdlib/Init/Lean/Util/Sorry.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Lean.Util.Sorry
-// Imports: Init.Lean.Util.Message
+// Imports: Init.Lean.Message
 #include "runtime/lean.h"
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -910,13 +910,13 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
-lean_object* initialize_Init_Lean_Util_Message(lean_object*);
+lean_object* initialize_Init_Lean_Message(lean_object*);
 static bool _G_initialized = false;
 lean_object* initialize_Init_Lean_Util_Sorry(lean_object* w) {
 lean_object * res;
 if (_G_initialized) return lean_mk_io_result(lean_box(0));
 _G_initialized = true;
-res = initialize_Init_Lean_Util_Message(lean_io_mk_world());
+res = initialize_Init_Lean_Message(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_Expr_isSorry___closed__1 = _init_l_Lean_Expr_isSorry___closed__1();
diff --git a/stage0/stdlib/Init/Lean/Util/Trace.c b/stage0/stdlib/Init/Lean/Util/Trace.c
index 87c8e0dd86..cbb60eb7e1 100644
--- a/stage0/stdlib/Init/Lean/Util/Trace.c
+++ b/stage0/stdlib/Init/Lean/Util/Trace.c
@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Lean.Util.Trace
-// Imports: Init.Lean.Util.Message
+// Imports: Init.Lean.Message
 #include "runtime/lean.h"
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -1887,13 +1887,13 @@ x_6 = lean_register_option(x_4, x_5, x_2);
 return x_6;
 }
 }
-lean_object* initialize_Init_Lean_Util_Message(lean_object*);
+lean_object* initialize_Init_Lean_Message(lean_object*);
 static bool _G_initialized = false;
 lean_object* initialize_Init_Lean_Util_Trace(lean_object* w) {
 lean_object * res;
 if (_G_initialized) return lean_mk_io_result(lean_box(0));
 _G_initialized = true;
-res = initialize_Init_Lean_Util_Message(lean_io_mk_world());
+res = initialize_Init_Lean_Message(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 l_Lean_checkTraceOption___closed__1 = _init_l_Lean_checkTraceOption___closed__1();