firefly-compiler 0.4.20 → 0.4.22

package/output/js/ff/compiler/Inference.mjs

@@ -124,20 +124,14 @@ return ((("ff:core/" + name_) + ".") + name_)
 export function constraintsToInstances_(constraints_) {
 return ff_core_List.List_toMap(ff_core_List.List_map(constraints_, ((c_) => {
 const typeName_ = (((_1) => {
-{
 if(_1.TConstructor) {
 const name_ = _1.name_;
 return name_
-return
 }
-}
-{
 if(_1.TVariable) {
 const at_ = _1.at_;
 const i_ = _1.index_;
 return ff_compiler_Inference.fail_(c_.at_, ("Unexpected unification variable: $" + i_))
-return
-}
 }
 }))(ff_core_List.List_grabFirst(c_.generics_));
 return ff_core_Pair.Pair(ff_compiler_Unification.InstanceKey(c_.name_, typeName_), ff_compiler_Unification.InstanceValue([], [], ff_compiler_Syntax.PackagePair("", ""), "", c_.name_, c_.generics_))
@@ -159,20 +153,14 @@ return ((("ff:core/" + name_) + ".") + name_)
 export async function constraintsToInstances_$(constraints_, $task) {
 return ff_core_List.List_toMap(ff_core_List.List_map(constraints_, ((c_) => {
 const typeName_ = (((_1) => {
-{
 if(_1.TConstructor) {
 const name_ = _1.name_;
 return name_
-return
 }
-}
-{
 if(_1.TVariable) {
 const at_ = _1.at_;
 const i_ = _1.index_;
 return ff_compiler_Inference.fail_(c_.at_, ("Unexpected unification variable: $" + i_))
-return
-}
 }
 }))(ff_core_List.List_grabFirst(c_.generics_));
 return ff_core_Pair.Pair(ff_compiler_Unification.InstanceKey(c_.name_, typeName_), ff_compiler_Unification.InstanceValue([], [], ff_compiler_Syntax.PackagePair("", ""), "", c_.name_, c_.generics_))
@@ -209,7 +197,6 @@ const _1 = definition_;
 {
 const _c = _1;
 return ff_compiler_Syntax.DTrait(_c.at_, _c.name_, _c.generics_, _c.constraints_, _c.generatorParameters_, _c.methods_, _c.methodDefaults_, _c.methodGenerators_)
-return
 }
 }
 }
@@ -257,7 +244,6 @@ const _1 = p_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Parameter(_c.at_, _c.mutable_, _c.name_, ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, p_.valueType_), _c.default_)
-return
 }
 }
 }));
@@ -298,7 +284,6 @@ const _1 = definition_;
 {
 const _c = _1;
 return ff_compiler_Syntax.DLet(_c.at_, _c.name_, _c.variableType_, value_)
-return
 }
 }
 }
@@ -320,7 +305,6 @@ const _1 = case_;
 {
 const _c = _1;
 return ff_compiler_Syntax.MatchCase(_c.at_, [ff_compiler_Syntax.PVariable(method_.at_, ff_core_Option.None()), ...case_.patterns_], _c.guards_, _c.body_)
-return
 }
 }
 })))
@@ -340,7 +324,6 @@ const _1 = definition_;
 {
 const _c = _1;
 return ff_compiler_Syntax.DExtend(_c.at_, _c.name_, _c.generics_, _c.constraints_, _c.type_, functions_)
-return
 }
 }
 }
@@ -383,35 +366,25 @@ return
 export function Inference_inferLambda(self_, environment_, expected_, lambda_) {
 const unitName_ = ff_compiler_Inference.core_("Unit");
 const returnsUnit_ = (((_1) => {
-{
 if(_1.TConstructor) {
 const name_ = _1.name_;
 const ts_ = _1.generics_;
-const _guard1 = ff_core_String.String_startsWith(name_, "Function$", 0);
-if(_guard1) {
+if(ff_core_String.String_startsWith(name_, "Function$", 0)) {
 {
 const _1 = ff_core_List.List_grabLast(ts_);
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const n_ = _1.name_;
-if(_1.generics_.length === 0) {
 return (n_ === unitName_)
-return
-}
-}
 }
 {
 return false
-return
 }
 }
 return
 }
 }
-}
 {
 return false
-return
 }
 }))(ff_compiler_Unification.Unification_substitute(self_.unification_, expected_));
 const cases_ = ((!returnsUnit_)
@@ -422,7 +395,6 @@ const _1 = c_;
 {
 const _c = _1;
 return ff_compiler_Syntax.MatchCase(_c.at_, _c.patterns_, _c.guards_, ff_compiler_Syntax.ESequential(c_.at_, c_.body_, ff_compiler_Syntax.EVariant(c_.at_, unitName_, [], ff_core_Option.None())))
-return
 }
 }
 })));
@@ -460,7 +432,6 @@ const at_ = _2.first_;
 const type_ = _2.second_;
 const noEffect_ = ff_compiler_Syntax.TConstructor(at_, "ff:core/Nothing.Nothing", []);
 return ff_compiler_Environment.Scheme(true, false, false, false, ff_compiler_Syntax.Signature(at_, name_, false, [], [], [], type_, noEffect_))
-return
 }
 }), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 {
@@ -468,7 +439,6 @@ const _1 = environment_;
 {
 const _c = _1;
 return ff_compiler_Environment.Environment(_c.modulePrefix_, ff_core_Map.Map_addAll(environment1_.symbols_, symbols_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.traits_, _c.imports_, _c.effect_, _c.selfVariable_)
-return
 }
 }
 return
@@ -485,7 +455,6 @@ const at_ = _2.first_;
 const type_ = _2.second_;
 const noEffect_ = ff_compiler_Syntax.TConstructor(at_, "ff:core/Nothing.Nothing", []);
 return ff_compiler_Environment.Scheme(true, false, false, false, ff_compiler_Syntax.Signature(at_, name_, false, [], [], [], type_, noEffect_))
-return
 }
 }), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 ff_core_Array.Array_push(guards_, (((_c) => {
@@ -496,7 +465,6 @@ const _1 = environment2_;
 {
 const _c = _1;
 return ff_compiler_Environment.Environment(_c.modulePrefix_, ff_core_Map.Map_addAll(environment2_.symbols_, symbols_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.traits_, _c.imports_, _c.effect_, _c.selfVariable_)
-return
 }
 }
 }));
@@ -505,7 +473,6 @@ const _1 = case_;
 {
 const _c = _1;
 return ff_compiler_Syntax.MatchCase(_c.at_, _c.patterns_, ff_core_Array.Array_drain(guards_), ff_compiler_Inference.Inference_inferTerm(self_, environment3_, returnType_, case_.body_))
-return
 }
 }
 }
@@ -513,24 +480,17 @@ return
 export function Inference_inferPattern(self_, environment_, expected_, pattern_) {
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 if((((_1) => {
-{
 if(_1.PVariantAs) {
 const at_ = _1.at_;
 const variableAt_ = _1.variableAt_;
 return ((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, at_) || ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, variableAt_)) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, variableAt_))
-return
 }
-}
-{
 if(_1.PAlias) {
 const at_ = _1.at_;
 return (ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, at_))
-return
-}
 }
 {
 return ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, pattern_.at_)
-return
 }
 }))(pattern_)) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferPatternHook(self_.unification_, environment_, expected_, pattern_))
@@ -542,53 +502,30 @@ return ff_core_Map.empty_()
 }
 {
 const _1 = pattern_;
-{
 if(_1.PString) {
 return literal_("String")
-return
-}
 }
-{
 if(_1.PInt) {
 return literal_("Int")
-return
 }
-}
-{
 if(_1.PChar) {
 return literal_("Char")
-return
-}
 }
-{
-if(_1.PVariable) {
+if(_1.PVariable && _1.name_.None) {
 const at_ = _1.at_;
-if(_1.name_.None) {
 return ff_core_Map.empty_()
-return
-}
 }
-}
-{
-if(_1.PVariable) {
+if(_1.PVariable && _1.name_.Some) {
 const at_ = _1.at_;
-if(_1.name_.Some) {
 const name_ = _1.name_.value_;
 return ff_core_List.List_toMap([ff_core_Pair.Pair(name_, ff_core_Pair.Pair(at_, expected_))], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
 }
-}
-}
-{
 if(_1.PAlias) {
 const at_ = _1.at_;
 const pattern_ = _1.pattern_;
 const variable_ = _1.variable_;
 return ff_core_Map.Map_add(ff_compiler_Inference.Inference_inferPattern(self_, environment_, expected_, pattern_), variable_, ff_core_Pair.Pair(at_, expected_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
 }
-}
-{
 if(_1.PVariantAs) {
 const at_ = _1.at_;
 const name_ = _1.name_;
@@ -614,44 +551,24 @@ return ff_core_Pair.Pair(_w1, ff_core_Pair.Pair(variableAt_, recordType_))
 })), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 return
 }
-}
-{
-if(_1.PVariant) {
+if(_1.PVariant && _1.name_ === "List$Empty" && _1.patterns_.length === 0) {
 const at_ = _1.at_;
-if(_1.name_ === "List$Empty") {
-if(_1.patterns_.length === 0) {
 const itemType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, at_);
 const listType_ = ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("List"), [itemType_]);
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, expected_, listType_);
 return ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
-}
-}
 }
-}
-{
-if(_1.PVariant) {
+if(_1.PVariant && _1.name_ === "List$Link" && _1.patterns_.length === 2) {
 const at_ = _1.at_;
-if(_1.name_ === "List$Link") {
-if(_1.patterns_.length > 0) {
 const head_ = _1.patterns_[0];
-if(_1.patterns_.length > 1) {
 const tail_ = _1.patterns_[1];
-if(_1.patterns_.length === 2) {
 const itemType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, at_);
 const listType_ = ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("List"), [itemType_]);
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, expected_, listType_);
 const headVariables_ = ff_compiler_Inference.Inference_inferPattern(self_, environment_, itemType_, head_);
 const tailVariables_ = ff_compiler_Inference.Inference_inferPattern(self_, environment_, listType_, tail_);
 return ff_core_Map.Map_addAll(headVariables_, tailVariables_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
 }
-}
-}
-}
-}
-}
-{
 if(_1.PVariant) {
 const at_ = _1.at_;
 const name_ = _1.name_;
@@ -668,7 +585,6 @@ return ff_core_List.List_foldLeft(ff_core_List.List_map(ff_core_List.List_zip(pa
 const pattern_ = _1.first_;
 const parameter_ = _1.second_;
 return ff_compiler_Inference.Inference_inferPattern(self_, environment_, parameter_.valueType_, pattern_)
-return
 }
 })), ff_core_Map.empty_(), ((_w1, _w2) => {
 return ff_core_Map.Map_addAll(_w1, _w2, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
@@ -677,7 +593,6 @@ return
 }
 }
 }
-}
 
 export function Inference_inferTerm(self_, environment_, expected_, term_) {
 const hookRecordTypeBox_ = (ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)
@@ -693,31 +608,18 @@ return term_
 }
 {
 const _1 = term_;
-{
 if(_1.EString) {
 return literal_("String")
-return
 }
-}
-{
 if(_1.EChar) {
 return literal_("Char")
-return
-}
 }
-{
 if(_1.EInt) {
 return literal_("Int")
-return
 }
-}
-{
 if(_1.EFloat) {
 return literal_("Float")
-return
-}
 }
-{
 if(_1.EVariable) {
 const e_ = _1;
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.name_, [], ff_core_Option.None()), ((instantiated_) => {
@@ -732,8 +634,6 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 }))
 return
 }
-}
-{
 if(_1.EField) {
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
@@ -745,13 +645,11 @@ _w1.value_ = ff_core_Option.Some(recordType_)
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, e_.record_);
 {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, recordType_);
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
-const _guard1 = ff_core_String.String_startsWith(name_, "Record$", 0);
-if(_guard1) {
+if(ff_core_String.String_startsWith(name_, "Record$", 0)) {
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, e_.at_)) {
 const symbolHook_ = ff_compiler_LspHook.SymbolHook(e_.field_, e_.at_, e_.at_);
 const noEffect_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
@@ -763,14 +661,13 @@ return (_w1.second_ === e_.field_)
 })), ((_w1) => {
 return _w1.first_
 })), ((index_) => {
-const t1_ = ff_core_List.List_grab(typeArguments_, index_);
+const t1_ = (typeArguments_[index_] ?? ff_core_List.internalGrab_(typeArguments_, index_));
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_);
 {
 const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EField(_c.at_, _c.newtype_, record_, _c.field_)
-return
 }
 }
 })), (() => {
@@ -783,31 +680,24 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 return
 }
 }
-}
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
 const memberPrefix_ = (name_ + "_");
 const memberName_ = (memberPrefix_ + e_.field_);
 {
 const _1 = ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, memberName_, typeArguments_, ff_core_Option.None());
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
-const _guard1 = (!instantiated_.scheme_.isVariable_);
-if(_guard1) {
+if((!instantiated_.scheme_.isVariable_)) {
 const signature_ = (((_c) => {
 return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, _c.generics_, _c.constraints_, ff_core_List.List_dropFirst(instantiated_.scheme_.signature_.parameters_, 1), _c.returnType_, _c.effect_)
 }))(instantiated_.scheme_.signature_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, recordType_, ff_core_List.List_grab(instantiated_.scheme_.signature_.parameters_, 0).valueType_);
 return ff_compiler_Inference.Inference_inferEtaExpansion(self_, environment_, expected_, e_.at_, signature_, term_)
-return
-}
 }
 }
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, instantiated_.scheme_.signature_.returnType_);
@@ -816,43 +706,26 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EField(_c.at_, instantiated_.scheme_.isNewtype_, record_, _c.field_)
-return
 }
 }
 return
 }
-}
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
-}
-{
-if(_1.TVariable) {
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
+if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return term_
-return
 }
-}
-}
-{
 if(_1.TVariable) {
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
-}
-{
 if(_1.EWildcard) {
 const e_ = _1;
 return ff_core_Option.Option_grab(ff_core_Option.Option_map(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, ("_w" + e_.index_), [], ff_core_Option.None()), ((instantiated_) => {
@@ -861,8 +734,6 @@ return term_
 })))
 return
 }
-}
-{
 if(_1.EList) {
 const at_ = _1.at_;
 const t_ = _1.elementType_;
@@ -881,8 +752,6 @@ return
 })))
 return
 }
-}
-{
 if(_1.ESequential) {
 const at_ = _1.at_;
 const before_ = _1.before_;
@@ -893,12 +762,10 @@ ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferSequen
 const newExpected_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, at_);
 {
 const _1 = before_;
-{
-if(_1.EPipe) {
+if(_1.EPipe && _1.function_.ELambda) {
 const at1_ = _1.at_;
 const value_ = _1.value_;
 const effect1_ = _1.effect_;
-if(_1.function_.ELambda) {
 const at2_ = _1.function_.at_;
 const at3_ = _1.function_.lambda_.at_;
 const effect3_ = _1.function_.lambda_.effect_;
@@ -910,42 +777,30 @@ const _1 = case_;
 {
 const _c = _1;
 return ff_compiler_Syntax.MatchCase(_c.at_, _c.patterns_, _c.guards_, ff_compiler_Syntax.ESequential(case_.at_, case_.body_, e_))
-return
 }
 }
 }));
 const newPipe_ = ff_compiler_Syntax.EPipe(at1_, value_, effect1_, ff_compiler_Syntax.ELambda(at2_, ff_compiler_Syntax.Lambda(at3_, effect3_, newCases_)));
 {
 const _1 = after_;
-{
-if(_1.EVariant) {
+if(_1.EVariant && _1.name_ === "ff:core/Unit.Unit") {
 const at_ = _1.at_;
-if(_1.name_ === "ff:core/Unit.Unit") {
 const unitType_ = ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("Unit"), []);
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, expected_, unitType_);
 return ff_compiler_Inference.Inference_inferTerm(self_, environment_, newExpected_, newPipe_)
-return
-}
-}
 }
 {
 return ff_compiler_Syntax.ESequential(at_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, newExpected_, newPipe_), ff_compiler_Inference.Inference_inferTerm(self_, environment_, expected_, after_))
-return
 }
 }
 return
 }
-}
-}
 {
 return ff_compiler_Syntax.ESequential(at_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, newExpected_, before_), ff_compiler_Inference.Inference_inferTerm(self_, environment_, expected_, after_))
-return
 }
 }
 return
 }
-}
-{
 if(_1.ELet) {
 const e_ = _1;
 const noEffect_ = ff_compiler_Syntax.TConstructor(e_.at_, "ff:core/Nothing.Nothing", []);
@@ -958,64 +813,29 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.ELet(_c.at_, _c.mutable_, _c.name_, _c.valueType_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, e_.valueType_, e_.value_), ff_compiler_Inference.Inference_inferTerm(self_, environment2_, expected_, e_.body_))
-return
 }
 }
 return
 }
-}
-{
 if(_1.ELambda) {
 const at_ = _1.at_;
 const l_ = _1.lambda_;
 do {
 const _1 = l_.cases_;
-{
-if(_1.length > 0) {
-if(_1[0].patterns_.length === 0) {
-if(_1[0].guards_.length === 0) {
-if(_1[0].body_.EVariable) {
+if(_1.length === 1 && _1[0].patterns_.length === 0 && _1[0].guards_.length === 0 && _1[0].body_.EVariable && _1[0].body_.name_ === "") {
 const insideAt_ = _1[0].body_.at_;
-if(_1[0].body_.name_ === "") {
-if(_1.length === 1) {
-const _guard1 = ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, insideAt_);
-if(_guard1) {
+if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, insideAt_)) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferLambdaStartHook(self_.unification_, environment_, expected_))
 break
 }
 }
-}
-}
-}
-}
-}
-}
-{
-if(_1.length > 0) {
-if(_1[0].patterns_.length === 0) {
-if(_1[0].guards_.length === 0) {
-if(_1[0].body_.ESequential) {
-if(_1[0].body_.before_.EVariable) {
+if(_1.length === 1 && _1[0].patterns_.length === 0 && _1[0].guards_.length === 0 && _1[0].body_.ESequential && _1[0].body_.before_.EVariable && _1[0].body_.before_.name_ === "" && _1[0].body_.after_.EVariant && _1[0].body_.after_.name_ === "ff:core/Unit.Unit") {
 const insideAt_ = _1[0].body_.before_.at_;
-if(_1[0].body_.before_.name_ === "") {
-if(_1[0].body_.after_.EVariant) {
-if(_1[0].body_.after_.name_ === "ff:core/Unit.Unit") {
-if(_1.length === 1) {
-const _guard1 = ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, insideAt_);
-if(_guard1) {
+if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, insideAt_)) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferLambdaStartHook(self_.unification_, environment_, expected_))
 break
 }
 }
-}
-}
-}
-}
-}
-}
-}
-}
-}
 {
 
 break
@@ -1023,10 +843,7 @@ break
 } while(false);
 const lambda_ = ff_compiler_Inference.Inference_inferLambda(self_, environment_, expected_, l_);
 return ff_compiler_Syntax.ELambda(at_, lambda_)
-return
 }
-}
-{
 if(_1.EVariant) {
 const e_ = _1;
 const instantiated_ = ff_core_Option.Option_else(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.name_, e_.typeArguments_, e_.arguments_), (() => {
@@ -1048,8 +865,6 @@ return
 }
 return
 }
-}
-{
 if(_1.EVariantIs) {
 const e_ = _1;
 const instantiated_ = ff_core_Option.Option_else(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.name_, e_.typeArguments_, ff_core_Option.None()), (() => {
@@ -1077,8 +892,6 @@ return
 }
 return
 }
-}
-{
 if(_1.ECopy) {
 const e_ = _1;
 const scheme_ = ff_core_Option.Option_else(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.name_, [], ff_core_Option.None()), (() => {
@@ -1105,7 +918,6 @@ const _1 = f_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, ff_core_Option.Some(f_.name_), _c.value_)
-return
 }
 }
 }));
@@ -1128,7 +940,6 @@ const at_ = _1.at_;
 const name_ = _1.name_;
 const value_ = _1.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, ("Unknown parameter: " + name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
 }
 }));
 const arguments_ = ff_core_List.List_map(parameterNames_, ((name_) => {
@@ -1139,7 +950,6 @@ return (_w1.name_ === name_)
 const at_ = _1.at_;
 const value_ = _1.value_;
 return ff_compiler_Syntax.Argument(at_, ff_core_Option.Some(name_), value_)
-return
 }
 })), (() => {
 const at_ = (((_c) => {
@@ -1152,10 +962,7 @@ const body_ = ff_compiler_Syntax.EVariant(e_.at_, e_.name_, [], ff_core_Option.S
 const effect_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const e1_ = ff_compiler_Syntax.EPipe(e_.at_, e_.record_, effect_, ff_compiler_Syntax.ELambda(e_.at_, ff_compiler_Syntax.Lambda(e_.at_, effect_, [ff_compiler_Syntax.MatchCase(e_.at_, [ff_compiler_Syntax.PVariable(e_.at_, ff_core_Option.Some("_c"))], [], body_)])));
 return ff_compiler_Inference.Inference_inferTerm(self_, environment_, expected_, e1_)
-return
 }
-}
-{
 if(_1.EPipe) {
 const e_ = _1;
 const valueType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
@@ -1168,47 +975,37 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EPipe(_c.at_, value_, _c.effect_, function_)
-return
 }
 }
 return
 }
-}
-{
 if(_1.ECall) {
 const e_ = _1;
 if((ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_) && (((_1) => {
-{
 if(_1.StaticCall) {
 return true
-return
-}
 }
 {
 return false
-return
 }
 }))(e_.target_))) {
 return term_
 } else {
 const call_ = (((_1) => {
-{
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
-return
+return {
+function_: call_.function_,
+tailCall_: call_.tailCall_
 }
+return
 }
-{
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in the Inference phase")
-return
-}
 }
 }))(e_.target_);
 {
 const _1 = call_.function_;
-{
 if(_1.EVariable) {
 const variableAt_ = _1.at_;
 const x_ = _1.name_;
@@ -1219,7 +1016,6 @@ return ff_compiler_Inference.Inference_inferOperator(self_, environment_, expect
 } else {
 {
 const _1 = ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, x_, e_.typeArguments_, ff_core_Option.Some(e_.arguments_));
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
 if(instantiated_.scheme_.isVariable_) {
@@ -1230,19 +1026,13 @@ return ff_compiler_Inference.Inference_inferFunctionCall(self_, environment_, ex
 }
 return
 }
-}
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(variableAt_, ("No such function: " + x_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 }
 return
 }
-}
-{
 if(_1.EField) {
 const f_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, f_.at_);
@@ -1261,71 +1051,46 @@ return ff_compiler_Syntax.EField(_c.at_, _c.newtype_, record_, _c.field_)
 }))(e_);
 {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, recordType_);
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const methodName_ = ((name_ + "_") + f_.field_);
 const arguments_ = [ff_compiler_Syntax.Argument(f_.record_.at_, ff_core_Option.None(), f_.record_), ...e_.arguments_];
 {
 const _1 = ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, f_.at_, methodName_, [], ff_core_Option.Some(arguments_));
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
-const _guard1 = (!instantiated_.scheme_.isVariable_);
-if(_guard1) {
+if((!instantiated_.scheme_.isVariable_)) {
 return ff_compiler_Inference.Inference_inferMethodCall(self_, environment_, expected_, instantiated_.scheme_.signature_, instantiated_.typeArguments_, e2_, record_, recordType_, methodName_)
-return
 }
 }
-}
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, e2_)
-return
-}
 }
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, ((("No such field " + f_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
-}
-{
-if(_1.TVariable) {
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
+if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, e2_)
-return
-}
 }
-}
-{
 if(_1.TVariable) {
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, ((("No such field " + f_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
-}
 {
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, term_)
-return
 }
 }
 }
 return
 }
-}
-{
 if(_1.ERecord) {
 const e_ = _1;
 const fields_ = ff_core_List.List_sortBy(e_.fields_, ((_w1) => {
@@ -1347,7 +1112,6 @@ const _1 = field_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Field(_c.at_, _c.name_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, field_.value_))
-return
 }
 }
 return
@@ -1358,13 +1122,10 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.ERecord(_c.at_, newFields_)
-return
 }
 }
 return
 }
-}
-{
 if(_1.EFunctions) {
 const at_ = _1.at_;
 const functions_ = _1.functions_;
@@ -1381,10 +1142,7 @@ return ff_compiler_Inference.Inference_inferFunctionDefinition(self_, environmen
 }));
 const newBody_ = ff_compiler_Inference.Inference_inferTerm(self_, environment2_, expected_, body_);
 return ff_compiler_Syntax.EFunctions(at_, newFunctions_, newBody_)
-return
-}
 }
-{
 if(_1.EAssign) {
 const e_ = _1;
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.variable_, [], ff_core_Option.None()), ((instantiated_) => {
@@ -1395,7 +1153,6 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EAssign(_c.at_, _c.operator_, _c.variable_, value_)
-return
 }
 }
 } else {
@@ -1406,91 +1163,63 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 }))
 return
 }
-}
-{
 if(_1.EAssignField) {
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, e_.record_);
 {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, recordType_);
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
-const _guard1 = ff_core_String.String_startsWith(name_, "Record$", 0);
-if(_guard1) {
+if(ff_core_String.String_startsWith(name_, "Record$", 0)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ("Can't assign fields of anonymous records: " + e_.field_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
 }
 }
-}
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
 const methodName_ = ((name_ + "_") + e_.field_);
 {
 const _1 = ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, methodName_, typeArguments_, ff_core_Option.None());
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
-const _guard1 = (instantiated_.scheme_.isMutable_ || ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_));
-if(_guard1) {
+if((instantiated_.scheme_.isMutable_ || ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_))) {
 const value_ = ff_compiler_Inference.Inference_inferAssignment(self_, environment_, expected_, e_.at_, e_.operator_, e_.value_, instantiated_.scheme_.signature_);
 {
 const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EAssignField(_c.at_, _c.operator_, record_, _c.field_, value_)
-return
 }
 }
 return
 }
 }
-}
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("Can't assign an immutable field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
 }
-}
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
+if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
+return term_
 }
-{
 if(_1.TVariable) {
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
-return term_
-return
-}
-}
-}
-{
-if(_1.TVariable) {
-const index_ = _1.index_;
-throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
+const index_ = _1.index_;
+throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
 }
 }
 return
 }
 }
 }
-}
 
 export function Inference_inferAssignment(self_, environment_, expected_, at_, operator_, value_, signature_) {
 const t_ = signature_.returnType_;
@@ -1505,32 +1234,17 @@ return newValue_
 }
 
 export function Inference_inferMethodCall(self_, environment_, expected_, signature_, instantiation_, term_, record_, recordType_, name_) {
-const e_ = (((_1) => {
 {
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-return
-}
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-return
-}
-}))(term_);
-const call_ = (((_1) => {
-{
+const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
-return
-}
+return call_.tailCall_
 }
-{
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferMethodCall")
-return
-}
 }
 }))(e_.target_);
 const selfParameter_ = ff_core_List.List_grabFirst(signature_.parameters_);
@@ -1543,41 +1257,32 @@ ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signat
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, call_.tailCall_, false), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, false), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), [selfArgument_, ...arguments_], _c.dictionaries_)
 return
 }
 }
-}
-
-export function Inference_inferFunctionCall(self_, environment_, expected_, signature_, instanceCall_, instantiation_, term_, name_) {
-const e_ = (((_1) => {
-{
-if(_1.ECall) {
-const e_ = _1;
-return e_
 return
 }
-}
 {
 return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-return
 }
-}))(term_);
-const call_ = (((_1) => {
+}
+}
+
+export function Inference_inferFunctionCall(self_, environment_, expected_, signature_, instanceCall_, instantiation_, term_, name_) {
 {
+const _1 = term_;
+if(_1.ECall) {
+const e_ = _1;
+const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
-return
+return call_.tailCall_
 }
-}
-{
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferFunctionCall")
-return
-}
 }
 }))(e_.target_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, signature_.returnType_);
@@ -1587,50 +1292,41 @@ ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signat
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, call_.tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), arguments_, _c.dictionaries_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export function Inference_inferLambdaCall(self_, environment_, expected_, term_) {
-const e_ = (((_1) => {
 {
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-return
-}
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-return
-}
-}))(term_);
 const call_ = (((_1) => {
-{
 if(_1.DynamicCall) {
 const call_ = _1;
-const _guard1 = (!call_.tailCall_);
-if(_guard1) {
-return call_
-return
+if((!call_.tailCall_)) {
+return {
+function_: call_.function_,
+tailCall_: call_.tailCall_
 }
+return
 }
 }
-{
 if(_1.DynamicCall) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Tailcalls not supported on lambda functions"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
-{
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferLambdaCall")
-return
-}
 }
 }))(e_.target_);
 const effect_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, term_.at_);
@@ -1651,7 +1347,6 @@ const _1 = argument_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, argument_.value_))
-return
 }
 }
 return
@@ -1671,31 +1366,25 @@ return ff_compiler_Syntax.DynamicCall(function_, _c.tailCall_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export function Inference_inferOperator(self_, environment_, expected_, operator_, term_) {
-const e_ = (((_1) => {
 {
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-return
-}
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-return
-}
-}))(term_);
 const target_ = ff_compiler_Syntax.StaticCall(operator_, false, false);
 {
 const _1 = e_.arguments_;
-{
-if(_1.length > 0) {
-const a1_ = _1[0];
 if(_1.length === 1) {
-const _guard1 = (operator_ === "!");
-if(_guard1) {
+const a1_ = _1[0];
+if((operator_ === "!")) {
 const t_ = ff_compiler_Syntax.TConstructor(e_.at_, ff_compiler_Inference.core_("Bool"), []);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, a1_.value_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t_);
@@ -1712,52 +1401,33 @@ return
 return
 }
 }
-}
-}
-{
-if(_1.length > 0) {
-const a1_ = _1[0];
 if(_1.length === 1) {
-const _guard1 = (operator_ === "-");
-if(_guard1) {
+const a1_ = _1[0];
+if((operator_ === "-")) {
 const t1_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t1_, a1_.value_);
 do {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, t1_);
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = (name_ === ff_compiler_Inference.core_("Float"));
-if(_guard1) {
+if((name_ === ff_compiler_Inference.core_("Float"))) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 break
 }
 }
-}
-}
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = (name_ === ff_compiler_Inference.core_("Int"));
-if(_guard1) {
+if((name_ === ff_compiler_Inference.core_("Int"))) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 break
 }
 }
-}
-}
-{
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
+if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 
 break
 }
-}
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on unknown types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-break
 }
 } while(false);
 {
@@ -1773,16 +1443,10 @@ return
 return
 }
 }
-}
-}
-{
-if(_1.length > 0) {
+if(_1.length === 2) {
 const a1_ = _1[0];
-if(_1.length > 1) {
 const a2_ = _1[1];
-if(_1.length === 2) {
-const _guard1 = ((operator_ === "||") || (operator_ === "&&"));
-if(_guard1) {
+if(((operator_ === "||") || (operator_ === "&&"))) {
 const t_ = ff_compiler_Syntax.TConstructor(e_.at_, ff_compiler_Inference.core_("Bool"), []);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, a1_.value_);
 const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, a2_.value_);
@@ -1802,17 +1466,10 @@ return
 return
 }
 }
-}
-}
-}
-{
-if(_1.length > 0) {
+if(_1.length === 2) {
 const a1_ = _1[0];
-if(_1.length > 1) {
 const a2_ = _1[1];
-if(_1.length === 2) {
-const _guard1 = ((operator_ === "===") || (operator_ === "!=="));
-if(_guard1) {
+if(((operator_ === "===") || (operator_ === "!=="))) {
 const t1_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t1_, a1_.value_);
 const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t1_, a2_.value_);
@@ -1832,17 +1489,10 @@ return
 return
 }
 }
-}
-}
-}
-{
-if(_1.length > 0) {
+if(_1.length === 2) {
 const a1_ = _1[0];
-if(_1.length > 1) {
 const a2_ = _1[1];
-if(_1.length === 2) {
-const _guard1 = ((((((operator_ === "+") || (operator_ === "-")) || (operator_ === "*")) || (operator_ === "/")) || (operator_ === "%")) || (operator_ === "^"));
-if(_guard1) {
+if(((((((operator_ === "+") || (operator_ === "-")) || (operator_ === "*")) || (operator_ === "/")) || (operator_ === "%")) || (operator_ === "^"))) {
 const t1_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const t2_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t1_, a1_.value_);
@@ -1850,149 +1500,73 @@ const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t2_,
 const magic_ = ((t_) => {
 {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, t_);
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = (name_ === ff_compiler_Inference.core_("Float"));
-if(_guard1) {
+if((name_ === ff_compiler_Inference.core_("Float"))) {
 return ff_core_Option.Some("Float")
-return
 }
 }
-}
-}
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = (name_ === ff_compiler_Inference.core_("Int"));
-if(_guard1) {
+if((name_ === ff_compiler_Inference.core_("Int"))) {
 return ff_core_Option.Some("Int")
-return
-}
 }
 }
-}
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = ((operator_ === "+") && (name_ === ff_compiler_Inference.core_("String")));
-if(_guard1) {
+if(((operator_ === "+") && (name_ === ff_compiler_Inference.core_("String")))) {
 return ff_core_Option.Some("String")
-return
-}
-}
 }
 }
 {
 return ff_core_Option.None()
-return
 }
 }
 });
 const chooseType_ = ((_1, _2) => {
-{
-if(_1.Some) {
-if(_1.value_ === "String") {
-if(_2.Some) {
+if(_1.Some && _1.value_ === "String" && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_2.Some) {
-if(_2.value_ === "String") {
+if(_1.Some && _2.Some && _2.value_ === "String") {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_1.value_ === "Float") {
-if(_2.Some) {
+if(_1.Some && _1.value_ === "Float" && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_2.Some) {
-if(_2.value_ === "Float") {
+if(_1.Some && _2.Some && _2.value_ === "Float") {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_1.value_ === "Int") {
-if(_2.Some) {
+if(_1.Some && _1.value_ === "Int" && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_2.Some) {
-if(_2.value_ === "Int") {
+if(_1.Some && _2.Some && _2.value_ === "Int") {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_2.None) {
+if(_1.Some && _2.None) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, t1_, t2_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
-}
-}
-{
-if(_1.None) {
-if(_2.Some) {
+if(_1.None && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, t2_, t1_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
-}
-}
-{
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
+if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 
 return
 }
-}
-{
-if(_1.Some) {
-if(_2.Some) {
+if(_1.Some && _2.Some) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on these types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
-}
-{
-if(_1.None) {
-if(_2.None) {
+if(_1.None && _2.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on unknown types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
-}
 }
 });
 chooseType_(magic_(t1_), magic_(t2_));
@@ -2011,19 +1585,17 @@ return
 return
 }
 }
+if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
+return term_
 }
+{
+return ff_compiler_Inference.fail_(e_.at_, ("Unknown operator: " + operator_))
 }
 }
-{
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
-return term_
 return
 }
-}
 {
-return ff_compiler_Inference.fail_(e_.at_, ("Unknown operator: " + operator_))
-return
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
 }
 }
 }
@@ -2103,7 +1675,6 @@ ff_core_Array.Array_delete(remainingArguments_, _w1, 1)
 }));
 const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, e_);
 return ff_compiler_Syntax.Argument(at_, ff_core_Option.Some(p_.name_), e2_)
-return
 }
 })), (() => {
 return defaultArgument_()
@@ -2112,21 +1683,17 @@ return defaultArgument_()
 }));
 if((!ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_))) {
 ff_core_Option.Option_each(ff_core_Array.Array_first(remainingArguments_), ((_1) => {
-{
-const callAt_ = _1.at_;
 if(_1.name_.None) {
+const callAt_ = _1.at_;
 ff_compiler_Inference.fail_(callAt_, "Too many arguments")
 return
 }
-}
-{
-const callAt_ = _1.at_;
 if(_1.name_.Some) {
+const callAt_ = _1.at_;
 const n_ = _1.name_.value_;
 ff_compiler_Inference.fail_(callAt_, ("Unknown argument: " + n_))
 return
 }
-}
 }));
 return newArguments_
 } else {
@@ -2136,7 +1703,6 @@ const _1 = a_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, a_.at_), a_.value_))
-return
 }
 }
 }))]
@@ -2199,7 +1765,6 @@ const _1 = p_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Parameter(_c.at_, _c.mutable_, _c.name_, ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, p_.valueType_), _c.default_)
-return
 }
 }
 }));
@@ -2220,14 +1785,12 @@ return ff_compiler_Environment.Scheme(_c.isVariable_, _c.isMutable_, _c.isNewtyp
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, scheme_.signature_.at_))) {
 const symbolHook_ = ff_compiler_LspHook.SymbolHook(symbol_, at_, scheme_.signature_.at_);
 const emittedHook_ = (((_1) => {
-{
 if(_1.InferLookupHook) {
 const h_ = _1;
 h_.symbol_.value_ = symbolHook_;
 h_.instantiated_.value_ = ff_core_Option.Some(instantiated_)
 return
 }
-}
 {
 
 return
@@ -2274,7 +1837,6 @@ const _1 = definition_;
 {
 const _c = _1;
 return ff_compiler_Syntax.DTrait(_c.at_, _c.name_, _c.generics_, _c.constraints_, _c.generatorParameters_, _c.methods_, _c.methodDefaults_, _c.methodGenerators_)
-return
 }
 }
 }
@@ -2322,7 +1884,6 @@ const _1 = p_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Parameter(_c.at_, _c.mutable_, _c.name_, ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, p_.valueType_), _c.default_)
-return
 }
 }
 }));
@@ -2363,7 +1924,6 @@ const _1 = definition_;
 {
 const _c = _1;
 return ff_compiler_Syntax.DLet(_c.at_, _c.name_, _c.variableType_, value_)
-return
 }
 }
 }
@@ -2385,7 +1945,6 @@ const _1 = case_;
 {
 const _c = _1;
 return ff_compiler_Syntax.MatchCase(_c.at_, [ff_compiler_Syntax.PVariable(method_.at_, ff_core_Option.None()), ...case_.patterns_], _c.guards_, _c.body_)
-return
 }
 }
 })))
@@ -2405,7 +1964,6 @@ const _1 = definition_;
 {
 const _c = _1;
 return ff_compiler_Syntax.DExtend(_c.at_, _c.name_, _c.generics_, _c.constraints_, _c.type_, functions_)
-return
 }
 }
 }
@@ -2448,35 +2006,25 @@ return
 export async function Inference_inferLambda$(self_, environment_, expected_, lambda_, $task) {
 const unitName_ = ff_compiler_Inference.core_("Unit");
 const returnsUnit_ = (((_1) => {
-{
 if(_1.TConstructor) {
 const name_ = _1.name_;
 const ts_ = _1.generics_;
-const _guard1 = ff_core_String.String_startsWith(name_, "Function$", 0);
-if(_guard1) {
+if(ff_core_String.String_startsWith(name_, "Function$", 0)) {
 {
 const _1 = ff_core_List.List_grabLast(ts_);
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const n_ = _1.name_;
-if(_1.generics_.length === 0) {
 return (n_ === unitName_)
-return
-}
-}
 }
 {
 return false
-return
 }
 }
 return
 }
 }
-}
 {
 return false
-return
 }
 }))(ff_compiler_Unification.Unification_substitute(self_.unification_, expected_));
 const cases_ = ((!returnsUnit_)
@@ -2487,7 +2035,6 @@ const _1 = c_;
 {
 const _c = _1;
 return ff_compiler_Syntax.MatchCase(_c.at_, _c.patterns_, _c.guards_, ff_compiler_Syntax.ESequential(c_.at_, c_.body_, ff_compiler_Syntax.EVariant(c_.at_, unitName_, [], ff_core_Option.None())))
-return
 }
 }
 })));
@@ -2525,7 +2072,6 @@ const at_ = _2.first_;
 const type_ = _2.second_;
 const noEffect_ = ff_compiler_Syntax.TConstructor(at_, "ff:core/Nothing.Nothing", []);
 return ff_compiler_Environment.Scheme(true, false, false, false, ff_compiler_Syntax.Signature(at_, name_, false, [], [], [], type_, noEffect_))
-return
 }
 }), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 {
@@ -2533,7 +2079,6 @@ const _1 = environment_;
 {
 const _c = _1;
 return ff_compiler_Environment.Environment(_c.modulePrefix_, ff_core_Map.Map_addAll(environment1_.symbols_, symbols_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.traits_, _c.imports_, _c.effect_, _c.selfVariable_)
-return
 }
 }
 return
@@ -2550,7 +2095,6 @@ const at_ = _2.first_;
 const type_ = _2.second_;
 const noEffect_ = ff_compiler_Syntax.TConstructor(at_, "ff:core/Nothing.Nothing", []);
 return ff_compiler_Environment.Scheme(true, false, false, false, ff_compiler_Syntax.Signature(at_, name_, false, [], [], [], type_, noEffect_))
-return
 }
 }), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String);
 ff_core_Array.Array_push(guards_, (((_c) => {
@@ -2561,7 +2105,6 @@ const _1 = environment2_;
 {
 const _c = _1;
 return ff_compiler_Environment.Environment(_c.modulePrefix_, ff_core_Map.Map_addAll(environment2_.symbols_, symbols_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), _c.traits_, _c.imports_, _c.effect_, _c.selfVariable_)
-return
 }
 }
 }));
@@ -2570,7 +2113,6 @@ const _1 = case_;
 {
 const _c = _1;
 return ff_compiler_Syntax.MatchCase(_c.at_, _c.patterns_, ff_core_Array.Array_drain(guards_), ff_compiler_Inference.Inference_inferTerm(self_, environment3_, returnType_, case_.body_))
-return
 }
 }
 }
@@ -2578,24 +2120,17 @@ return
 export async function Inference_inferPattern$(self_, environment_, expected_, pattern_, $task) {
 if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 if((((_1) => {
-{
 if(_1.PVariantAs) {
 const at_ = _1.at_;
 const variableAt_ = _1.variableAt_;
 return ((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, at_) || ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, variableAt_)) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, variableAt_))
-return
-}
 }
-{
 if(_1.PAlias) {
 const at_ = _1.at_;
 return (ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, at_))
-return
-}
 }
 {
 return ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, pattern_.at_)
-return
 }
 }))(pattern_)) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferPatternHook(self_.unification_, environment_, expected_, pattern_))
@@ -2607,53 +2142,30 @@ return ff_core_Map.empty_()
 }
 {
 const _1 = pattern_;
-{
 if(_1.PString) {
 return literal_("String")
-return
 }
-}
-{
 if(_1.PInt) {
 return literal_("Int")
-return
-}
 }
-{
 if(_1.PChar) {
 return literal_("Char")
-return
 }
-}
-{
-if(_1.PVariable) {
+if(_1.PVariable && _1.name_.None) {
 const at_ = _1.at_;
-if(_1.name_.None) {
 return ff_core_Map.empty_()
-return
-}
-}
 }
-{
-if(_1.PVariable) {
+if(_1.PVariable && _1.name_.Some) {
 const at_ = _1.at_;
-if(_1.name_.Some) {
 const name_ = _1.name_.value_;
 return ff_core_List.List_toMap([ff_core_Pair.Pair(name_, ff_core_Pair.Pair(at_, expected_))], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
-}
 }
-}
-{
 if(_1.PAlias) {
 const at_ = _1.at_;
 const pattern_ = _1.pattern_;
 const variable_ = _1.variable_;
 return ff_core_Map.Map_add(ff_compiler_Inference.Inference_inferPattern(self_, environment_, expected_, pattern_), variable_, ff_core_Pair.Pair(at_, expected_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
-}
 }
-{
 if(_1.PVariantAs) {
 const at_ = _1.at_;
 const name_ = _1.name_;
@@ -2679,44 +2191,24 @@ return ff_core_Pair.Pair(_w1, ff_core_Pair.Pair(variableAt_, recordType_))
 })), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
 return
 }
-}
-{
-if(_1.PVariant) {
+if(_1.PVariant && _1.name_ === "List$Empty" && _1.patterns_.length === 0) {
 const at_ = _1.at_;
-if(_1.name_ === "List$Empty") {
-if(_1.patterns_.length === 0) {
 const itemType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, at_);
 const listType_ = ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("List"), [itemType_]);
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, expected_, listType_);
 return ff_core_List.List_toMap([], ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
-}
 }
-}
-}
-{
-if(_1.PVariant) {
+if(_1.PVariant && _1.name_ === "List$Link" && _1.patterns_.length === 2) {
 const at_ = _1.at_;
-if(_1.name_ === "List$Link") {
-if(_1.patterns_.length > 0) {
 const head_ = _1.patterns_[0];
-if(_1.patterns_.length > 1) {
 const tail_ = _1.patterns_[1];
-if(_1.patterns_.length === 2) {
 const itemType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, at_);
 const listType_ = ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("List"), [itemType_]);
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, expected_, listType_);
 const headVariables_ = ff_compiler_Inference.Inference_inferPattern(self_, environment_, itemType_, head_);
 const tailVariables_ = ff_compiler_Inference.Inference_inferPattern(self_, environment_, listType_, tail_);
 return ff_core_Map.Map_addAll(headVariables_, tailVariables_, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
-return
-}
-}
-}
-}
-}
 }
-{
 if(_1.PVariant) {
 const at_ = _1.at_;
 const name_ = _1.name_;
@@ -2733,7 +2225,6 @@ return ff_core_List.List_foldLeft(ff_core_List.List_map(ff_core_List.List_zip(pa
 const pattern_ = _1.first_;
 const parameter_ = _1.second_;
 return ff_compiler_Inference.Inference_inferPattern(self_, environment_, parameter_.valueType_, pattern_)
-return
 }
 })), ff_core_Map.empty_(), ((_w1, _w2) => {
 return ff_core_Map.Map_addAll(_w1, _w2, ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String)
@@ -2742,7 +2233,6 @@ return
 }
 }
 }
-}
 
 export async function Inference_inferTerm$(self_, environment_, expected_, term_, $task) {
 const hookRecordTypeBox_ = (ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, term_.at_)
@@ -2758,31 +2248,18 @@ return term_
 }
 {
 const _1 = term_;
-{
 if(_1.EString) {
 return literal_("String")
-return
-}
 }
-{
 if(_1.EChar) {
 return literal_("Char")
-return
 }
-}
-{
 if(_1.EInt) {
 return literal_("Int")
-return
-}
 }
-{
 if(_1.EFloat) {
 return literal_("Float")
-return
-}
 }
-{
 if(_1.EVariable) {
 const e_ = _1;
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.name_, [], ff_core_Option.None()), ((instantiated_) => {
@@ -2797,8 +2274,6 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 }))
 return
 }
-}
-{
 if(_1.EField) {
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
@@ -2810,13 +2285,11 @@ _w1.value_ = ff_core_Option.Some(recordType_)
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, e_.record_);
 {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, recordType_);
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
-const _guard1 = ff_core_String.String_startsWith(name_, "Record$", 0);
-if(_guard1) {
+if(ff_core_String.String_startsWith(name_, "Record$", 0)) {
 if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, e_.at_)) {
 const symbolHook_ = ff_compiler_LspHook.SymbolHook(e_.field_, e_.at_, e_.at_);
 const noEffect_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
@@ -2828,14 +2301,13 @@ return (_w1.second_ === e_.field_)
 })), ((_w1) => {
 return _w1.first_
 })), ((index_) => {
-const t1_ = ff_core_List.List_grab(typeArguments_, index_);
+const t1_ = (typeArguments_[index_] ?? ff_core_List.internalGrab_(typeArguments_, index_));
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_);
 {
 const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EField(_c.at_, _c.newtype_, record_, _c.field_)
-return
 }
 }
 })), (() => {
@@ -2848,31 +2320,24 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 return
 }
 }
-}
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
 const memberPrefix_ = (name_ + "_");
 const memberName_ = (memberPrefix_ + e_.field_);
 {
 const _1 = ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, memberName_, typeArguments_, ff_core_Option.None());
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
-const _guard1 = (!instantiated_.scheme_.isVariable_);
-if(_guard1) {
+if((!instantiated_.scheme_.isVariable_)) {
 const signature_ = (((_c) => {
 return ff_compiler_Syntax.Signature(_c.at_, _c.name_, _c.member_, _c.generics_, _c.constraints_, ff_core_List.List_dropFirst(instantiated_.scheme_.signature_.parameters_, 1), _c.returnType_, _c.effect_)
 }))(instantiated_.scheme_.signature_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, recordType_, ff_core_List.List_grab(instantiated_.scheme_.signature_.parameters_, 0).valueType_);
 return ff_compiler_Inference.Inference_inferEtaExpansion(self_, environment_, expected_, e_.at_, signature_, term_)
-return
 }
 }
-}
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, instantiated_.scheme_.signature_.returnType_);
@@ -2881,43 +2346,26 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EField(_c.at_, instantiated_.scheme_.isNewtype_, record_, _c.field_)
-return
 }
 }
 return
 }
-}
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
-}
-{
-if(_1.TVariable) {
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
+if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return term_
-return
-}
-}
 }
-{
 if(_1.TVariable) {
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
-}
-{
 if(_1.EWildcard) {
 const e_ = _1;
 return ff_core_Option.Option_grab(ff_core_Option.Option_map(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, ("_w" + e_.index_), [], ff_core_Option.None()), ((instantiated_) => {
@@ -2926,8 +2374,6 @@ return term_
 })))
 return
 }
-}
-{
 if(_1.EList) {
 const at_ = _1.at_;
 const t_ = _1.elementType_;
@@ -2946,8 +2392,6 @@ return
 })))
 return
 }
-}
-{
 if(_1.ESequential) {
 const at_ = _1.at_;
 const before_ = _1.before_;
@@ -2958,12 +2402,10 @@ ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferSequen
 const newExpected_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, at_);
 {
 const _1 = before_;
-{
-if(_1.EPipe) {
+if(_1.EPipe && _1.function_.ELambda) {
 const at1_ = _1.at_;
 const value_ = _1.value_;
 const effect1_ = _1.effect_;
-if(_1.function_.ELambda) {
 const at2_ = _1.function_.at_;
 const at3_ = _1.function_.lambda_.at_;
 const effect3_ = _1.function_.lambda_.effect_;
@@ -2975,42 +2417,30 @@ const _1 = case_;
 {
 const _c = _1;
 return ff_compiler_Syntax.MatchCase(_c.at_, _c.patterns_, _c.guards_, ff_compiler_Syntax.ESequential(case_.at_, case_.body_, e_))
-return
 }
 }
 }));
 const newPipe_ = ff_compiler_Syntax.EPipe(at1_, value_, effect1_, ff_compiler_Syntax.ELambda(at2_, ff_compiler_Syntax.Lambda(at3_, effect3_, newCases_)));
 {
 const _1 = after_;
-{
-if(_1.EVariant) {
+if(_1.EVariant && _1.name_ === "ff:core/Unit.Unit") {
 const at_ = _1.at_;
-if(_1.name_ === "ff:core/Unit.Unit") {
 const unitType_ = ff_compiler_Syntax.TConstructor(at_, ff_compiler_Inference.core_("Unit"), []);
 ff_compiler_Unification.Unification_unify(self_.unification_, at_, expected_, unitType_);
 return ff_compiler_Inference.Inference_inferTerm(self_, environment_, newExpected_, newPipe_)
-return
-}
-}
 }
 {
 return ff_compiler_Syntax.ESequential(at_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, newExpected_, newPipe_), ff_compiler_Inference.Inference_inferTerm(self_, environment_, expected_, after_))
-return
 }
 }
 return
 }
-}
-}
 {
 return ff_compiler_Syntax.ESequential(at_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, newExpected_, before_), ff_compiler_Inference.Inference_inferTerm(self_, environment_, expected_, after_))
-return
 }
 }
 return
 }
-}
-{
 if(_1.ELet) {
 const e_ = _1;
 const noEffect_ = ff_compiler_Syntax.TConstructor(e_.at_, "ff:core/Nothing.Nothing", []);
@@ -3023,64 +2453,29 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.ELet(_c.at_, _c.mutable_, _c.name_, _c.valueType_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, e_.valueType_, e_.value_), ff_compiler_Inference.Inference_inferTerm(self_, environment2_, expected_, e_.body_))
-return
 }
 }
 return
 }
-}
-{
 if(_1.ELambda) {
 const at_ = _1.at_;
 const l_ = _1.lambda_;
 do {
 const _1 = l_.cases_;
-{
-if(_1.length > 0) {
-if(_1[0].patterns_.length === 0) {
-if(_1[0].guards_.length === 0) {
-if(_1[0].body_.EVariable) {
+if(_1.length === 1 && _1[0].patterns_.length === 0 && _1[0].guards_.length === 0 && _1[0].body_.EVariable && _1[0].body_.name_ === "") {
 const insideAt_ = _1[0].body_.at_;
-if(_1[0].body_.name_ === "") {
-if(_1.length === 1) {
-const _guard1 = ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, insideAt_);
-if(_guard1) {
+if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, insideAt_)) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferLambdaStartHook(self_.unification_, environment_, expected_))
 break
 }
 }
-}
-}
-}
-}
-}
-}
-{
-if(_1.length > 0) {
-if(_1[0].patterns_.length === 0) {
-if(_1[0].guards_.length === 0) {
-if(_1[0].body_.ESequential) {
-if(_1[0].body_.before_.EVariable) {
+if(_1.length === 1 && _1[0].patterns_.length === 0 && _1[0].guards_.length === 0 && _1[0].body_.ESequential && _1[0].body_.before_.EVariable && _1[0].body_.before_.name_ === "" && _1[0].body_.after_.EVariant && _1[0].body_.after_.name_ === "ff:core/Unit.Unit") {
 const insideAt_ = _1[0].body_.before_.at_;
-if(_1[0].body_.before_.name_ === "") {
-if(_1[0].body_.after_.EVariant) {
-if(_1[0].body_.after_.name_ === "ff:core/Unit.Unit") {
-if(_1.length === 1) {
-const _guard1 = ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, insideAt_);
-if(_guard1) {
+if(ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, insideAt_)) {
 ff_compiler_LspHook.LspHook_emit(self_.lspHook_, ff_compiler_LspHook.InferLambdaStartHook(self_.unification_, environment_, expected_))
 break
 }
 }
-}
-}
-}
-}
-}
-}
-}
-}
-}
 {
 
 break
@@ -3088,10 +2483,7 @@ break
 } while(false);
 const lambda_ = ff_compiler_Inference.Inference_inferLambda(self_, environment_, expected_, l_);
 return ff_compiler_Syntax.ELambda(at_, lambda_)
-return
-}
 }
-{
 if(_1.EVariant) {
 const e_ = _1;
 const instantiated_ = ff_core_Option.Option_else(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.name_, e_.typeArguments_, e_.arguments_), (() => {
@@ -3113,8 +2505,6 @@ return
 }
 return
 }
-}
-{
 if(_1.EVariantIs) {
 const e_ = _1;
 const instantiated_ = ff_core_Option.Option_else(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.name_, e_.typeArguments_, ff_core_Option.None()), (() => {
@@ -3142,8 +2532,6 @@ return
 }
 return
 }
-}
-{
 if(_1.ECopy) {
 const e_ = _1;
 const scheme_ = ff_core_Option.Option_else(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.name_, [], ff_core_Option.None()), (() => {
@@ -3170,7 +2558,6 @@ const _1 = f_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, ff_core_Option.Some(f_.name_), _c.value_)
-return
 }
 }
 }));
@@ -3193,7 +2580,6 @@ const at_ = _1.at_;
 const name_ = _1.name_;
 const value_ = _1.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(at_, ("Unknown parameter: " + name_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
 }
 }));
 const arguments_ = ff_core_List.List_map(parameterNames_, ((name_) => {
@@ -3204,7 +2590,6 @@ return (_w1.name_ === name_)
 const at_ = _1.at_;
 const value_ = _1.value_;
 return ff_compiler_Syntax.Argument(at_, ff_core_Option.Some(name_), value_)
-return
 }
 })), (() => {
 const at_ = (((_c) => {
@@ -3217,10 +2602,7 @@ const body_ = ff_compiler_Syntax.EVariant(e_.at_, e_.name_, [], ff_core_Option.S
 const effect_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const e1_ = ff_compiler_Syntax.EPipe(e_.at_, e_.record_, effect_, ff_compiler_Syntax.ELambda(e_.at_, ff_compiler_Syntax.Lambda(e_.at_, effect_, [ff_compiler_Syntax.MatchCase(e_.at_, [ff_compiler_Syntax.PVariable(e_.at_, ff_core_Option.Some("_c"))], [], body_)])));
 return ff_compiler_Inference.Inference_inferTerm(self_, environment_, expected_, e1_)
-return
-}
 }
-{
 if(_1.EPipe) {
 const e_ = _1;
 const valueType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
@@ -3233,47 +2615,37 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EPipe(_c.at_, value_, _c.effect_, function_)
-return
 }
 }
 return
 }
-}
-{
 if(_1.ECall) {
 const e_ = _1;
 if((ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_) && (((_1) => {
-{
 if(_1.StaticCall) {
 return true
-return
-}
 }
 {
 return false
-return
 }
 }))(e_.target_))) {
 return term_
 } else {
 const call_ = (((_1) => {
-{
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
-return
+return {
+function_: call_.function_,
+tailCall_: call_.tailCall_
 }
+return
 }
-{
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in the Inference phase")
-return
-}
 }
 }))(e_.target_);
 {
 const _1 = call_.function_;
-{
 if(_1.EVariable) {
 const variableAt_ = _1.at_;
 const x_ = _1.name_;
@@ -3284,7 +2656,6 @@ return ff_compiler_Inference.Inference_inferOperator(self_, environment_, expect
 } else {
 {
 const _1 = ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, x_, e_.typeArguments_, ff_core_Option.Some(e_.arguments_));
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
 if(instantiated_.scheme_.isVariable_) {
@@ -3295,19 +2666,13 @@ return ff_compiler_Inference.Inference_inferFunctionCall(self_, environment_, ex
 }
 return
 }
-}
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(variableAt_, ("No such function: " + x_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 }
 return
 }
-}
-{
 if(_1.EField) {
 const f_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, f_.at_);
@@ -3326,71 +2691,46 @@ return ff_compiler_Syntax.EField(_c.at_, _c.newtype_, record_, _c.field_)
 }))(e_);
 {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, recordType_);
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const methodName_ = ((name_ + "_") + f_.field_);
 const arguments_ = [ff_compiler_Syntax.Argument(f_.record_.at_, ff_core_Option.None(), f_.record_), ...e_.arguments_];
 {
 const _1 = ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, f_.at_, methodName_, [], ff_core_Option.Some(arguments_));
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
-const _guard1 = (!instantiated_.scheme_.isVariable_);
-if(_guard1) {
+if((!instantiated_.scheme_.isVariable_)) {
 return ff_compiler_Inference.Inference_inferMethodCall(self_, environment_, expected_, instantiated_.scheme_.signature_, instantiated_.typeArguments_, e2_, record_, recordType_, methodName_)
-return
-}
 }
 }
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, e2_)
-return
-}
 }
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, ((("No such field " + f_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
-}
-{
-if(_1.TVariable) {
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
+if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, e2_)
-return
 }
-}
-}
-{
 if(_1.TVariable) {
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(f_.at_, ((("No such field " + f_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
-}
 {
 return ff_compiler_Inference.Inference_inferLambdaCall(self_, environment_, expected_, term_)
-return
 }
 }
 }
 return
 }
-}
-{
 if(_1.ERecord) {
 const e_ = _1;
 const fields_ = ff_core_List.List_sortBy(e_.fields_, ((_w1) => {
@@ -3412,7 +2752,6 @@ const _1 = field_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Field(_c.at_, _c.name_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, field_.value_))
-return
 }
 }
 return
@@ -3423,13 +2762,10 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.ERecord(_c.at_, newFields_)
-return
 }
 }
 return
 }
-}
-{
 if(_1.EFunctions) {
 const at_ = _1.at_;
 const functions_ = _1.functions_;
@@ -3446,10 +2782,7 @@ return ff_compiler_Inference.Inference_inferFunctionDefinition(self_, environmen
 }));
 const newBody_ = ff_compiler_Inference.Inference_inferTerm(self_, environment2_, expected_, body_);
 return ff_compiler_Syntax.EFunctions(at_, newFunctions_, newBody_)
-return
-}
 }
-{
 if(_1.EAssign) {
 const e_ = _1;
 return ff_core_Option.Option_else(ff_core_Option.Option_map(ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, e_.variable_, [], ff_core_Option.None()), ((instantiated_) => {
@@ -3460,7 +2793,6 @@ const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EAssign(_c.at_, _c.operator_, _c.variable_, value_)
-return
 }
 }
 } else {
@@ -3471,91 +2803,63 @@ throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Sy
 }))
 return
 }
-}
-{
 if(_1.EAssignField) {
 const e_ = _1;
 const recordType_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const record_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, recordType_, e_.record_);
 {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, recordType_);
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
-const _guard1 = ff_core_String.String_startsWith(name_, "Record$", 0);
-if(_guard1) {
+if(ff_core_String.String_startsWith(name_, "Record$", 0)) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ("Can't assign fields of anonymous records: " + e_.field_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
 }
 }
-}
-{
-const t_ = _1;
 if(_1.TConstructor) {
+const t_ = _1;
 const name_ = _1.name_;
 const typeArguments_ = _1.generics_;
 const methodName_ = ((name_ + "_") + e_.field_);
 {
 const _1 = ff_compiler_Inference.Inference_lookup(self_, environment_, expected_, e_.at_, methodName_, typeArguments_, ff_core_Option.None());
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
-const _guard1 = (instantiated_.scheme_.isMutable_ || ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_));
-if(_guard1) {
+if((instantiated_.scheme_.isMutable_ || ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_))) {
 const value_ = ff_compiler_Inference.Inference_inferAssignment(self_, environment_, expected_, e_.at_, e_.operator_, e_.value_, instantiated_.scheme_.signature_);
 {
 const _1 = e_;
 {
 const _c = _1;
 return ff_compiler_Syntax.EAssignField(_c.at_, _c.operator_, record_, _c.field_, value_)
-return
 }
 }
 return
 }
 }
-}
-{
 if(_1.Some) {
 const instantiated_ = _1.value_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("Can't assign an immutable field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
-{
 if(_1.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on type: ") + ff_compiler_Syntax.Type_show(t_, []))), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
-}
-{
-if(_1.TVariable) {
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
+if(_1.TVariable && ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 return term_
-return
-}
-}
 }
-{
 if(_1.TVariable) {
 const index_ = _1.index_;
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, ((("No such field " + e_.field_) + " on unknown type: $") + index_)), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
 }
 return
 }
 }
 }
-}
 
 export async function Inference_inferAssignment$(self_, environment_, expected_, at_, operator_, value_, signature_, $task) {
 const t_ = signature_.returnType_;
@@ -3570,32 +2874,17 @@ return newValue_
 }
 
 export async function Inference_inferMethodCall$(self_, environment_, expected_, signature_, instantiation_, term_, record_, recordType_, name_, $task) {
-const e_ = (((_1) => {
 {
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-return
-}
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-return
-}
-}))(term_);
-const call_ = (((_1) => {
-{
+const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
-return
-}
+return call_.tailCall_
 }
-{
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferMethodCall")
-return
-}
 }
 }))(e_.target_);
 const selfParameter_ = ff_core_List.List_grabFirst(signature_.parameters_);
@@ -3608,41 +2897,32 @@ ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signat
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, call_.tailCall_, false), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, false), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), [selfArgument_, ...arguments_], _c.dictionaries_)
 return
 }
 }
-}
-
-export async function Inference_inferFunctionCall$(self_, environment_, expected_, signature_, instanceCall_, instantiation_, term_, name_, $task) {
-const e_ = (((_1) => {
-{
-if(_1.ECall) {
-const e_ = _1;
-return e_
 return
 }
-}
 {
 return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-return
 }
-}))(term_);
-const call_ = (((_1) => {
+}
+}
+
+export async function Inference_inferFunctionCall$(self_, environment_, expected_, signature_, instanceCall_, instantiation_, term_, name_, $task) {
 {
+const _1 = term_;
+if(_1.ECall) {
+const e_ = _1;
+const tailCall_ = (((_1) => {
 if(_1.DynamicCall) {
 const call_ = _1;
-return call_
-return
+return call_.tailCall_
 }
-}
-{
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferFunctionCall")
-return
-}
 }
 }))(e_.target_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, signature_.returnType_);
@@ -3652,50 +2932,41 @@ ff_compiler_Unification.Unification_affect(self_.unification_, term_.at_, signat
 const _1 = e_;
 {
 const _c = _1;
-return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, call_.tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
+return ff_compiler_Syntax.ECall(_c.at_, ff_compiler_Syntax.StaticCall(name_, tailCall_, instanceCall_), signature_.effect_, ff_core_List.List_map(instantiation_, ((_w1) => {
 return _w1.second_
 })), arguments_, _c.dictionaries_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export async function Inference_inferLambdaCall$(self_, environment_, expected_, term_, $task) {
-const e_ = (((_1) => {
 {
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-return
-}
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-return
-}
-}))(term_);
 const call_ = (((_1) => {
-{
 if(_1.DynamicCall) {
 const call_ = _1;
-const _guard1 = (!call_.tailCall_);
-if(_guard1) {
-return call_
-return
+if((!call_.tailCall_)) {
+return {
+function_: call_.function_,
+tailCall_: call_.tailCall_
 }
+return
 }
 }
-{
 if(_1.DynamicCall) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Tailcalls not supported on lambda functions"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
 }
-{
 if(_1.StaticCall) {
 return ff_compiler_Inference.fail_(e_.at_, "Internal error: Static calls not expected in inferLambdaCall")
-return
-}
 }
 }))(e_.target_);
 const effect_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, term_.at_);
@@ -3716,7 +2987,6 @@ const _1 = argument_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, argument_.value_))
-return
 }
 }
 return
@@ -3736,31 +3006,25 @@ return ff_compiler_Syntax.DynamicCall(function_, _c.tailCall_)
 return
 }
 }
+return
+}
+{
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
+}
+}
 }
 
 export async function Inference_inferOperator$(self_, environment_, expected_, operator_, term_, $task) {
-const e_ = (((_1) => {
 {
+const _1 = term_;
 if(_1.ECall) {
 const e_ = _1;
-return e_
-return
-}
-}
-{
-return ff_compiler_Inference.fail_(term_.at_, "Call expected")
-return
-}
-}))(term_);
 const target_ = ff_compiler_Syntax.StaticCall(operator_, false, false);
 {
 const _1 = e_.arguments_;
-{
-if(_1.length > 0) {
-const a1_ = _1[0];
 if(_1.length === 1) {
-const _guard1 = (operator_ === "!");
-if(_guard1) {
+const a1_ = _1[0];
+if((operator_ === "!")) {
 const t_ = ff_compiler_Syntax.TConstructor(e_.at_, ff_compiler_Inference.core_("Bool"), []);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, a1_.value_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t_);
@@ -3777,52 +3041,33 @@ return
 return
 }
 }
-}
-}
-{
-if(_1.length > 0) {
-const a1_ = _1[0];
 if(_1.length === 1) {
-const _guard1 = (operator_ === "-");
-if(_guard1) {
+const a1_ = _1[0];
+if((operator_ === "-")) {
 const t1_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t1_, a1_.value_);
 do {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, t1_);
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = (name_ === ff_compiler_Inference.core_("Float"));
-if(_guard1) {
+if((name_ === ff_compiler_Inference.core_("Float"))) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 break
 }
 }
-}
-}
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = (name_ === ff_compiler_Inference.core_("Int"));
-if(_guard1) {
+if((name_ === ff_compiler_Inference.core_("Int"))) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 break
 }
 }
-}
-}
-{
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
+if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 
 break
 }
-}
 {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on unknown types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-break
 }
 } while(false);
 {
@@ -3838,16 +3083,10 @@ return
 return
 }
 }
-}
-}
-{
-if(_1.length > 0) {
+if(_1.length === 2) {
 const a1_ = _1[0];
-if(_1.length > 1) {
 const a2_ = _1[1];
-if(_1.length === 2) {
-const _guard1 = ((operator_ === "||") || (operator_ === "&&"));
-if(_guard1) {
+if(((operator_ === "||") || (operator_ === "&&"))) {
 const t_ = ff_compiler_Syntax.TConstructor(e_.at_, ff_compiler_Inference.core_("Bool"), []);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, a1_.value_);
 const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, a2_.value_);
@@ -3867,17 +3106,10 @@ return
 return
 }
 }
-}
-}
-}
-{
-if(_1.length > 0) {
+if(_1.length === 2) {
 const a1_ = _1[0];
-if(_1.length > 1) {
 const a2_ = _1[1];
-if(_1.length === 2) {
-const _guard1 = ((operator_ === "===") || (operator_ === "!=="));
-if(_guard1) {
+if(((operator_ === "===") || (operator_ === "!=="))) {
 const t1_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t1_, a1_.value_);
 const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t1_, a2_.value_);
@@ -3897,17 +3129,10 @@ return
 return
 }
 }
-}
-}
-}
-{
-if(_1.length > 0) {
+if(_1.length === 2) {
 const a1_ = _1[0];
-if(_1.length > 1) {
 const a2_ = _1[1];
-if(_1.length === 2) {
-const _guard1 = ((((((operator_ === "+") || (operator_ === "-")) || (operator_ === "*")) || (operator_ === "/")) || (operator_ === "%")) || (operator_ === "^"));
-if(_guard1) {
+if(((((((operator_ === "+") || (operator_ === "-")) || (operator_ === "*")) || (operator_ === "/")) || (operator_ === "%")) || (operator_ === "^"))) {
 const t1_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const t2_ = ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, e_.at_);
 const e1_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t1_, a1_.value_);
@@ -3915,149 +3140,73 @@ const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t2_,
 const magic_ = ((t_) => {
 {
 const _1 = ff_compiler_Unification.Unification_substitute(self_.unification_, t_);
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = (name_ === ff_compiler_Inference.core_("Float"));
-if(_guard1) {
+if((name_ === ff_compiler_Inference.core_("Float"))) {
 return ff_core_Option.Some("Float")
-return
-}
 }
 }
-}
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = (name_ === ff_compiler_Inference.core_("Int"));
-if(_guard1) {
+if((name_ === ff_compiler_Inference.core_("Int"))) {
 return ff_core_Option.Some("Int")
-return
-}
 }
 }
-}
-{
-if(_1.TConstructor) {
+if(_1.TConstructor && _1.generics_.length === 0) {
 const name_ = _1.name_;
-if(_1.generics_.length === 0) {
-const _guard1 = ((operator_ === "+") && (name_ === ff_compiler_Inference.core_("String")));
-if(_guard1) {
+if(((operator_ === "+") && (name_ === ff_compiler_Inference.core_("String")))) {
 return ff_core_Option.Some("String")
-return
-}
-}
 }
 }
 {
 return ff_core_Option.None()
-return
 }
 }
 });
 const chooseType_ = ((_1, _2) => {
-{
-if(_1.Some) {
-if(_1.value_ === "String") {
-if(_2.Some) {
+if(_1.Some && _1.value_ === "String" && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_2.Some) {
-if(_2.value_ === "String") {
+if(_1.Some && _2.Some && _2.value_ === "String") {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_1.value_ === "Float") {
-if(_2.Some) {
+if(_1.Some && _1.value_ === "Float" && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_2.Some) {
-if(_2.value_ === "Float") {
+if(_1.Some && _2.Some && _2.value_ === "Float") {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_1.value_ === "Int") {
-if(_2.Some) {
+if(_1.Some && _1.value_ === "Int" && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_2.Some) {
-if(_2.value_ === "Int") {
+if(_1.Some && _2.Some && _2.value_ === "Int") {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
-}
-}
-}
-{
-if(_1.Some) {
-if(_2.None) {
+if(_1.Some && _2.None) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, t1_, t2_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t1_)
 return
 }
-}
-}
-{
-if(_1.None) {
-if(_2.Some) {
+if(_1.None && _2.Some) {
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, t2_, t1_);
 ff_compiler_Unification.Unification_unify(self_.unification_, e_.at_, expected_, t2_)
 return
 }
-}
-}
-{
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
+if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
 
 return
 }
-}
-{
-if(_1.Some) {
-if(_2.Some) {
+if(_1.Some && _2.Some) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on these types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
-}
 }
-{
-if(_1.None) {
-if(_2.None) {
+if(_1.None && _2.None) {
 throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(ff_compiler_Syntax.CompileError(e_.at_, "Operators on unknown types not currently supported"), ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)})
-return
-}
-}
 }
 });
 chooseType_(magic_(t1_), magic_(t2_));
@@ -4076,19 +3225,17 @@ return
 return
 }
 }
+if(ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_)) {
+return term_
 }
+{
+return ff_compiler_Inference.fail_(e_.at_, ("Unknown operator: " + operator_))
 }
 }
-{
-const _guard1 = ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_);
-if(_guard1) {
-return term_
 return
 }
-}
 {
-return ff_compiler_Inference.fail_(e_.at_, ("Unknown operator: " + operator_))
-return
+return ff_compiler_Inference.fail_(term_.at_, "Call expected")
 }
 }
 }
@@ -4168,7 +3315,6 @@ ff_core_Array.Array_delete(remainingArguments_, _w1, 1)
 }));
 const e2_ = ff_compiler_Inference.Inference_inferTerm(self_, environment_, t_, e_);
 return ff_compiler_Syntax.Argument(at_, ff_core_Option.Some(p_.name_), e2_)
-return
 }
 })), (() => {
 return defaultArgument_()
@@ -4177,21 +3323,17 @@ return defaultArgument_()
 }));
 if((!ff_compiler_LspHook.LspHook_isEnabled(self_.lspHook_))) {
 ff_core_Option.Option_each(ff_core_Array.Array_first(remainingArguments_), ((_1) => {
-{
-const callAt_ = _1.at_;
 if(_1.name_.None) {
+const callAt_ = _1.at_;
 ff_compiler_Inference.fail_(callAt_, "Too many arguments")
 return
 }
-}
-{
-const callAt_ = _1.at_;
 if(_1.name_.Some) {
+const callAt_ = _1.at_;
 const n_ = _1.name_.value_;
 ff_compiler_Inference.fail_(callAt_, ("Unknown argument: " + n_))
 return
 }
-}
 }));
 return newArguments_
 } else {
@@ -4201,7 +3343,6 @@ const _1 = a_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Argument(_c.at_, _c.name_, ff_compiler_Inference.Inference_inferTerm(self_, environment_, ff_compiler_Unification.Unification_freshUnificationVariable(self_.unification_, a_.at_), a_.value_))
-return
 }
 }
 }))]
@@ -4264,7 +3405,6 @@ const _1 = p_;
 {
 const _c = _1;
 return ff_compiler_Syntax.Parameter(_c.at_, _c.mutable_, _c.name_, ff_compiler_Unification.Unification_instantiate(self_.unification_, instantiationMap_, p_.valueType_), _c.default_)
-return
 }
 }
 }));
@@ -4285,14 +3425,12 @@ return ff_compiler_Environment.Scheme(_c.isVariable_, _c.isMutable_, _c.isNewtyp
 if((ff_compiler_LspHook.LspHook_isAt(self_.lspHook_, at_) || ff_compiler_LspHook.LspHook_isDefinedAt(self_.lspHook_, scheme_.signature_.at_))) {
 const symbolHook_ = ff_compiler_LspHook.SymbolHook(symbol_, at_, scheme_.signature_.at_);
 const emittedHook_ = (((_1) => {
-{
 if(_1.InferLookupHook) {
 const h_ = _1;
 h_.symbol_.value_ = symbolHook_;
 h_.instantiated_.value_ = ff_core_Option.Some(instantiated_)
 return
 }
-}
 {
 
 return