diff --git a/ast/ast.go b/ast/ast.go
index 2d97a2f..2bb6baa 100644
--- a/ast/ast.go
+++ b/ast/ast.go
@@ -371,15 +371,17 @@ type Error struct {
 type Function struct {
 	NodeBase
 	ParenLeftFodder Fodder
-	Parameters      Parameters
+	Parameters      []Parameter
 	// Always false if there were no parameters.
 	TrailingComma    bool
 	ParenRightFodder Fodder
 	Body             Node
 }
 
-// NamedParameter represents an optional named parameter of a function.
-type NamedParameter struct {
+// Parameter represents a parameter of function.
+// If DefaultArg is set, it's an optional named parameter.
+// Otherwise, it's a positional parameter and EqFodder is not used.
+type Parameter struct {
 	NameFodder  Fodder
 	Name        Identifier
 	EqFodder    Fodder
@@ -395,13 +397,6 @@ type CommaSeparatedID struct {
 	CommaFodder Fodder
 }
 
-// Parameters represents the required positional parameters and optional named
-// parameters to a function definition.
-type Parameters struct {
-	Required []CommaSeparatedID
-	Optional []NamedParameter
-}
-
 // ---------------------------------------------------------------------------
 
 // Import represents import "file".
diff --git a/ast/clone.go b/ast/clone.go
index 65ab146..ce877b0 100644
--- a/ast/clone.go
+++ b/ast/clone.go
@@ -35,17 +35,6 @@ func cloneForSpec(specPtr *ForSpec) {
 	}
 }
 
-// Updates fields of params to point to deep clones.
-func cloneParameters(params *Parameters) {
-	if params == nil {
-		return
-	}
-	params.Optional = append(make([]NamedParameter, 0), params.Optional...)
-	for i := range params.Optional {
-		clone(&params.Optional[i].DefaultArg)
-	}
-}
-
 // Updates fields of field to point to deep clones.
 func cloneField(field *ObjectField) {
 	if field.Method != nil {
@@ -158,7 +147,12 @@ func clone(astPtr *Node) {
 		r := new(Function)
 		*astPtr = r
 		*r = *node
-		cloneParameters(&r.Parameters)
+		if r.Parameters != nil {
+			r.Parameters = append(make([]Parameter, 0), r.Parameters...)
+			for i := range r.Parameters {
+				clone(&r.Parameters[i].DefaultArg)
+			}
+		}
 		clone(&r.Body)
 
 	case *Import:
diff --git a/astgen/stdast.go b/astgen/stdast.go
index b7168a1..9f50d3e 100644
--- a/astgen/stdast.go
+++ b/astgen/stdast.go
@@ -1401,914 +1401,914 @@ var p9866Var = "thunk from <function <aux>>"
 var p9866 = &p9866Var
 var p9877Var = "thunk from <function <anonymous>>"
 var p9877 = &p9877Var
-var p9887Var = "function <anonymous>"
-var p9887 = &p9887Var
-var p9893Var = "thunk <aux> from <function <anonymous>>"
-var p9893 = &p9893Var
-var p9898Var = "function <aux>"
-var p9898 = &p9898Var
-var p9939Var = "thunk from <function <aux>>"
-var p9939 = &p9939Var
-var p9959Var = "thunk from <function <aux>>"
-var p9959 = &p9959Var
-var p9966Var = "thunk <len> from <function <aux>>"
-var p9966 = &p9966Var
-var p9975Var = "thunk from <thunk <len> from <function <aux>>>"
-var p9975 = &p9975Var
-var p10007Var = "thunk <split> from <function <aux>>"
-var p10007 = &p10007Var
-var p10016Var = "thunk from <thunk <split> from <function <aux>>>"
-var p10016 = &p10016Var
-var p10029Var = "thunk from <function <aux>>"
-var p10029 = &p10029Var
-var p10042Var = "thunk from <thunk from <function <aux>>>"
-var p10042 = &p10042Var
-var p10065Var = "thunk from <thunk from <function <aux>>>"
-var p10065 = &p10065Var
-var p10080Var = "thunk from <function <aux>>"
-var p10080 = &p10080Var
-var p10094Var = "thunk from <function <aux>>"
-var p10094 = &p10094Var
-var p10116Var = "thunk from <function <aux>>"
-var p10116 = &p10116Var
-var p10132Var = "thunk from <function <aux>>"
-var p10132 = &p10132Var
-var p10143Var = "thunk <params> from <function <aux>>"
-var p10143 = &p10143Var
-var p10148Var = "function <params>"
-var p10148 = &p10148Var
-var p10161Var = "thunk from <function <params>>"
-var p10161 = &p10161Var
-var p10174Var = "thunk from <function <params>>"
-var p10174 = &p10174Var
-var p10182Var = "object <anonymous>"
-var p10182 = &p10182Var
-var p10206Var = "thunk from <function <params>>"
-var p10206 = &p10206Var
-var p10219Var = "thunk from <function <params>>"
-var p10219 = &p10219Var
-var p10227Var = "object <anonymous>"
-var p10227 = &p10227Var
-var p10239Var = "object <anonymous>"
-var p10239 = &p10239Var
-var p10248Var = "thunk <range> from <function <aux>>"
-var p10248 = &p10248Var
-var p10257Var = "thunk from <thunk <range> from <function <aux>>>"
-var p10257 = &p10257Var
-var p10269Var = "thunk from <thunk from <thunk <range> from <function <aux>>>>"
-var p10269 = &p10269Var
-var p10302Var = "thunk from <thunk <parts> from <function <aux>>>"
-var p10302 = &p10302Var
-var p10319Var = "thunk from <thunk from <thunk <parts> from <function <aux>>>>"
-var p10319 = &p10319Var
-var p10333Var = "thunk from <thunk from <thunk from <thunk <parts> from <function <aux>>>>>"
-var p10333 = &p10333Var
-var p10341Var = "thunk <parts> from <function <aux>>"
-var p10341 = &p10341Var
-var p10345Var = "thunk from <thunk <parts> from <function <aux>>>"
-var p10345 = &p10345Var
-var p10351Var = "thunk from <thunk from <thunk <parts> from <function <aux>>>>"
-var p10351 = &p10351Var
-var p10369Var = "thunk from <function <aux>>"
-var p10369 = &p10369Var
-var p10388Var = "thunk from <function <aux>>"
-var p10388 = &p10388Var
-var p10404Var = "thunk from <function <aux>>"
-var p10404 = &p10404Var
-var p10415Var = "thunk <params> from <function <aux>>"
-var p10415 = &p10415Var
-var p10420Var = "function <params>"
-var p10420 = &p10420Var
-var p10433Var = "thunk from <function <params>>"
-var p10433 = &p10433Var
-var p10446Var = "thunk from <function <params>>"
-var p10446 = &p10446Var
-var p10454Var = "object <anonymous>"
-var p10454 = &p10454Var
-var p10484Var = "thunk from <function <params>>"
-var p10484 = &p10484Var
-var p10497Var = "thunk from <function <params>>"
-var p10497 = &p10497Var
-var p10505Var = "object <anonymous>"
-var p10505 = &p10505Var
-var p10521Var = "object <anonymous>"
-var p10521 = &p10521Var
-var p10555Var = "thunk from <thunk <lines> from <function <aux>>>"
-var p10555 = &p10555Var
-var p10571Var = "thunk from <thunk from <thunk <lines> from <function <aux>>>>"
-var p10571 = &p10571Var
-var p10585Var = "thunk from <thunk from <thunk <lines> from <function <aux>>>>"
-var p10585 = &p10585Var
-var p10599Var = "thunk from <thunk from <thunk from <thunk <lines> from <function <aux>>>>>"
-var p10599 = &p10599Var
-var p10607Var = "thunk <lines> from <function <aux>>"
-var p10607 = &p10607Var
-var p10611Var = "thunk from <thunk <lines> from <function <aux>>>"
-var p10611 = &p10611Var
-var p10617Var = "thunk from <thunk from <thunk <lines> from <function <aux>>>>"
-var p10617 = &p10617Var
-var p10632Var = "thunk from <thunk <lines> from <function <aux>>>"
-var p10632 = &p10632Var
-var p10644Var = "thunk from <function <aux>>"
-var p10644 = &p10644Var
-var p10659Var = "thunk from <function <anonymous>>"
-var p10659 = &p10659Var
-var p10669Var = "function <anonymous>"
-var p10669 = &p10669Var
-var p10685Var = "thunk from <function <anonymous>>"
-var p10685 = &p10685Var
-var p10702Var = "thunk from <function <anonymous>>"
-var p10702 = &p10702Var
-var p10721Var = "thunk from <function <anonymous>>"
-var p10721 = &p10721Var
-var p10737Var = "thunk from <thunk from <function <anonymous>>>"
-var p10737 = &p10737Var
-var p10746Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
-var p10746 = &p10746Var
-var p10765Var = "function <anonymous>"
-var p10765 = &p10765Var
-var p10776Var = "thunk from <function <anonymous>>"
-var p10776 = &p10776Var
-var p10806Var = "thunk from <thunk <fields> from <function <anonymous>>>"
-var p10806 = &p10806Var
-var p10811Var = "thunk from <thunk from <thunk <fields> from <function <anonymous>>>>"
-var p10811 = &p10811Var
-var p10820Var = "thunk from <thunk from <thunk from <thunk <fields> from <function <anonymous>>>>>"
-var p10820 = &p10820Var
-var p10831Var = "thunk from <thunk from <thunk from <thunk <fields> from <function <anonymous>>>>>"
-var p10831 = &p10831Var
-var p10838Var = "thunk <fields> from <function <anonymous>>"
-var p10838 = &p10838Var
-var p10847Var = "thunk from <thunk <fields> from <function <anonymous>>>"
-var p10847 = &p10847Var
-var p10863Var = "thunk from <function <anonymous>>"
-var p10863 = &p10863Var
-var p10872Var = "thunk from <thunk from <function <anonymous>>>"
-var p10872 = &p10872Var
-var p10887Var = "thunk from <function <anonymous>>"
-var p10887 = &p10887Var
-var p10903Var = "thunk from <function <anonymous>>"
-var p10903 = &p10903Var
-var p10912Var = "thunk from <thunk from <function <anonymous>>>"
-var p10912 = &p10912Var
-var p10928Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
-var p10928 = &p10928Var
-var p10937Var = "thunk from <thunk from <thunk from <thunk from <function <anonymous>>>>>"
-var p10937 = &p10937Var
-var p10953Var = "thunk from <function <anonymous>>"
-var p10953 = &p10953Var
-var p10969Var = "thunk from <function <anonymous>>"
-var p10969 = &p10969Var
-var p10978Var = "thunk from <thunk from <function <anonymous>>>"
-var p10978 = &p10978Var
-var p10992Var = "thunk from <function <anonymous>>"
-var p10992 = &p10992Var
-var p11009Var = "thunk from <function <anonymous>>"
-var p11009 = &p11009Var
-var p11021Var = "thunk from <function <anonymous>>"
-var p11021 = &p11021Var
-var p11060Var = "function <anonymous>"
-var p11060 = &p11060Var
-var p11086Var = "thunk from <thunk <vars> from <function <anonymous>>>"
-var p11086 = &p11086Var
-var p11091Var = "thunk from <thunk from <thunk <vars> from <function <anonymous>>>>"
-var p11091 = &p11091Var
-var p11102Var = "thunk from <thunk from <thunk from <thunk <vars> from <function <anonymous>>>>>"
-var p11102 = &p11102Var
-var p11109Var = "thunk <vars> from <function <anonymous>>"
-var p11109 = &p11109Var
-var p11118Var = "thunk from <thunk <vars> from <function <anonymous>>>"
-var p11118 = &p11118Var
-var p11130Var = "thunk from <function <anonymous>>"
-var p11130 = &p11130Var
-var p11138Var = "thunk from <thunk from <function <anonymous>>>"
-var p11138 = &p11138Var
-var p11145Var = "function <anonymous>"
-var p11145 = &p11145Var
-var p11158Var = "thunk from <function <anonymous>>"
-var p11158 = &p11158Var
-var p11181Var = "thunk from <function <anonymous>>"
-var p11181 = &p11181Var
-var p11189Var = "thunk <aux> from <function <anonymous>>"
-var p11189 = &p11189Var
-var p11194Var = "function <aux>"
-var p11194 = &p11194Var
-var p11205Var = "thunk from <function <aux>>"
-var p11205 = &p11205Var
-var p11216Var = "thunk <tag> from <function <aux>>"
-var p11216 = &p11216Var
-var p11226Var = "thunk <has_attrs> from <function <aux>>"
-var p11226 = &p11226Var
-var p11239Var = "thunk from <thunk <has_attrs> from <function <aux>>>"
-var p11239 = &p11239Var
-var p11251Var = "thunk from <thunk <has_attrs> from <function <aux>>>"
-var p11251 = &p11251Var
-var p11261Var = "thunk <attrs> from <function <aux>>"
-var p11261 = &p11261Var
-var p11276Var = "thunk <children> from <function <aux>>"
-var p11276 = &p11276Var
-var p11311Var = "thunk <attrs_str> from <function <aux>>"
-var p11311 = &p11311Var
-var p11321Var = "thunk from <thunk <attrs_str> from <function <aux>>>"
-var p11321 = &p11321Var
-var p11345Var = "thunk from <thunk from <thunk <attrs_str> from <function <aux>>>>"
-var p11345 = &p11345Var
-var p11350Var = "thunk from <thunk from <thunk from <thunk <attrs_str> from <function <aux>>>>>"
-var p11350 = &p11350Var
-var p11367Var = "thunk from <thunk from <thunk <attrs_str> from <function <aux>>>>"
-var p11367 = &p11367Var
-var p11379Var = "thunk from <function <aux>>"
-var p11379 = &p11379Var
-var p11383Var = "thunk from <thunk from <function <aux>>>"
-var p11383 = &p11383Var
-var p11404Var = "thunk from <thunk from <thunk from <function <aux>>>>"
-var p11404 = &p11404Var
-var p11410Var = "thunk from <thunk from <thunk from <thunk from <function <aux>>>>>"
-var p11410 = &p11410Var
-var p11425Var = "thunk from <function <anonymous>>"
-var p11425 = &p11425Var
-var p11433Var = "function <anonymous>"
-var p11433 = &p11433Var
-var p11438Var = "thunk <bytes> from <function <anonymous>>"
-var p11438 = &p11438Var
-var p11449Var = "thunk from <thunk <bytes> from <function <anonymous>>>"
-var p11449 = &p11449Var
-var p11461Var = "thunk from <thunk <bytes> from <function <anonymous>>>"
-var p11461 = &p11461Var
-var p11465Var = "function <anonymous>"
-var p11465 = &p11465Var
-var p11474Var = "thunk from <function <anonymous>>"
-var p11474 = &p11474Var
-var p11487Var = "thunk <aux> from <function <anonymous>>"
-var p11487 = &p11487Var
-var p11492Var = "function <aux>"
-var p11492 = &p11492Var
-var p11507Var = "thunk from <function <aux>>"
-var p11507 = &p11507Var
-var p11531Var = "thunk from <function <aux>>"
-var p11531 = &p11531Var
-var p11538Var = "thunk <str> from <function <aux>>"
-var p11538 = &p11538Var
-var p11587Var = "thunk from <function <aux>>"
-var p11587 = &p11587Var
-var p11619Var = "thunk from <function <aux>>"
-var p11619 = &p11619Var
-var p11626Var = "thunk <str> from <function <aux>>"
-var p11626 = &p11626Var
-var p11715Var = "thunk from <function <aux>>"
-var p11715 = &p11715Var
-var p11734Var = "thunk <str> from <function <aux>>"
-var p11734 = &p11734Var
-var p11856Var = "thunk from <function <aux>>"
-var p11856 = &p11856Var
-var p11874Var = "thunk <sanity> from <function <anonymous>>"
-var p11874 = &p11874Var
-var p11883Var = "thunk from <thunk <sanity> from <function <anonymous>>>"
-var p11883 = &p11883Var
-var p11886Var = "function <anonymous>"
-var p11886 = &p11886Var
-var p11916Var = "thunk from <function <anonymous>>"
-var p11916 = &p11916Var
-var p11926Var = "function <anonymous>"
-var p11926 = &p11926Var
-var p11947Var = "thunk from <function <anonymous>>"
-var p11947 = &p11947Var
-var p11971Var = "thunk <aux> from <function <anonymous>>"
-var p11971 = &p11971Var
-var p11976Var = "function <aux>"
-var p11976 = &p11976Var
-var p11991Var = "thunk from <function <aux>>"
-var p11991 = &p11991Var
-var p12003Var = "thunk <n1> from <function <aux>>"
-var p12003 = &p12003Var
-var p12007Var = "thunk from <thunk <n1> from <function <aux>>>"
-var p12007 = &p12007Var
-var p12045Var = "thunk <n2> from <function <aux>>"
-var p12045 = &p12045Var
-var p12065Var = "thunk from <thunk <n2> from <function <aux>>>"
-var p12065 = &p12065Var
-var p12109Var = "thunk <n3> from <function <aux>>"
-var p12109 = &p12109Var
-var p12129Var = "thunk from <thunk <n3> from <function <aux>>>"
-var p12129 = &p12129Var
-var p12170Var = "thunk from <function <aux>>"
-var p12170 = &p12170Var
-var p12198Var = "thunk from <function <anonymous>>"
-var p12198 = &p12198Var
-var p12208Var = "function <anonymous>"
-var p12208 = &p12208Var
-var p12212Var = "thunk <bytes> from <function <anonymous>>"
-var p12212 = &p12212Var
-var p12221Var = "thunk from <thunk <bytes> from <function <anonymous>>>"
-var p12221 = &p12221Var
-var p12233Var = "thunk from <function <anonymous>>"
-var p12233 = &p12233Var
-var p12243Var = "thunk from <thunk from <function <anonymous>>>"
-var p12243 = &p12243Var
-var p12247Var = "function <anonymous>"
-var p12247 = &p12247Var
-var p12256Var = "thunk from <function <anonymous>>"
-var p12256 = &p12256Var
-var p12266Var = "function <anonymous>"
-var p12266 = &p12266Var
-var p12270Var = "thunk <l> from <function <anonymous>>"
-var p12270 = &p12270Var
-var p12279Var = "thunk from <thunk <l> from <function <anonymous>>>"
-var p12279 = &p12279Var
-var p12291Var = "thunk from <function <anonymous>>"
-var p12291 = &p12291Var
-var p12297Var = "function <anonymous>"
-var p12297 = &p12297Var
-var p12316Var = "function <anonymous>"
-var p12316 = &p12316Var
-var p12323Var = "thunk <quickSort> from <function <anonymous>>"
-var p12323 = &p12323Var
-var p12328Var = "function <quickSort>"
-var p12328 = &p12328Var
-var p12335Var = "thunk <l> from <function <quickSort>>"
-var p12335 = &p12335Var
-var p12344Var = "thunk from <thunk <l> from <function <quickSort>>>"
-var p12344 = &p12344Var
-var p12360Var = "thunk from <function <quickSort>>"
-var p12360 = &p12360Var
-var p12372Var = "thunk <pos> from <function <quickSort>>"
-var p12372 = &p12372Var
-var p12378Var = "thunk <pivot> from <function <quickSort>>"
-var p12378 = &p12378Var
-var p12384Var = "thunk from <thunk <pivot> from <function <quickSort>>>"
-var p12384 = &p12384Var
-var p12395Var = "thunk <rest> from <function <quickSort>>"
-var p12395 = &p12395Var
-var p12404Var = "thunk from <thunk <rest> from <function <quickSort>>>"
-var p12404 = &p12404Var
-var p12413Var = "function <anonymous>"
-var p12413 = &p12413Var
-var p12441Var = "thunk <left> from <function <quickSort>>"
-var p12441 = &p12441Var
-var p12450Var = "thunk from <thunk <left> from <function <quickSort>>>"
+var p9886Var = "function <anonymous>"
+var p9886 = &p9886Var
+var p9892Var = "thunk <aux> from <function <anonymous>>"
+var p9892 = &p9892Var
+var p9897Var = "function <aux>"
+var p9897 = &p9897Var
+var p9938Var = "thunk from <function <aux>>"
+var p9938 = &p9938Var
+var p9958Var = "thunk from <function <aux>>"
+var p9958 = &p9958Var
+var p9965Var = "thunk <len> from <function <aux>>"
+var p9965 = &p9965Var
+var p9974Var = "thunk from <thunk <len> from <function <aux>>>"
+var p9974 = &p9974Var
+var p10006Var = "thunk <split> from <function <aux>>"
+var p10006 = &p10006Var
+var p10015Var = "thunk from <thunk <split> from <function <aux>>>"
+var p10015 = &p10015Var
+var p10028Var = "thunk from <function <aux>>"
+var p10028 = &p10028Var
+var p10041Var = "thunk from <thunk from <function <aux>>>"
+var p10041 = &p10041Var
+var p10064Var = "thunk from <thunk from <function <aux>>>"
+var p10064 = &p10064Var
+var p10079Var = "thunk from <function <aux>>"
+var p10079 = &p10079Var
+var p10093Var = "thunk from <function <aux>>"
+var p10093 = &p10093Var
+var p10115Var = "thunk from <function <aux>>"
+var p10115 = &p10115Var
+var p10131Var = "thunk from <function <aux>>"
+var p10131 = &p10131Var
+var p10142Var = "thunk <params> from <function <aux>>"
+var p10142 = &p10142Var
+var p10147Var = "function <params>"
+var p10147 = &p10147Var
+var p10160Var = "thunk from <function <params>>"
+var p10160 = &p10160Var
+var p10173Var = "thunk from <function <params>>"
+var p10173 = &p10173Var
+var p10181Var = "object <anonymous>"
+var p10181 = &p10181Var
+var p10205Var = "thunk from <function <params>>"
+var p10205 = &p10205Var
+var p10218Var = "thunk from <function <params>>"
+var p10218 = &p10218Var
+var p10226Var = "object <anonymous>"
+var p10226 = &p10226Var
+var p10238Var = "object <anonymous>"
+var p10238 = &p10238Var
+var p10247Var = "thunk <range> from <function <aux>>"
+var p10247 = &p10247Var
+var p10256Var = "thunk from <thunk <range> from <function <aux>>>"
+var p10256 = &p10256Var
+var p10268Var = "thunk from <thunk from <thunk <range> from <function <aux>>>>"
+var p10268 = &p10268Var
+var p10301Var = "thunk from <thunk <parts> from <function <aux>>>"
+var p10301 = &p10301Var
+var p10318Var = "thunk from <thunk from <thunk <parts> from <function <aux>>>>"
+var p10318 = &p10318Var
+var p10332Var = "thunk from <thunk from <thunk from <thunk <parts> from <function <aux>>>>>"
+var p10332 = &p10332Var
+var p10340Var = "thunk <parts> from <function <aux>>"
+var p10340 = &p10340Var
+var p10344Var = "thunk from <thunk <parts> from <function <aux>>>"
+var p10344 = &p10344Var
+var p10350Var = "thunk from <thunk from <thunk <parts> from <function <aux>>>>"
+var p10350 = &p10350Var
+var p10368Var = "thunk from <function <aux>>"
+var p10368 = &p10368Var
+var p10387Var = "thunk from <function <aux>>"
+var p10387 = &p10387Var
+var p10403Var = "thunk from <function <aux>>"
+var p10403 = &p10403Var
+var p10414Var = "thunk <params> from <function <aux>>"
+var p10414 = &p10414Var
+var p10419Var = "function <params>"
+var p10419 = &p10419Var
+var p10432Var = "thunk from <function <params>>"
+var p10432 = &p10432Var
+var p10445Var = "thunk from <function <params>>"
+var p10445 = &p10445Var
+var p10453Var = "object <anonymous>"
+var p10453 = &p10453Var
+var p10483Var = "thunk from <function <params>>"
+var p10483 = &p10483Var
+var p10496Var = "thunk from <function <params>>"
+var p10496 = &p10496Var
+var p10504Var = "object <anonymous>"
+var p10504 = &p10504Var
+var p10520Var = "object <anonymous>"
+var p10520 = &p10520Var
+var p10554Var = "thunk from <thunk <lines> from <function <aux>>>"
+var p10554 = &p10554Var
+var p10570Var = "thunk from <thunk from <thunk <lines> from <function <aux>>>>"
+var p10570 = &p10570Var
+var p10584Var = "thunk from <thunk from <thunk <lines> from <function <aux>>>>"
+var p10584 = &p10584Var
+var p10598Var = "thunk from <thunk from <thunk from <thunk <lines> from <function <aux>>>>>"
+var p10598 = &p10598Var
+var p10606Var = "thunk <lines> from <function <aux>>"
+var p10606 = &p10606Var
+var p10610Var = "thunk from <thunk <lines> from <function <aux>>>"
+var p10610 = &p10610Var
+var p10616Var = "thunk from <thunk from <thunk <lines> from <function <aux>>>>"
+var p10616 = &p10616Var
+var p10631Var = "thunk from <thunk <lines> from <function <aux>>>"
+var p10631 = &p10631Var
+var p10643Var = "thunk from <function <aux>>"
+var p10643 = &p10643Var
+var p10658Var = "thunk from <function <anonymous>>"
+var p10658 = &p10658Var
+var p10667Var = "function <anonymous>"
+var p10667 = &p10667Var
+var p10683Var = "thunk from <function <anonymous>>"
+var p10683 = &p10683Var
+var p10700Var = "thunk from <function <anonymous>>"
+var p10700 = &p10700Var
+var p10719Var = "thunk from <function <anonymous>>"
+var p10719 = &p10719Var
+var p10735Var = "thunk from <thunk from <function <anonymous>>>"
+var p10735 = &p10735Var
+var p10744Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
+var p10744 = &p10744Var
+var p10763Var = "function <anonymous>"
+var p10763 = &p10763Var
+var p10774Var = "thunk from <function <anonymous>>"
+var p10774 = &p10774Var
+var p10804Var = "thunk from <thunk <fields> from <function <anonymous>>>"
+var p10804 = &p10804Var
+var p10809Var = "thunk from <thunk from <thunk <fields> from <function <anonymous>>>>"
+var p10809 = &p10809Var
+var p10818Var = "thunk from <thunk from <thunk from <thunk <fields> from <function <anonymous>>>>>"
+var p10818 = &p10818Var
+var p10829Var = "thunk from <thunk from <thunk from <thunk <fields> from <function <anonymous>>>>>"
+var p10829 = &p10829Var
+var p10836Var = "thunk <fields> from <function <anonymous>>"
+var p10836 = &p10836Var
+var p10845Var = "thunk from <thunk <fields> from <function <anonymous>>>"
+var p10845 = &p10845Var
+var p10861Var = "thunk from <function <anonymous>>"
+var p10861 = &p10861Var
+var p10870Var = "thunk from <thunk from <function <anonymous>>>"
+var p10870 = &p10870Var
+var p10885Var = "thunk from <function <anonymous>>"
+var p10885 = &p10885Var
+var p10901Var = "thunk from <function <anonymous>>"
+var p10901 = &p10901Var
+var p10910Var = "thunk from <thunk from <function <anonymous>>>"
+var p10910 = &p10910Var
+var p10926Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
+var p10926 = &p10926Var
+var p10935Var = "thunk from <thunk from <thunk from <thunk from <function <anonymous>>>>>"
+var p10935 = &p10935Var
+var p10951Var = "thunk from <function <anonymous>>"
+var p10951 = &p10951Var
+var p10967Var = "thunk from <function <anonymous>>"
+var p10967 = &p10967Var
+var p10976Var = "thunk from <thunk from <function <anonymous>>>"
+var p10976 = &p10976Var
+var p10990Var = "thunk from <function <anonymous>>"
+var p10990 = &p10990Var
+var p11007Var = "thunk from <function <anonymous>>"
+var p11007 = &p11007Var
+var p11019Var = "thunk from <function <anonymous>>"
+var p11019 = &p11019Var
+var p11058Var = "function <anonymous>"
+var p11058 = &p11058Var
+var p11084Var = "thunk from <thunk <vars> from <function <anonymous>>>"
+var p11084 = &p11084Var
+var p11089Var = "thunk from <thunk from <thunk <vars> from <function <anonymous>>>>"
+var p11089 = &p11089Var
+var p11100Var = "thunk from <thunk from <thunk from <thunk <vars> from <function <anonymous>>>>>"
+var p11100 = &p11100Var
+var p11107Var = "thunk <vars> from <function <anonymous>>"
+var p11107 = &p11107Var
+var p11116Var = "thunk from <thunk <vars> from <function <anonymous>>>"
+var p11116 = &p11116Var
+var p11128Var = "thunk from <function <anonymous>>"
+var p11128 = &p11128Var
+var p11136Var = "thunk from <thunk from <function <anonymous>>>"
+var p11136 = &p11136Var
+var p11143Var = "function <anonymous>"
+var p11143 = &p11143Var
+var p11156Var = "thunk from <function <anonymous>>"
+var p11156 = &p11156Var
+var p11179Var = "thunk from <function <anonymous>>"
+var p11179 = &p11179Var
+var p11187Var = "thunk <aux> from <function <anonymous>>"
+var p11187 = &p11187Var
+var p11192Var = "function <aux>"
+var p11192 = &p11192Var
+var p11203Var = "thunk from <function <aux>>"
+var p11203 = &p11203Var
+var p11214Var = "thunk <tag> from <function <aux>>"
+var p11214 = &p11214Var
+var p11224Var = "thunk <has_attrs> from <function <aux>>"
+var p11224 = &p11224Var
+var p11237Var = "thunk from <thunk <has_attrs> from <function <aux>>>"
+var p11237 = &p11237Var
+var p11249Var = "thunk from <thunk <has_attrs> from <function <aux>>>"
+var p11249 = &p11249Var
+var p11259Var = "thunk <attrs> from <function <aux>>"
+var p11259 = &p11259Var
+var p11274Var = "thunk <children> from <function <aux>>"
+var p11274 = &p11274Var
+var p11309Var = "thunk <attrs_str> from <function <aux>>"
+var p11309 = &p11309Var
+var p11319Var = "thunk from <thunk <attrs_str> from <function <aux>>>"
+var p11319 = &p11319Var
+var p11343Var = "thunk from <thunk from <thunk <attrs_str> from <function <aux>>>>"
+var p11343 = &p11343Var
+var p11348Var = "thunk from <thunk from <thunk from <thunk <attrs_str> from <function <aux>>>>>"
+var p11348 = &p11348Var
+var p11365Var = "thunk from <thunk from <thunk <attrs_str> from <function <aux>>>>"
+var p11365 = &p11365Var
+var p11377Var = "thunk from <function <aux>>"
+var p11377 = &p11377Var
+var p11381Var = "thunk from <thunk from <function <aux>>>"
+var p11381 = &p11381Var
+var p11402Var = "thunk from <thunk from <thunk from <function <aux>>>>"
+var p11402 = &p11402Var
+var p11408Var = "thunk from <thunk from <thunk from <thunk from <function <aux>>>>>"
+var p11408 = &p11408Var
+var p11423Var = "thunk from <function <anonymous>>"
+var p11423 = &p11423Var
+var p11431Var = "function <anonymous>"
+var p11431 = &p11431Var
+var p11436Var = "thunk <bytes> from <function <anonymous>>"
+var p11436 = &p11436Var
+var p11447Var = "thunk from <thunk <bytes> from <function <anonymous>>>"
+var p11447 = &p11447Var
+var p11459Var = "thunk from <thunk <bytes> from <function <anonymous>>>"
+var p11459 = &p11459Var
+var p11463Var = "function <anonymous>"
+var p11463 = &p11463Var
+var p11472Var = "thunk from <function <anonymous>>"
+var p11472 = &p11472Var
+var p11485Var = "thunk <aux> from <function <anonymous>>"
+var p11485 = &p11485Var
+var p11490Var = "function <aux>"
+var p11490 = &p11490Var
+var p11505Var = "thunk from <function <aux>>"
+var p11505 = &p11505Var
+var p11529Var = "thunk from <function <aux>>"
+var p11529 = &p11529Var
+var p11536Var = "thunk <str> from <function <aux>>"
+var p11536 = &p11536Var
+var p11585Var = "thunk from <function <aux>>"
+var p11585 = &p11585Var
+var p11617Var = "thunk from <function <aux>>"
+var p11617 = &p11617Var
+var p11624Var = "thunk <str> from <function <aux>>"
+var p11624 = &p11624Var
+var p11713Var = "thunk from <function <aux>>"
+var p11713 = &p11713Var
+var p11732Var = "thunk <str> from <function <aux>>"
+var p11732 = &p11732Var
+var p11854Var = "thunk from <function <aux>>"
+var p11854 = &p11854Var
+var p11872Var = "thunk <sanity> from <function <anonymous>>"
+var p11872 = &p11872Var
+var p11881Var = "thunk from <thunk <sanity> from <function <anonymous>>>"
+var p11881 = &p11881Var
+var p11884Var = "function <anonymous>"
+var p11884 = &p11884Var
+var p11914Var = "thunk from <function <anonymous>>"
+var p11914 = &p11914Var
+var p11924Var = "function <anonymous>"
+var p11924 = &p11924Var
+var p11945Var = "thunk from <function <anonymous>>"
+var p11945 = &p11945Var
+var p11969Var = "thunk <aux> from <function <anonymous>>"
+var p11969 = &p11969Var
+var p11974Var = "function <aux>"
+var p11974 = &p11974Var
+var p11989Var = "thunk from <function <aux>>"
+var p11989 = &p11989Var
+var p12001Var = "thunk <n1> from <function <aux>>"
+var p12001 = &p12001Var
+var p12005Var = "thunk from <thunk <n1> from <function <aux>>>"
+var p12005 = &p12005Var
+var p12043Var = "thunk <n2> from <function <aux>>"
+var p12043 = &p12043Var
+var p12063Var = "thunk from <thunk <n2> from <function <aux>>>"
+var p12063 = &p12063Var
+var p12107Var = "thunk <n3> from <function <aux>>"
+var p12107 = &p12107Var
+var p12127Var = "thunk from <thunk <n3> from <function <aux>>>"
+var p12127 = &p12127Var
+var p12168Var = "thunk from <function <aux>>"
+var p12168 = &p12168Var
+var p12196Var = "thunk from <function <anonymous>>"
+var p12196 = &p12196Var
+var p12206Var = "function <anonymous>"
+var p12206 = &p12206Var
+var p12210Var = "thunk <bytes> from <function <anonymous>>"
+var p12210 = &p12210Var
+var p12219Var = "thunk from <thunk <bytes> from <function <anonymous>>>"
+var p12219 = &p12219Var
+var p12231Var = "thunk from <function <anonymous>>"
+var p12231 = &p12231Var
+var p12241Var = "thunk from <thunk from <function <anonymous>>>"
+var p12241 = &p12241Var
+var p12245Var = "function <anonymous>"
+var p12245 = &p12245Var
+var p12254Var = "thunk from <function <anonymous>>"
+var p12254 = &p12254Var
+var p12264Var = "function <anonymous>"
+var p12264 = &p12264Var
+var p12268Var = "thunk <l> from <function <anonymous>>"
+var p12268 = &p12268Var
+var p12277Var = "thunk from <thunk <l> from <function <anonymous>>>"
+var p12277 = &p12277Var
+var p12289Var = "thunk from <function <anonymous>>"
+var p12289 = &p12289Var
+var p12295Var = "function <anonymous>"
+var p12295 = &p12295Var
+var p12313Var = "function <anonymous>"
+var p12313 = &p12313Var
+var p12320Var = "thunk <quickSort> from <function <anonymous>>"
+var p12320 = &p12320Var
+var p12324Var = "function <quickSort>"
+var p12324 = &p12324Var
+var p12331Var = "thunk <l> from <function <quickSort>>"
+var p12331 = &p12331Var
+var p12340Var = "thunk from <thunk <l> from <function <quickSort>>>"
+var p12340 = &p12340Var
+var p12356Var = "thunk from <function <quickSort>>"
+var p12356 = &p12356Var
+var p12368Var = "thunk <pos> from <function <quickSort>>"
+var p12368 = &p12368Var
+var p12374Var = "thunk <pivot> from <function <quickSort>>"
+var p12374 = &p12374Var
+var p12380Var = "thunk from <thunk <pivot> from <function <quickSort>>>"
+var p12380 = &p12380Var
+var p12391Var = "thunk <rest> from <function <quickSort>>"
+var p12391 = &p12391Var
+var p12400Var = "thunk from <thunk <rest> from <function <quickSort>>>"
+var p12400 = &p12400Var
+var p12409Var = "function <anonymous>"
+var p12409 = &p12409Var
+var p12437Var = "thunk <left> from <function <quickSort>>"
+var p12437 = &p12437Var
+var p12446Var = "thunk from <thunk <left> from <function <quickSort>>>"
+var p12446 = &p12446Var
+var p12450Var = "function <anonymous>"
 var p12450 = &p12450Var
-var p12454Var = "function <anonymous>"
-var p12454 = &p12454Var
-var p12462Var = "thunk from <function <anonymous>>"
-var p12462 = &p12462Var
-var p12473Var = "thunk <right> from <function <quickSort>>"
-var p12473 = &p12473Var
-var p12482Var = "thunk from <thunk <right> from <function <quickSort>>>"
+var p12458Var = "thunk from <function <anonymous>>"
+var p12458 = &p12458Var
+var p12469Var = "thunk <right> from <function <quickSort>>"
+var p12469 = &p12469Var
+var p12478Var = "thunk from <thunk <right> from <function <quickSort>>>"
+var p12478 = &p12478Var
+var p12482Var = "function <anonymous>"
 var p12482 = &p12482Var
-var p12486Var = "function <anonymous>"
-var p12486 = &p12486Var
-var p12494Var = "thunk from <function <anonymous>>"
-var p12494 = &p12494Var
-var p12511Var = "thunk from <function <quickSort>>"
-var p12511 = &p12511Var
-var p12519Var = "thunk from <function <quickSort>>"
-var p12519 = &p12519Var
-var p12531Var = "thunk from <function <quickSort>>"
-var p12531 = &p12531Var
-var p12540Var = "thunk <merge> from <function <anonymous>>"
-var p12540 = &p12540Var
-var p12545Var = "function <merge>"
+var p12490Var = "thunk from <function <anonymous>>"
+var p12490 = &p12490Var
+var p12507Var = "thunk from <function <quickSort>>"
+var p12507 = &p12507Var
+var p12515Var = "thunk from <function <quickSort>>"
+var p12515 = &p12515Var
+var p12527Var = "thunk from <function <quickSort>>"
+var p12527 = &p12527Var
+var p12536Var = "thunk <merge> from <function <anonymous>>"
+var p12536 = &p12536Var
+var p12541Var = "function <merge>"
+var p12541 = &p12541Var
+var p12545Var = "thunk <la> from <function <merge>>"
 var p12545 = &p12545Var
-var p12549Var = "thunk <la> from <function <merge>>"
-var p12549 = &p12549Var
-var p12558Var = "thunk from <thunk <la> from <function <merge>>>"
-var p12558 = &p12558Var
-var p12561Var = "thunk <lb> from <function <merge>>"
-var p12561 = &p12561Var
-var p12570Var = "thunk from <thunk <lb> from <function <merge>>>"
-var p12570 = &p12570Var
-var p12577Var = "thunk <aux> from <function <merge>>"
-var p12577 = &p12577Var
-var p12582Var = "function <aux>"
-var p12582 = &p12582Var
-var p12649Var = "thunk from <function <aux>>"
-var p12649 = &p12649Var
-var p12661Var = "thunk from <function <aux>>"
-var p12661 = &p12661Var
-var p12674Var = "thunk from <function <aux>>"
-var p12674 = &p12674Var
-var p12689Var = "thunk from <thunk from <function <aux>>>"
-var p12689 = &p12689Var
-var p12703Var = "thunk from <function <aux>>"
-var p12703 = &p12703Var
-var p12718Var = "thunk from <thunk from <function <aux>>>"
-var p12718 = &p12718Var
-var p12731Var = "thunk from <function <merge>>"
-var p12731 = &p12731Var
-var p12739Var = "thunk <l> from <function <anonymous>>"
-var p12739 = &p12739Var
-var p12748Var = "thunk from <thunk <l> from <function <anonymous>>>"
-var p12748 = &p12748Var
-var p12764Var = "thunk from <function <anonymous>>"
-var p12764 = &p12764Var
-var p12774Var = "thunk from <function <anonymous>>"
-var p12774 = &p12774Var
-var p12785Var = "thunk <mid> from <function <anonymous>>"
-var p12785 = &p12785Var
-var p12794Var = "thunk from <thunk <mid> from <function <anonymous>>>"
-var p12794 = &p12794Var
-var p12812Var = "thunk <left> from <function <anonymous>>"
-var p12812 = &p12812Var
-var p12827Var = "thunk <right> from <function <anonymous>>"
-var p12827 = &p12827Var
-var p12840Var = "thunk from <function <anonymous>>"
-var p12840 = &p12840Var
-var p12849Var = "thunk from <thunk from <function <anonymous>>>"
-var p12849 = &p12849Var
-var p12863Var = "thunk from <thunk from <function <anonymous>>>"
-var p12863 = &p12863Var
-var p12874Var = "function <anonymous>"
-var p12874 = &p12874Var
-var p12881Var = "thunk <f> from <function <anonymous>>"
+var p12554Var = "thunk from <thunk <la> from <function <merge>>>"
+var p12554 = &p12554Var
+var p12557Var = "thunk <lb> from <function <merge>>"
+var p12557 = &p12557Var
+var p12566Var = "thunk from <thunk <lb> from <function <merge>>>"
+var p12566 = &p12566Var
+var p12573Var = "thunk <aux> from <function <merge>>"
+var p12573 = &p12573Var
+var p12578Var = "function <aux>"
+var p12578 = &p12578Var
+var p12645Var = "thunk from <function <aux>>"
+var p12645 = &p12645Var
+var p12657Var = "thunk from <function <aux>>"
+var p12657 = &p12657Var
+var p12670Var = "thunk from <function <aux>>"
+var p12670 = &p12670Var
+var p12685Var = "thunk from <thunk from <function <aux>>>"
+var p12685 = &p12685Var
+var p12699Var = "thunk from <function <aux>>"
+var p12699 = &p12699Var
+var p12714Var = "thunk from <thunk from <function <aux>>>"
+var p12714 = &p12714Var
+var p12727Var = "thunk from <function <merge>>"
+var p12727 = &p12727Var
+var p12735Var = "thunk <l> from <function <anonymous>>"
+var p12735 = &p12735Var
+var p12744Var = "thunk from <thunk <l> from <function <anonymous>>>"
+var p12744 = &p12744Var
+var p12760Var = "thunk from <function <anonymous>>"
+var p12760 = &p12760Var
+var p12770Var = "thunk from <function <anonymous>>"
+var p12770 = &p12770Var
+var p12781Var = "thunk <mid> from <function <anonymous>>"
+var p12781 = &p12781Var
+var p12790Var = "thunk from <thunk <mid> from <function <anonymous>>>"
+var p12790 = &p12790Var
+var p12808Var = "thunk <left> from <function <anonymous>>"
+var p12808 = &p12808Var
+var p12823Var = "thunk <right> from <function <anonymous>>"
+var p12823 = &p12823Var
+var p12836Var = "thunk from <function <anonymous>>"
+var p12836 = &p12836Var
+var p12845Var = "thunk from <thunk from <function <anonymous>>>"
+var p12845 = &p12845Var
+var p12859Var = "thunk from <thunk from <function <anonymous>>>"
+var p12859 = &p12859Var
+var p12869Var = "function <anonymous>"
+var p12869 = &p12869Var
+var p12876Var = "thunk <f> from <function <anonymous>>"
+var p12876 = &p12876Var
+var p12881Var = "function <f>"
 var p12881 = &p12881Var
-var p12886Var = "function <f>"
-var p12886 = &p12886Var
-var p12899Var = "thunk from <function <f>>"
-var p12899 = &p12899Var
-var p12907Var = "thunk from <function <f>>"
-var p12907 = &p12907Var
-var p12920Var = "thunk from <function <f>>"
-var p12920 = &p12920Var
-var p12935Var = "thunk from <thunk from <function <f>>>"
-var p12935 = &p12935Var
-var p12944Var = "thunk from <function <f>>"
-var p12944 = &p12944Var
-var p12959Var = "thunk from <function <f>>"
-var p12959 = &p12959Var
-var p12971Var = "thunk from <function <anonymous>>"
-var p12971 = &p12971Var
-var p12982Var = "function <anonymous>"
-var p12982 = &p12982Var
-var p12994Var = "thunk from <function <anonymous>>"
-var p12994 = &p12994Var
-var p13003Var = "thunk from <thunk from <function <anonymous>>>"
-var p13003 = &p13003Var
-var p13015Var = "function <anonymous>"
-var p13015 = &p13015Var
-var p13030Var = "thunk from <function <anonymous>>"
-var p13030 = &p13030Var
-var p13039Var = "thunk from <thunk from <function <anonymous>>>"
-var p13039 = &p13039Var
-var p13043Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
-var p13043 = &p13043Var
-var p13056Var = "function <anonymous>"
+var p12894Var = "thunk from <function <f>>"
+var p12894 = &p12894Var
+var p12902Var = "thunk from <function <f>>"
+var p12902 = &p12902Var
+var p12915Var = "thunk from <function <f>>"
+var p12915 = &p12915Var
+var p12930Var = "thunk from <thunk from <function <f>>>"
+var p12930 = &p12930Var
+var p12939Var = "thunk from <function <f>>"
+var p12939 = &p12939Var
+var p12954Var = "thunk from <function <f>>"
+var p12954 = &p12954Var
+var p12966Var = "thunk from <function <anonymous>>"
+var p12966 = &p12966Var
+var p12976Var = "function <anonymous>"
+var p12976 = &p12976Var
+var p12988Var = "thunk from <function <anonymous>>"
+var p12988 = &p12988Var
+var p12997Var = "thunk from <thunk from <function <anonymous>>>"
+var p12997 = &p12997Var
+var p13008Var = "function <anonymous>"
+var p13008 = &p13008Var
+var p13023Var = "thunk from <function <anonymous>>"
+var p13023 = &p13023Var
+var p13032Var = "thunk from <thunk from <function <anonymous>>>"
+var p13032 = &p13032Var
+var p13036Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
+var p13036 = &p13036Var
+var p13048Var = "function <anonymous>"
+var p13048 = &p13048Var
+var p13056Var = "thunk <aux> from <function <anonymous>>"
 var p13056 = &p13056Var
-var p13064Var = "thunk <aux> from <function <anonymous>>"
-var p13064 = &p13064Var
-var p13069Var = "function <aux>"
-var p13069 = &p13069Var
-var p13084Var = "thunk from <function <aux>>"
-var p13084 = &p13084Var
-var p13121Var = "thunk from <function <aux>>"
-var p13121 = &p13121Var
-var p13148Var = "thunk <ak> from <function <aux>>"
-var p13148 = &p13148Var
-var p13154Var = "thunk from <thunk <ak> from <function <aux>>>"
-var p13154 = &p13154Var
-var p13165Var = "thunk <bk> from <function <aux>>"
-var p13165 = &p13165Var
-var p13171Var = "thunk from <thunk <bk> from <function <aux>>>"
-var p13171 = &p13171Var
-var p13193Var = "thunk from <function <aux>>"
-var p13193 = &p13193Var
-var p13215Var = "thunk from <thunk from <function <aux>>>"
-var p13215 = &p13215Var
-var p13237Var = "thunk from <function <aux>>"
-var p13237 = &p13237Var
-var p13256Var = "thunk from <thunk from <function <aux>>>"
-var p13256 = &p13256Var
-var p13270Var = "thunk from <function <aux>>"
-var p13270 = &p13270Var
-var p13289Var = "thunk from <thunk from <function <aux>>>"
-var p13289 = &p13289Var
-var p13302Var = "thunk from <function <anonymous>>"
-var p13302 = &p13302Var
-var p13315Var = "function <anonymous>"
-var p13315 = &p13315Var
-var p13322Var = "thunk <aux> from <function <anonymous>>"
-var p13322 = &p13322Var
-var p13327Var = "function <aux>"
-var p13327 = &p13327Var
-var p13344Var = "thunk from <function <aux>>"
-var p13344 = &p13344Var
-var p13359Var = "thunk from <function <aux>>"
-var p13359 = &p13359Var
-var p13376Var = "thunk from <function <aux>>"
-var p13376 = &p13376Var
-var p13388Var = "thunk from <function <aux>>"
-var p13388 = &p13388Var
-var p13401Var = "thunk from <function <aux>>"
-var p13401 = &p13401Var
-var p13423Var = "thunk from <thunk from <function <aux>>>"
-var p13423 = &p13423Var
-var p13440Var = "thunk from <function <aux>>"
-var p13440 = &p13440Var
-var p13452Var = "thunk from <function <aux>>"
-var p13452 = &p13452Var
-var p13465Var = "thunk from <function <aux>>"
-var p13465 = &p13465Var
-var p13486Var = "thunk from <function <aux>>"
-var p13486 = &p13486Var
-var p13506Var = "thunk from <function <anonymous>>"
-var p13506 = &p13506Var
-var p13519Var = "function <anonymous>"
-var p13519 = &p13519Var
-var p13526Var = "thunk <aux> from <function <anonymous>>"
-var p13526 = &p13526Var
-var p13531Var = "function <aux>"
-var p13531 = &p13531Var
-var p13546Var = "thunk from <function <aux>>"
-var p13546 = &p13546Var
-var p13567Var = "thunk from <function <aux>>"
-var p13567 = &p13567Var
-var p13600Var = "thunk from <function <aux>>"
-var p13600 = &p13600Var
-var p13612Var = "thunk from <function <aux>>"
-var p13612 = &p13612Var
-var p13625Var = "thunk from <function <aux>>"
-var p13625 = &p13625Var
-var p13652Var = "thunk from <function <aux>>"
-var p13652 = &p13652Var
-var p13664Var = "thunk from <function <aux>>"
-var p13664 = &p13664Var
-var p13677Var = "thunk from <function <aux>>"
-var p13677 = &p13677Var
-var p13696Var = "thunk from <thunk from <function <aux>>>"
-var p13696 = &p13696Var
-var p13710Var = "thunk from <function <aux>>"
-var p13710 = &p13710Var
-var p13730Var = "thunk from <function <anonymous>>"
-var p13730 = &p13730Var
-var p13743Var = "function <anonymous>"
-var p13743 = &p13743Var
-var p13754Var = "thunk from <function <anonymous>>"
-var p13754 = &p13754Var
-var p13762Var = "thunk <target_object> from <function <anonymous>>"
-var p13762 = &p13762Var
-var p13773Var = "thunk from <thunk <target_object> from <function <anonymous>>>"
-var p13773 = &p13773Var
-var p13784Var = "thunk <target_fields> from <function <anonymous>>"
-var p13784 = &p13784Var
-var p13795Var = "thunk from <thunk <target_fields> from <function <anonymous>>>"
-var p13795 = &p13795Var
-var p13806Var = "thunk from <thunk <target_fields> from <function <anonymous>>>"
-var p13806 = &p13806Var
-var p13827Var = "thunk <null_fields> from <function <anonymous>>"
-var p13827 = &p13827Var
-var p13840Var = "thunk from <thunk <null_fields> from <function <anonymous>>>"
-var p13840 = &p13840Var
-var p13852Var = "thunk from <thunk <null_fields> from <function <anonymous>>>"
-var p13852 = &p13852Var
-var p13859Var = "thunk <both_fields> from <function <anonymous>>"
-var p13859 = &p13859Var
-var p13868Var = "thunk from <thunk <both_fields> from <function <anonymous>>>"
-var p13868 = &p13868Var
-var p13879Var = "thunk from <thunk from <thunk <both_fields> from <function <anonymous>>>>"
-var p13879 = &p13879Var
-var p13911Var = "object <anonymous>"
-var p13911 = &p13911Var
-var p13924Var = "thunk from <object <anonymous>>"
-var p13924 = &p13924Var
-var p13949Var = "thunk from <object <anonymous>>"
-var p13949 = &p13949Var
-var p13963Var = "thunk from <object <anonymous>>"
-var p13963 = &p13963Var
-var p13981Var = "thunk from <object <anonymous>>"
-var p13981 = &p13981Var
-var p14002Var = "thunk from <function <anonymous>>"
-var p14002 = &p14002Var
-var p14015Var = "function <anonymous>"
+var p13061Var = "function <aux>"
+var p13061 = &p13061Var
+var p13076Var = "thunk from <function <aux>>"
+var p13076 = &p13076Var
+var p13113Var = "thunk from <function <aux>>"
+var p13113 = &p13113Var
+var p13140Var = "thunk <ak> from <function <aux>>"
+var p13140 = &p13140Var
+var p13146Var = "thunk from <thunk <ak> from <function <aux>>>"
+var p13146 = &p13146Var
+var p13157Var = "thunk <bk> from <function <aux>>"
+var p13157 = &p13157Var
+var p13163Var = "thunk from <thunk <bk> from <function <aux>>>"
+var p13163 = &p13163Var
+var p13185Var = "thunk from <function <aux>>"
+var p13185 = &p13185Var
+var p13207Var = "thunk from <thunk from <function <aux>>>"
+var p13207 = &p13207Var
+var p13229Var = "thunk from <function <aux>>"
+var p13229 = &p13229Var
+var p13248Var = "thunk from <thunk from <function <aux>>>"
+var p13248 = &p13248Var
+var p13262Var = "thunk from <function <aux>>"
+var p13262 = &p13262Var
+var p13281Var = "thunk from <thunk from <function <aux>>>"
+var p13281 = &p13281Var
+var p13294Var = "thunk from <function <anonymous>>"
+var p13294 = &p13294Var
+var p13306Var = "function <anonymous>"
+var p13306 = &p13306Var
+var p13313Var = "thunk <aux> from <function <anonymous>>"
+var p13313 = &p13313Var
+var p13318Var = "function <aux>"
+var p13318 = &p13318Var
+var p13335Var = "thunk from <function <aux>>"
+var p13335 = &p13335Var
+var p13350Var = "thunk from <function <aux>>"
+var p13350 = &p13350Var
+var p13367Var = "thunk from <function <aux>>"
+var p13367 = &p13367Var
+var p13379Var = "thunk from <function <aux>>"
+var p13379 = &p13379Var
+var p13392Var = "thunk from <function <aux>>"
+var p13392 = &p13392Var
+var p13414Var = "thunk from <thunk from <function <aux>>>"
+var p13414 = &p13414Var
+var p13431Var = "thunk from <function <aux>>"
+var p13431 = &p13431Var
+var p13443Var = "thunk from <function <aux>>"
+var p13443 = &p13443Var
+var p13456Var = "thunk from <function <aux>>"
+var p13456 = &p13456Var
+var p13477Var = "thunk from <function <aux>>"
+var p13477 = &p13477Var
+var p13497Var = "thunk from <function <anonymous>>"
+var p13497 = &p13497Var
+var p13509Var = "function <anonymous>"
+var p13509 = &p13509Var
+var p13516Var = "thunk <aux> from <function <anonymous>>"
+var p13516 = &p13516Var
+var p13521Var = "function <aux>"
+var p13521 = &p13521Var
+var p13536Var = "thunk from <function <aux>>"
+var p13536 = &p13536Var
+var p13557Var = "thunk from <function <aux>>"
+var p13557 = &p13557Var
+var p13590Var = "thunk from <function <aux>>"
+var p13590 = &p13590Var
+var p13602Var = "thunk from <function <aux>>"
+var p13602 = &p13602Var
+var p13615Var = "thunk from <function <aux>>"
+var p13615 = &p13615Var
+var p13642Var = "thunk from <function <aux>>"
+var p13642 = &p13642Var
+var p13654Var = "thunk from <function <aux>>"
+var p13654 = &p13654Var
+var p13667Var = "thunk from <function <aux>>"
+var p13667 = &p13667Var
+var p13686Var = "thunk from <thunk from <function <aux>>>"
+var p13686 = &p13686Var
+var p13700Var = "thunk from <function <aux>>"
+var p13700 = &p13700Var
+var p13720Var = "thunk from <function <anonymous>>"
+var p13720 = &p13720Var
+var p13733Var = "function <anonymous>"
+var p13733 = &p13733Var
+var p13744Var = "thunk from <function <anonymous>>"
+var p13744 = &p13744Var
+var p13752Var = "thunk <target_object> from <function <anonymous>>"
+var p13752 = &p13752Var
+var p13763Var = "thunk from <thunk <target_object> from <function <anonymous>>>"
+var p13763 = &p13763Var
+var p13774Var = "thunk <target_fields> from <function <anonymous>>"
+var p13774 = &p13774Var
+var p13785Var = "thunk from <thunk <target_fields> from <function <anonymous>>>"
+var p13785 = &p13785Var
+var p13796Var = "thunk from <thunk <target_fields> from <function <anonymous>>>"
+var p13796 = &p13796Var
+var p13817Var = "thunk <null_fields> from <function <anonymous>>"
+var p13817 = &p13817Var
+var p13830Var = "thunk from <thunk <null_fields> from <function <anonymous>>>"
+var p13830 = &p13830Var
+var p13842Var = "thunk from <thunk <null_fields> from <function <anonymous>>>"
+var p13842 = &p13842Var
+var p13849Var = "thunk <both_fields> from <function <anonymous>>"
+var p13849 = &p13849Var
+var p13858Var = "thunk from <thunk <both_fields> from <function <anonymous>>>"
+var p13858 = &p13858Var
+var p13869Var = "thunk from <thunk from <thunk <both_fields> from <function <anonymous>>>>"
+var p13869 = &p13869Var
+var p13901Var = "object <anonymous>"
+var p13901 = &p13901Var
+var p13914Var = "thunk from <object <anonymous>>"
+var p13914 = &p13914Var
+var p13939Var = "thunk from <object <anonymous>>"
+var p13939 = &p13939Var
+var p13953Var = "thunk from <object <anonymous>>"
+var p13953 = &p13953Var
+var p13971Var = "thunk from <object <anonymous>>"
+var p13971 = &p13971Var
+var p13992Var = "thunk from <function <anonymous>>"
+var p13992 = &p13992Var
+var p14005Var = "function <anonymous>"
+var p14005 = &p14005Var
+var p14015Var = "thunk from <function <anonymous>>"
 var p14015 = &p14015Var
-var p14025Var = "thunk from <function <anonymous>>"
-var p14025 = &p14025Var
-var p14033Var = "function <anonymous>"
+var p14023Var = "function <anonymous>"
+var p14023 = &p14023Var
+var p14033Var = "thunk from <function <anonymous>>"
 var p14033 = &p14033Var
-var p14043Var = "thunk from <function <anonymous>>"
-var p14043 = &p14043Var
-var p14051Var = "function <anonymous>"
+var p14041Var = "function <anonymous>"
+var p14041 = &p14041Var
+var p14051Var = "thunk from <function <anonymous>>"
 var p14051 = &p14051Var
-var p14061Var = "thunk from <function <anonymous>>"
+var p14061Var = "function <anonymous>"
 var p14061 = &p14061Var
-var p14071Var = "function <anonymous>"
+var p14071Var = "thunk from <function <anonymous>>"
 var p14071 = &p14071Var
-var p14081Var = "thunk from <function <anonymous>>"
-var p14081 = &p14081Var
-var p14092Var = "function <anonymous>"
-var p14092 = &p14092Var
-var p14096Var = "thunk <ta> from <function <anonymous>>"
-var p14096 = &p14096Var
-var p14105Var = "thunk from <thunk <ta> from <function <anonymous>>>"
-var p14105 = &p14105Var
-var p14112Var = "thunk <tb> from <function <anonymous>>"
-var p14112 = &p14112Var
-var p14121Var = "thunk from <thunk <tb> from <function <anonymous>>>"
-var p14121 = &p14121Var
-var p14137Var = "thunk from <function <anonymous>>"
-var p14137 = &p14137Var
-var p14156Var = "thunk from <function <anonymous>>"
-var p14156 = &p14156Var
-var p14164Var = "thunk <la> from <function <anonymous>>"
-var p14164 = &p14164Var
-var p14173Var = "thunk from <thunk <la> from <function <anonymous>>>"
-var p14173 = &p14173Var
-var p14189Var = "thunk from <function <anonymous>>"
-var p14189 = &p14189Var
-var p14200Var = "thunk from <thunk from <function <anonymous>>>"
+var p14082Var = "function <anonymous>"
+var p14082 = &p14082Var
+var p14086Var = "thunk <ta> from <function <anonymous>>"
+var p14086 = &p14086Var
+var p14095Var = "thunk from <thunk <ta> from <function <anonymous>>>"
+var p14095 = &p14095Var
+var p14102Var = "thunk <tb> from <function <anonymous>>"
+var p14102 = &p14102Var
+var p14111Var = "thunk from <thunk <tb> from <function <anonymous>>>"
+var p14111 = &p14111Var
+var p14127Var = "thunk from <function <anonymous>>"
+var p14127 = &p14127Var
+var p14146Var = "thunk from <function <anonymous>>"
+var p14146 = &p14146Var
+var p14154Var = "thunk <la> from <function <anonymous>>"
+var p14154 = &p14154Var
+var p14163Var = "thunk from <thunk <la> from <function <anonymous>>>"
+var p14163 = &p14163Var
+var p14179Var = "thunk from <function <anonymous>>"
+var p14179 = &p14179Var
+var p14190Var = "thunk from <thunk from <function <anonymous>>>"
+var p14190 = &p14190Var
+var p14200Var = "thunk <aux> from <function <anonymous>>"
 var p14200 = &p14200Var
-var p14210Var = "thunk <aux> from <function <anonymous>>"
-var p14210 = &p14210Var
-var p14215Var = "function <aux>"
-var p14215 = &p14215Var
-var p14252Var = "thunk from <function <aux>>"
-var p14252 = &p14252Var
-var p14268Var = "thunk from <function <anonymous>>"
-var p14268 = &p14268Var
-var p14285Var = "thunk from <function <anonymous>>"
-var p14285 = &p14285Var
-var p14293Var = "thunk <fields> from <function <anonymous>>"
-var p14293 = &p14293Var
-var p14302Var = "thunk from <thunk <fields> from <function <anonymous>>>"
-var p14302 = &p14302Var
-var p14309Var = "thunk <lfields> from <function <anonymous>>"
-var p14309 = &p14309Var
-var p14318Var = "thunk from <thunk <lfields> from <function <anonymous>>>"
-var p14318 = &p14318Var
-var p14336Var = "thunk from <function <anonymous>>"
+var p14205Var = "function <aux>"
+var p14205 = &p14205Var
+var p14242Var = "thunk from <function <aux>>"
+var p14242 = &p14242Var
+var p14258Var = "thunk from <function <anonymous>>"
+var p14258 = &p14258Var
+var p14275Var = "thunk from <function <anonymous>>"
+var p14275 = &p14275Var
+var p14283Var = "thunk <fields> from <function <anonymous>>"
+var p14283 = &p14283Var
+var p14292Var = "thunk from <thunk <fields> from <function <anonymous>>>"
+var p14292 = &p14292Var
+var p14299Var = "thunk <lfields> from <function <anonymous>>"
+var p14299 = &p14299Var
+var p14308Var = "thunk from <thunk <lfields> from <function <anonymous>>>"
+var p14308 = &p14308Var
+var p14326Var = "thunk from <function <anonymous>>"
+var p14326 = &p14326Var
+var p14336Var = "thunk <aux> from <function <anonymous>>"
 var p14336 = &p14336Var
-var p14346Var = "thunk <aux> from <function <anonymous>>"
-var p14346 = &p14346Var
-var p14351Var = "function <aux>"
-var p14351 = &p14351Var
-var p14368Var = "thunk <f> from <function <aux>>"
-var p14368 = &p14368Var
-var p14398Var = "thunk from <function <aux>>"
-var p14398 = &p14398Var
-var p14414Var = "thunk from <function <anonymous>>"
-var p14414 = &p14414Var
-var p14430Var = "thunk from <function <anonymous>>"
+var p14341Var = "function <aux>"
+var p14341 = &p14341Var
+var p14358Var = "thunk <f> from <function <aux>>"
+var p14358 = &p14358Var
+var p14388Var = "thunk from <function <aux>>"
+var p14388 = &p14388Var
+var p14404Var = "thunk from <function <anonymous>>"
+var p14404 = &p14404Var
+var p14420Var = "thunk from <function <anonymous>>"
+var p14420 = &p14420Var
+var p14430Var = "function <anonymous>"
 var p14430 = &p14430Var
-var p14440Var = "function <anonymous>"
-var p14440 = &p14440Var
-var p14444Var = "thunk <arr> from <function <anonymous>>"
-var p14444 = &p14444Var
-var p14453Var = "thunk from <thunk <arr> from <function <anonymous>>>"
-var p14453 = &p14453Var
-var p14466Var = "thunk from <function <anonymous>>"
-var p14466 = &p14466Var
-var p14478Var = "thunk from <thunk from <function <anonymous>>>"
-var p14478 = &p14478Var
-var p14489Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
-var p14489 = &p14489Var
-var p14496Var = "function <anonymous>"
+var p14434Var = "thunk <arr> from <function <anonymous>>"
+var p14434 = &p14434Var
+var p14443Var = "thunk from <thunk <arr> from <function <anonymous>>>"
+var p14443 = &p14443Var
+var p14456Var = "thunk from <function <anonymous>>"
+var p14456 = &p14456Var
+var p14468Var = "thunk from <thunk from <function <anonymous>>>"
+var p14468 = &p14468Var
+var p14479Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
+var p14479 = &p14479Var
+var p14486Var = "function <anonymous>"
+var p14486 = &p14486Var
+var p14496Var = "thunk from <thunk from <function <anonymous>>>"
 var p14496 = &p14496Var
-var p14506Var = "thunk from <thunk from <function <anonymous>>>"
-var p14506 = &p14506Var
-var p14514Var = "function <anonymous>"
-var p14514 = &p14514Var
-var p14518Var = "thunk <isContent> from <function <anonymous>>"
-var p14518 = &p14518Var
-var p14523Var = "function <isContent>"
-var p14523 = &p14523Var
-var p14544Var = "thunk from <function <isContent>>"
-var p14544 = &p14544Var
-var p14558Var = "thunk from <function <isContent>>"
-var p14558 = &p14558Var
-var p14573Var = "thunk from <function <isContent>>"
-var p14573 = &p14573Var
-var p14587Var = "thunk from <function <isContent>>"
-var p14587 = &p14587Var
-var p14605Var = "thunk from <function <anonymous>>"
-var p14605 = &p14605Var
-var p14626Var = "thunk from <function <anonymous>>"
-var p14626 = &p14626Var
-var p14635Var = "thunk from <thunk from <function <anonymous>>>"
-var p14635 = &p14635Var
-var p14641Var = "thunk from <function <anonymous>>"
-var p14641 = &p14641Var
-var p14650Var = "thunk from <thunk from <function <anonymous>>>"
-var p14650 = &p14650Var
-var p14667Var = "thunk from <function <anonymous>>"
-var p14667 = &p14667Var
-var p14696Var = "thunk from <function <anonymous>>"
-var p14696 = &p14696Var
-var p14705Var = "thunk from <thunk from <function <anonymous>>>"
-var p14705 = &p14705Var
-var p14720Var = "object <anonymous>"
-var p14720 = &p14720Var
-var p14729Var = "thunk from <object <anonymous>>"
-var p14729 = &p14729Var
-var p14745Var = "thunk from <function <anonymous>>"
-var p14745 = &p14745Var
-var p14756Var = "function <anonymous>"
-var p14756 = &p14756Var
-var p14769Var = "thunk from <function <anonymous>>"
-var p14769 = &p14769Var
-var p14786Var = "thunk from <function <anonymous>>"
-var p14786 = &p14786Var
-var p14802Var = "thunk from <function <anonymous>>"
-var p14802 = &p14802Var
-var p14819Var = "thunk from <function <anonymous>>"
-var p14819 = &p14819Var
-var p14827Var = "thunk <pat_len> from <function <anonymous>>"
-var p14827 = &p14827Var
-var p14836Var = "thunk from <thunk <pat_len> from <function <anonymous>>>"
-var p14836 = &p14836Var
-var p14843Var = "thunk <str_len> from <function <anonymous>>"
-var p14843 = &p14843Var
-var p14852Var = "thunk from <thunk <str_len> from <function <anonymous>>>"
-var p14852 = &p14852Var
-var p14890Var = "thunk from <function <anonymous>>"
-var p14890 = &p14890Var
-var p14894Var = "function <anonymous>"
-var p14894 = &p14894Var
-var p14926Var = "thunk from <thunk from <function <anonymous>>>"
-var p14926 = &p14926Var
-var p14939Var = "function <anonymous>"
-var p14939 = &p14939Var
-var p14952Var = "thunk from <function <anonymous>>"
-var p14952 = &p14952Var
-var p14969Var = "thunk from <function <anonymous>>"
-var p14969 = &p14969Var
-var p14982Var = "thunk from <function <anonymous>>"
-var p14982 = &p14982Var
-var p14986Var = "function <anonymous>"
-var p14986 = &p14986Var
-var p15005Var = "thunk from <thunk from <function <anonymous>>>"
-var p15005 = &p15005Var
-var p15017Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
+var p14504Var = "function <anonymous>"
+var p14504 = &p14504Var
+var p14508Var = "thunk <isContent> from <function <anonymous>>"
+var p14508 = &p14508Var
+var p14513Var = "function <isContent>"
+var p14513 = &p14513Var
+var p14534Var = "thunk from <function <isContent>>"
+var p14534 = &p14534Var
+var p14548Var = "thunk from <function <isContent>>"
+var p14548 = &p14548Var
+var p14563Var = "thunk from <function <isContent>>"
+var p14563 = &p14563Var
+var p14577Var = "thunk from <function <isContent>>"
+var p14577 = &p14577Var
+var p14595Var = "thunk from <function <anonymous>>"
+var p14595 = &p14595Var
+var p14616Var = "thunk from <function <anonymous>>"
+var p14616 = &p14616Var
+var p14625Var = "thunk from <thunk from <function <anonymous>>>"
+var p14625 = &p14625Var
+var p14631Var = "thunk from <function <anonymous>>"
+var p14631 = &p14631Var
+var p14640Var = "thunk from <thunk from <function <anonymous>>>"
+var p14640 = &p14640Var
+var p14657Var = "thunk from <function <anonymous>>"
+var p14657 = &p14657Var
+var p14686Var = "thunk from <function <anonymous>>"
+var p14686 = &p14686Var
+var p14695Var = "thunk from <thunk from <function <anonymous>>>"
+var p14695 = &p14695Var
+var p14710Var = "object <anonymous>"
+var p14710 = &p14710Var
+var p14719Var = "thunk from <object <anonymous>>"
+var p14719 = &p14719Var
+var p14735Var = "thunk from <function <anonymous>>"
+var p14735 = &p14735Var
+var p14746Var = "function <anonymous>"
+var p14746 = &p14746Var
+var p14759Var = "thunk from <function <anonymous>>"
+var p14759 = &p14759Var
+var p14776Var = "thunk from <function <anonymous>>"
+var p14776 = &p14776Var
+var p14792Var = "thunk from <function <anonymous>>"
+var p14792 = &p14792Var
+var p14809Var = "thunk from <function <anonymous>>"
+var p14809 = &p14809Var
+var p14817Var = "thunk <pat_len> from <function <anonymous>>"
+var p14817 = &p14817Var
+var p14826Var = "thunk from <thunk <pat_len> from <function <anonymous>>>"
+var p14826 = &p14826Var
+var p14833Var = "thunk <str_len> from <function <anonymous>>"
+var p14833 = &p14833Var
+var p14842Var = "thunk from <thunk <str_len> from <function <anonymous>>>"
+var p14842 = &p14842Var
+var p14880Var = "thunk from <function <anonymous>>"
+var p14880 = &p14880Var
+var p14884Var = "function <anonymous>"
+var p14884 = &p14884Var
+var p14916Var = "thunk from <thunk from <function <anonymous>>>"
+var p14916 = &p14916Var
+var p14929Var = "function <anonymous>"
+var p14929 = &p14929Var
+var p14942Var = "thunk from <function <anonymous>>"
+var p14942 = &p14942Var
+var p14959Var = "thunk from <function <anonymous>>"
+var p14959 = &p14959Var
+var p14972Var = "thunk from <function <anonymous>>"
+var p14972 = &p14972Var
+var p14976Var = "function <anonymous>"
+var p14976 = &p14976Var
+var p14995Var = "thunk from <thunk from <function <anonymous>>>"
+var p14995 = &p14995Var
+var p15007Var = "thunk from <thunk from <thunk from <function <anonymous>>>>"
+var p15007 = &p15007Var
+var p15012Var = "object <anonymous>"
+var p15012 = &p15012Var
+var p15014Var = "object <anonymous>"
+var p15014 = &p15014Var
+var p15017Var = "function <anonymous>"
 var p15017 = &p15017Var
-var p15022Var = "object <anonymous>"
-var p15022 = &p15022Var
-var p15024Var = "object <anonymous>"
-var p15024 = &p15024Var
-var p15027Var = "function <anonymous>"
-var p15027 = &p15027Var
-var p15030Var = "object <anonymous>"
-var p15030 = &p15030Var
-var p15036Var = "function <anonymous>"
-var p15036 = &p15036Var
-var p15039Var = "function <anonymous>"
-var p15039 = &p15039Var
-var p15042Var = "function <anonymous>"
-var p15042 = &p15042Var
-var p15045Var = "function <anonymous>"
-var p15045 = &p15045Var
+var p15020Var = "object <anonymous>"
+var p15020 = &p15020Var
+var p15026Var = "function <anonymous>"
+var p15026 = &p15026Var
+var p15029Var = "function <anonymous>"
+var p15029 = &p15029Var
+var p15032Var = "function <anonymous>"
+var p15032 = &p15032Var
+var p15035Var = "function <anonymous>"
+var p15035 = &p15035Var
+var p15037Var = "function <anonymous>"
+var p15037 = &p15037Var
+var p15040Var = "function <anonymous>"
+var p15040 = &p15040Var
+var p15043Var = "function <anonymous>"
+var p15043 = &p15043Var
 var p15047Var = "function <anonymous>"
 var p15047 = &p15047Var
-var p15050Var = "function <anonymous>"
-var p15050 = &p15050Var
-var p15053Var = "function <anonymous>"
-var p15053 = &p15053Var
-var p15057Var = "function <anonymous>"
-var p15057 = &p15057Var
-var p15061Var = "thunk <zero_code> from <function <anonymous>>"
+var p15051Var = "thunk <zero_code> from <function <anonymous>>"
+var p15051 = &p15051Var
+var p15054Var = "thunk <zero_code> from <function <anonymous>>"
+var p15054 = &p15054Var
+var p15061Var = "thunk from <thunk <zero_code> from <function <anonymous>>>"
 var p15061 = &p15061Var
-var p15064Var = "thunk <zero_code> from <function <anonymous>>"
+var p15064Var = "function <anonymous>"
 var p15064 = &p15064Var
-var p15071Var = "thunk from <thunk <zero_code> from <function <anonymous>>>"
+var p15068Var = "thunk <upper_a_code> from <function <anonymous>>"
+var p15068 = &p15068Var
+var p15071Var = "thunk <upper_a_code> from <function <anonymous>>"
 var p15071 = &p15071Var
-var p15074Var = "function <anonymous>"
-var p15074 = &p15074Var
-var p15078Var = "thunk <upper_a_code> from <function <anonymous>>"
+var p15078Var = "thunk from <thunk <upper_a_code> from <function <anonymous>>>"
 var p15078 = &p15078Var
-var p15081Var = "thunk <upper_a_code> from <function <anonymous>>"
+var p15081Var = "function <anonymous>"
 var p15081 = &p15081Var
-var p15088Var = "thunk from <thunk <upper_a_code> from <function <anonymous>>>"
+var p15085Var = "thunk <lower_a_code> from <function <anonymous>>"
+var p15085 = &p15085Var
+var p15088Var = "thunk <lower_a_code> from <function <anonymous>>"
 var p15088 = &p15088Var
-var p15091Var = "function <anonymous>"
-var p15091 = &p15091Var
-var p15095Var = "thunk <lower_a_code> from <function <anonymous>>"
+var p15095Var = "thunk from <thunk <lower_a_code> from <function <anonymous>>>"
 var p15095 = &p15095Var
-var p15098Var = "thunk <lower_a_code> from <function <anonymous>>"
+var p15098Var = "function <anonymous>"
 var p15098 = &p15098Var
-var p15105Var = "thunk from <thunk <lower_a_code> from <function <anonymous>>>"
-var p15105 = &p15105Var
-var p15108Var = "function <anonymous>"
-var p15108 = &p15108Var
-var p15112Var = "thunk <addDigit> from <function <anonymous>>"
-var p15112 = &p15112Var
-var p15117Var = "function <addDigit>"
-var p15117 = &p15117Var
-var p15121Var = "thunk <code> from <function <addDigit>>"
+var p15102Var = "thunk <addDigit> from <function <anonymous>>"
+var p15102 = &p15102Var
+var p15107Var = "function <addDigit>"
+var p15107 = &p15107Var
+var p15111Var = "thunk <code> from <function <addDigit>>"
+var p15111 = &p15111Var
+var p15114Var = "thunk <code> from <function <addDigit>>"
+var p15114 = &p15114Var
+var p15121Var = "thunk from <thunk <code> from <function <addDigit>>>"
 var p15121 = &p15121Var
-var p15124Var = "thunk <code> from <function <addDigit>>"
-var p15124 = &p15124Var
-var p15131Var = "thunk from <thunk <code> from <function <addDigit>>>"
-var p15131 = &p15131Var
-var p15135Var = "function <addDigit>"
+var p15125Var = "function <addDigit>"
+var p15125 = &p15125Var
+var p15129Var = "thunk <digit> from <function <addDigit>>"
+var p15129 = &p15129Var
+var p15132Var = "thunk <digit> from <function <addDigit>>"
+var p15132 = &p15132Var
+var p15135Var = "thunk <digit> from <function <addDigit>>"
 var p15135 = &p15135Var
-var p15139Var = "thunk <digit> from <function <addDigit>>"
-var p15139 = &p15139Var
-var p15142Var = "thunk <digit> from <function <addDigit>>"
-var p15142 = &p15142Var
-var p15145Var = "thunk <digit> from <function <addDigit>>"
-var p15145 = &p15145Var
+var p15138Var = "thunk <digit> from <function <addDigit>>"
+var p15138 = &p15138Var
+var p15141Var = "thunk <digit> from <function <addDigit>>"
+var p15141 = &p15141Var
+var p15144Var = "thunk <digit> from <function <addDigit>>"
+var p15144 = &p15144Var
 var p15148Var = "thunk <digit> from <function <addDigit>>"
 var p15148 = &p15148Var
 var p15151Var = "thunk <digit> from <function <addDigit>>"
 var p15151 = &p15151Var
 var p15154Var = "thunk <digit> from <function <addDigit>>"
 var p15154 = &p15154Var
-var p15158Var = "thunk <digit> from <function <addDigit>>"
-var p15158 = &p15158Var
-var p15161Var = "thunk <digit> from <function <addDigit>>"
-var p15161 = &p15161Var
-var p15164Var = "thunk <digit> from <function <addDigit>>"
-var p15164 = &p15164Var
-var p15167Var = "thunk <digit> from <function <addDigit>>"
-var p15167 = &p15167Var
-var p15170Var = "thunk <digit> from <function <addDigit>>"
-var p15170 = &p15170Var
-var p15173Var = "thunk <digit> from <function <addDigit>>"
-var p15173 = &p15173Var
+var p15157Var = "thunk <digit> from <function <addDigit>>"
+var p15157 = &p15157Var
+var p15160Var = "thunk <digit> from <function <addDigit>>"
+var p15160 = &p15160Var
+var p15163Var = "thunk <digit> from <function <addDigit>>"
+var p15163 = &p15163Var
+var p15166Var = "thunk <digit> from <function <addDigit>>"
+var p15166 = &p15166Var
+var p15169Var = "thunk <digit> from <function <addDigit>>"
+var p15169 = &p15169Var
+var p15172Var = "thunk <digit> from <function <addDigit>>"
+var p15172 = &p15172Var
 var p15176Var = "thunk <digit> from <function <addDigit>>"
 var p15176 = &p15176Var
 var p15179Var = "thunk <digit> from <function <addDigit>>"
 var p15179 = &p15179Var
 var p15182Var = "thunk <digit> from <function <addDigit>>"
 var p15182 = &p15182Var
-var p15186Var = "thunk <digit> from <function <addDigit>>"
-var p15186 = &p15186Var
+var p15185Var = "thunk <digit> from <function <addDigit>>"
+var p15185 = &p15185Var
 var p15189Var = "thunk <digit> from <function <addDigit>>"
 var p15189 = &p15189Var
 var p15192Var = "thunk <digit> from <function <addDigit>>"
 var p15192 = &p15192Var
-var p15195Var = "thunk <digit> from <function <addDigit>>"
-var p15195 = &p15195Var
-var p15199Var = "thunk <digit> from <function <addDigit>>"
-var p15199 = &p15199Var
-var p15202Var = "thunk <digit> from <function <addDigit>>"
-var p15202 = &p15202Var
-var p15207Var = "function <addDigit>"
-var p15207 = &p15207Var
-var p15210Var = "function <addDigit>"
-var p15210 = &p15210Var
-var p15213Var = "function <addDigit>"
-var p15213 = &p15213Var
-var p15216Var = "function <addDigit>"
-var p15216 = &p15216Var
-var p15218Var = "function <addDigit>"
-var p15218 = &p15218Var
-var p15221Var = "function <addDigit>"
-var p15221 = &p15221Var
+var p15197Var = "function <addDigit>"
+var p15197 = &p15197Var
+var p15200Var = "function <addDigit>"
+var p15200 = &p15200Var
+var p15203Var = "function <addDigit>"
+var p15203 = &p15203Var
+var p15206Var = "function <addDigit>"
+var p15206 = &p15206Var
+var p15208Var = "function <addDigit>"
+var p15208 = &p15208Var
+var p15211Var = "function <addDigit>"
+var p15211 = &p15211Var
+var p15214Var = "function <addDigit>"
+var p15214 = &p15214Var
+var p15217Var = "function <addDigit>"
+var p15217 = &p15217Var
+var p15220Var = "function <addDigit>"
+var p15220 = &p15220Var
 var p15224Var = "function <addDigit>"
 var p15224 = &p15224Var
 var p15227Var = "function <addDigit>"
 var p15227 = &p15227Var
 var p15230Var = "function <addDigit>"
 var p15230 = &p15230Var
-var p15234Var = "function <addDigit>"
-var p15234 = &p15234Var
-var p15237Var = "function <addDigit>"
-var p15237 = &p15237Var
-var p15240Var = "function <addDigit>"
-var p15240 = &p15240Var
-var p15253Var = "function <addDigit>"
-var p15253 = &p15253Var
-var p15255Var = "function <addDigit>"
+var p15243Var = "function <addDigit>"
+var p15243 = &p15243Var
+var p15245Var = "function <addDigit>"
+var p15245 = &p15245Var
+var p15249Var = "thunk from <function <addDigit>>"
+var p15249 = &p15249Var
+var p15252Var = "thunk from <function <addDigit>>"
+var p15252 = &p15252Var
+var p15255Var = "function <anonymous>"
 var p15255 = &p15255Var
-var p15259Var = "thunk from <function <addDigit>>"
-var p15259 = &p15259Var
-var p15262Var = "thunk from <function <addDigit>>"
-var p15262 = &p15262Var
-var p15265Var = "function <anonymous>"
-var p15265 = &p15265Var
-var p15268Var = "function <anonymous>"
-var p15268 = &p15268Var
-var p15276Var = "thunk from <function <anonymous>>"
-var p15276 = &p15276Var
-var p15279Var = "thunk from <function <anonymous>>"
+var p15258Var = "function <anonymous>"
+var p15258 = &p15258Var
+var p15266Var = "thunk from <function <anonymous>>"
+var p15266 = &p15266Var
+var p15269Var = "thunk from <function <anonymous>>"
+var p15269 = &p15269Var
+var p15272Var = "thunk from <function <anonymous>>"
+var p15272 = &p15272Var
+var p15279Var = "thunk from <thunk from <function <anonymous>>>"
 var p15279 = &p15279Var
 var p15282Var = "thunk from <function <anonymous>>"
 var p15282 = &p15282Var
-var p15289Var = "thunk from <thunk from <function <anonymous>>>"
-var p15289 = &p15289Var
-var p15292Var = "thunk from <function <anonymous>>"
-var p15292 = &p15292Var
-var p15304Var = "function <anonymous>"
-var p15304 = &p15304Var
-var p15306Var = "function <anonymous>"
-var p15306 = &p15306Var
-var p15309Var = "object <anonymous>"
-var p15309 = &p15309Var
+var p15294Var = "function <anonymous>"
+var p15294 = &p15294Var
+var p15296Var = "function <anonymous>"
+var p15296 = &p15296Var
+var p15299Var = "object <anonymous>"
+var p15299 = &p15299Var
+var p15323Var = "object <anonymous>"
+var p15323 = &p15323Var
+var p15327Var = "object <anonymous>"
+var p15327 = &p15327Var
+var p15330Var = "object <anonymous>"
+var p15330 = &p15330Var
 var p15333Var = "object <anonymous>"
 var p15333 = &p15333Var
-var p15337Var = "object <anonymous>"
-var p15337 = &p15337Var
-var p15340Var = "object <anonymous>"
-var p15340 = &p15340Var
-var p15343Var = "object <anonymous>"
-var p15343 = &p15343Var
-var p15346Var = "object <anonymous>"
-var p15346 = &p15346Var
-var p15349Var = "object <anonymous>"
+var p15336Var = "object <anonymous>"
+var p15336 = &p15336Var
+var p15339Var = "object <anonymous>"
+var p15339 = &p15339Var
+var p15342Var = "object <anonymous>"
+var p15342 = &p15342Var
+var p15349Var = "thunk from <object <anonymous>>"
 var p15349 = &p15349Var
-var p15352Var = "object <anonymous>"
-var p15352 = &p15352Var
-var p15359Var = "thunk from <object <anonymous>>"
-var p15359 = &p15359Var
-var p15361Var = "thunk from <object <anonymous>>"
-var p15361 = &p15361Var
+var p15351Var = "thunk from <object <anonymous>>"
+var p15351 = &p15351Var
 var p1 = &ast.Source{
 	Lines: []string{
 		"/*\n",
@@ -2425,7 +2425,7 @@ var p1 = &ast.Source{
 		"  split(str, c)::\n",
 		"    assert std.isString(str) : 'std.split first parameter should be a string, got ' + std.type(str);\n",
 		"    assert std.isString(c) : 'std.split second parameter should be a string, got ' + std.type(c);\n",
-		"    assert std.length(c) == 1 :  'std.split second parameter should be a string, got ' + std.type(c);\n",
+		"    assert std.length(c) == 1 :  'std.split second parameter should have length 1, got ' + std.length(c);\n",
 		"    std.splitLimit(str, c, -1),\n",
 		"\n",
 		"  splitLimit(str, c, maxsplits)::\n",
@@ -3785,15 +3785,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "v",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "v",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -4016,15 +4015,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "v",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "v",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -4247,15 +4245,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "v",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "v",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -4478,15 +4475,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "v",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "v",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -4709,15 +4705,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "v",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "v",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -4940,15 +4935,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "v",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "v",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -5171,15 +5165,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -5522,25 +5515,28 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "from",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "len",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "from",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "len",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -6757,15 +6753,14 @@ var _StdAst = &ast.DesugaredObject{
 																		},
 																	},
 																	ParenLeftFodder: ast.Fodder{},
-																	Parameters: ast.Parameters{
-																		Required: []ast.CommaSeparatedID{
-																			ast.CommaSeparatedID{
-																				NameFodder: ast.Fodder{},
-																				Name: "i",
-																				CommaFodder: nil,
-																			},
+																	Parameters: []ast.Parameter{
+																		ast.Parameter{
+																			NameFodder: ast.Fodder{},
+																			Name: "i",
+																			EqFodder: nil,
+																			DefaultArg: nil,
+																			CommaFodder: nil,
 																		},
-																		Optional: nil,
 																	},
 																	TrailingComma: false,
 																	ParenRightFodder: ast.Fodder{},
@@ -7629,20 +7624,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -8366,20 +8362,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -9358,20 +9355,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "chars",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "chars",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -10208,20 +10206,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "chars",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "chars",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -11214,20 +11213,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "chars",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "chars",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -11566,15 +11566,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -11827,15 +11826,14 @@ var _StdAst = &ast.DesugaredObject{
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "i",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "i",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -11968,15 +11966,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -13420,15 +13417,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -14168,15 +14164,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -14915,20 +14910,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "c",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "c",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -15653,7 +15649,7 @@ var _StdAst = &ast.DesugaredObject{
 											},
 											End: ast.Location{
 												Line: int(115),
-												Column: int(101),
+												Column: int(105),
 											},
 											File: p1,
 										},
@@ -15674,7 +15670,7 @@ var _StdAst = &ast.DesugaredObject{
 												},
 												End: ast.Location{
 													Line: int(115),
-													Column: int(87),
+													Column: int(89),
 												},
 												File: p1,
 											},
@@ -15682,7 +15678,7 @@ var _StdAst = &ast.DesugaredObject{
 											Ctx: p947,
 											FreeVars: nil,
 										},
-										Value: "std.split second parameter should be a string, got ",
+										Value: "std.split second parameter should have length 1, got ",
 										Kind: ast.LiteralStringKind(1),
 										BlockIndent: "",
 									},
@@ -15694,11 +15690,11 @@ var _StdAst = &ast.DesugaredObject{
 												FileName: "<std>",
 												Begin: ast.Location{
 													Line: int(115),
-													Column: int(90),
+													Column: int(92),
 												},
 												End: ast.Location{
 													Line: int(115),
-													Column: int(101),
+													Column: int(105),
 												},
 												File: p1,
 											},
@@ -15715,11 +15711,11 @@ var _StdAst = &ast.DesugaredObject{
 													FileName: "<std>",
 													Begin: ast.Location{
 														Line: int(115),
-														Column: int(90),
+														Column: int(92),
 													},
 													End: ast.Location{
 														Line: int(115),
-														Column: int(98),
+														Column: int(102),
 													},
 													File: p1,
 												},
@@ -15735,11 +15731,11 @@ var _StdAst = &ast.DesugaredObject{
 														FileName: "<std>",
 														Begin: ast.Location{
 															Line: int(115),
-															Column: int(90),
+															Column: int(92),
 														},
 														End: ast.Location{
 															Line: int(115),
-															Column: int(93),
+															Column: int(95),
 														},
 														File: p1,
 													},
@@ -15770,7 +15766,7 @@ var _StdAst = &ast.DesugaredObject{
 													Ctx: nil,
 													FreeVars: nil,
 												},
-												Value: "type",
+												Value: "length",
 												Kind: ast.LiteralStringKind(1),
 												BlockIndent: "",
 											},
@@ -15787,11 +15783,11 @@ var _StdAst = &ast.DesugaredObject{
 																FileName: "<std>",
 																Begin: ast.Location{
 																	Line: int(115),
-																	Column: int(99),
+																	Column: int(103),
 																},
 																End: ast.Location{
 																	Line: int(115),
-																	Column: int(100),
+																	Column: int(104),
 																},
 																File: p1,
 															},
@@ -16254,25 +16250,28 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "c",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "maxsplits",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "c",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "maxsplits",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -16974,35 +16973,42 @@ var _StdAst = &ast.DesugaredObject{
 													},
 												},
 												ParenLeftFodder: ast.Fodder{},
-												Parameters: ast.Parameters{
-													Required: []ast.CommaSeparatedID{
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "str",
-															CommaFodder: ast.Fodder{},
-														},
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "delim",
-															CommaFodder: ast.Fodder{},
-														},
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "i",
-															CommaFodder: ast.Fodder{},
-														},
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "arr",
-															CommaFodder: ast.Fodder{},
-														},
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "v",
-															CommaFodder: nil,
-														},
+												Parameters: []ast.Parameter{
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "str",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: ast.Fodder{},
+													},
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "delim",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: ast.Fodder{},
+													},
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "i",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: ast.Fodder{},
+													},
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "arr",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: ast.Fodder{},
+													},
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "v",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: nil,
 													},
-													Optional: nil,
 												},
 												TrailingComma: false,
 												ParenRightFodder: ast.Fodder{},
@@ -19485,25 +19491,28 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "from",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "to",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "from",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "to",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -20451,15 +20460,14 @@ var _StdAst = &ast.DesugaredObject{
 															},
 														},
 														ParenLeftFodder: ast.Fodder{},
-														Parameters: ast.Parameters{
-															Required: []ast.CommaSeparatedID{
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "i",
-																	CommaFodder: nil,
-																},
+														Parameters: []ast.Parameter{
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "i",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: nil,
 															},
-															Optional: nil,
 														},
 														TrailingComma: false,
 														ParenRightFodder: ast.Fodder{},
@@ -20843,25 +20851,28 @@ var _StdAst = &ast.DesugaredObject{
 																},
 															},
 															ParenLeftFodder: ast.Fodder{},
-															Parameters: ast.Parameters{
-																Required: []ast.CommaSeparatedID{
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "start_index",
-																		CommaFodder: ast.Fodder{},
-																	},
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "curr_index",
-																		CommaFodder: ast.Fodder{},
-																	},
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "acc",
-																		CommaFodder: nil,
-																	},
+															Parameters: []ast.Parameter{
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "start_index",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: ast.Fodder{},
+																},
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "curr_index",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: ast.Fodder{},
+																},
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "acc",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: nil,
 																},
-																Optional: nil,
 															},
 															TrailingComma: false,
 															ParenRightFodder: ast.Fodder{},
@@ -22937,15 +22948,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -23110,15 +23120,14 @@ var _StdAst = &ast.DesugaredObject{
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "c",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "c",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -24132,15 +24141,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -24305,15 +24313,14 @@ var _StdAst = &ast.DesugaredObject{
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "c",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "c",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -25327,20 +25334,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "from",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "to",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "from",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "to",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -25581,15 +25589,14 @@ var _StdAst = &ast.DesugaredObject{
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "i",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "i",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -25720,20 +25727,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "what",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "count",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "what",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "count",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -26446,15 +26454,14 @@ var _StdAst = &ast.DesugaredObject{
 															},
 														},
 														ParenLeftFodder: ast.Fodder{},
-														Parameters: ast.Parameters{
-															Required: []ast.CommaSeparatedID{
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "i",
-																	CommaFodder: nil,
-																},
+														Parameters: []ast.Parameter{
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "i",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: nil,
 															},
-															Optional: nil,
 														},
 														TrailingComma: false,
 														ParenRightFodder: ast.Fodder{},
@@ -26550,30 +26557,35 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "indexable",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "index",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "end",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "step",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "indexable",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "index",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "end",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "step",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -28468,20 +28480,21 @@ var _StdAst = &ast.DesugaredObject{
 													},
 												},
 												ParenLeftFodder: ast.Fodder{},
-												Parameters: ast.Parameters{
-													Required: []ast.CommaSeparatedID{
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "slice",
-															CommaFodder: ast.Fodder{},
-														},
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "cur",
-															CommaFodder: nil,
-														},
+												Parameters: []ast.Parameter{
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "slice",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: ast.Fodder{},
+													},
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "cur",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: nil,
 													},
-													Optional: nil,
 												},
 												TrailingComma: false,
 												ParenRightFodder: ast.Fodder{},
@@ -30733,20 +30746,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "x",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "x",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -31670,20 +31684,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "x",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "x",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -31896,15 +31911,14 @@ var _StdAst = &ast.DesugaredObject{
 														},
 													},
 													ParenLeftFodder: ast.Fodder{},
-													Parameters: ast.Parameters{
-														Required: []ast.CommaSeparatedID{
-															ast.CommaSeparatedID{
-																NameFodder: ast.Fodder{},
-																Name: "v",
-																CommaFodder: nil,
-															},
+													Parameters: []ast.Parameter{
+														ast.Parameter{
+															NameFodder: ast.Fodder{},
+															Name: "v",
+															EqFodder: nil,
+															DefaultArg: nil,
+															CommaFodder: nil,
 														},
-														Optional: nil,
 													},
 													TrailingComma: false,
 													ParenRightFodder: ast.Fodder{},
@@ -32070,20 +32084,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -33366,20 +33381,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "func",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "func",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -34571,15 +34587,14 @@ var _StdAst = &ast.DesugaredObject{
 												},
 											},
 											ParenLeftFodder: ast.Fodder{},
-											Parameters: ast.Parameters{
-												Required: []ast.CommaSeparatedID{
-													ast.CommaSeparatedID{
-														NameFodder: ast.Fodder{},
-														Name: "i",
-														CommaFodder: nil,
-													},
+											Parameters: []ast.Parameter{
+												ast.Parameter{
+													NameFodder: ast.Fodder{},
+													Name: "i",
+													EqFodder: nil,
+													DefaultArg: nil,
+													CommaFodder: nil,
 												},
-												Optional: nil,
 											},
 											TrailingComma: false,
 											ParenRightFodder: ast.Fodder{},
@@ -34771,20 +34786,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "func",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "func",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -35976,15 +35992,14 @@ var _StdAst = &ast.DesugaredObject{
 												},
 											},
 											ParenLeftFodder: ast.Fodder{},
-											Parameters: ast.Parameters{
-												Required: []ast.CommaSeparatedID{
-													ast.CommaSeparatedID{
-														NameFodder: ast.Fodder{},
-														Name: "i",
-														CommaFodder: nil,
-													},
+											Parameters: []ast.Parameter{
+												ast.Parameter{
+													NameFodder: ast.Fodder{},
+													Name: "i",
+													EqFodder: nil,
+													DefaultArg: nil,
+													CommaFodder: nil,
 												},
-												Optional: nil,
 											},
 											TrailingComma: false,
 											ParenRightFodder: ast.Fodder{},
@@ -36201,20 +36216,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "func",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "obj",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "func",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "obj",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -37193,15 +37209,14 @@ var _StdAst = &ast.DesugaredObject{
 																},
 															},
 															ParenLeftFodder: nil,
-															Parameters: ast.Parameters{
-																Required: []ast.CommaSeparatedID{
-																	ast.CommaSeparatedID{
-																		NameFodder: nil,
-																		Name: "k",
-																		CommaFodder: nil,
-																	},
+															Parameters: []ast.Parameter{
+																ast.Parameter{
+																	NameFodder: nil,
+																	Name: "k",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: nil,
 																},
-																Optional: nil,
 															},
 															TrailingComma: false,
 															ParenRightFodder: nil,
@@ -37646,20 +37661,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "func",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "func",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -38542,15 +38558,14 @@ var _StdAst = &ast.DesugaredObject{
 																},
 															},
 															ParenLeftFodder: ast.Fodder{},
-															Parameters: ast.Parameters{
-																Required: []ast.CommaSeparatedID{
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "i",
-																		CommaFodder: nil,
-																	},
+															Parameters: []ast.Parameter{
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "i",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: nil,
 																},
-																Optional: nil,
 															},
 															TrailingComma: false,
 															ParenRightFodder: ast.Fodder{},
@@ -39228,15 +39243,14 @@ var _StdAst = &ast.DesugaredObject{
 																	},
 																},
 																ParenLeftFodder: ast.Fodder{},
-																Parameters: ast.Parameters{
-																	Required: []ast.CommaSeparatedID{
-																		ast.CommaSeparatedID{
-																			NameFodder: ast.Fodder{},
-																			Name: "i",
-																			CommaFodder: nil,
-																		},
+																Parameters: []ast.Parameter{
+																	ast.Parameter{
+																		NameFodder: ast.Fodder{},
+																		Name: "i",
+																		EqFodder: nil,
+																		DefaultArg: nil,
+																		CommaFodder: nil,
 																	},
-																	Optional: nil,
 																},
 																TrailingComma: false,
 																ParenRightFodder: ast.Fodder{},
@@ -39640,20 +39654,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "sep",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "sep",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -39714,30 +39729,35 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "arr",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "i",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "first",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "running",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "arr",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "i",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "first",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "running",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -43191,15 +43211,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -43479,15 +43498,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -44068,15 +44086,14 @@ var _StdAst = &ast.DesugaredObject{
 																},
 															},
 															ParenLeftFodder: nil,
-															Parameters: ast.Parameters{
-																Required: []ast.CommaSeparatedID{
-																	ast.CommaSeparatedID{
-																		NameFodder: nil,
-																		Name: "x",
-																		CommaFodder: nil,
-																	},
+															Parameters: []ast.Parameter{
+																ast.Parameter{
+																	NameFodder: nil,
+																	Name: "x",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: nil,
 																},
-																Optional: nil,
 															},
 															TrailingComma: false,
 															ParenRightFodder: nil,
@@ -44620,20 +44637,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "vals",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "vals",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -44716,20 +44734,21 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "str",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "i",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "str",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "i",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -45189,25 +45208,28 @@ var _StdAst = &ast.DesugaredObject{
 																},
 															},
 															ParenLeftFodder: ast.Fodder{},
-															Parameters: ast.Parameters{
-																Required: []ast.CommaSeparatedID{
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "str",
-																		CommaFodder: ast.Fodder{},
-																	},
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "j",
-																		CommaFodder: ast.Fodder{},
-																	},
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "v",
-																		CommaFodder: nil,
-																	},
+															Parameters: []ast.Parameter{
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "str",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: ast.Fodder{},
+																},
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "j",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: ast.Fodder{},
+																},
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "v",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: nil,
 																},
-																Optional: nil,
 															},
 															TrailingComma: false,
 															ParenRightFodder: ast.Fodder{},
@@ -46514,20 +46536,21 @@ var _StdAst = &ast.DesugaredObject{
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "str",
-												CommaFodder: ast.Fodder{},
-											},
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "i",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "str",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: ast.Fodder{},
+										},
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "i",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -46587,25 +46610,28 @@ var _StdAst = &ast.DesugaredObject{
 														},
 													},
 													ParenLeftFodder: ast.Fodder{},
-													Parameters: ast.Parameters{
-														Required: []ast.CommaSeparatedID{
-															ast.CommaSeparatedID{
-																NameFodder: ast.Fodder{},
-																Name: "str",
-																CommaFodder: ast.Fodder{},
-															},
-															ast.CommaSeparatedID{
-																NameFodder: ast.Fodder{},
-																Name: "j",
-																CommaFodder: ast.Fodder{},
-															},
-															ast.CommaSeparatedID{
-																NameFodder: ast.Fodder{},
-																Name: "v",
-																CommaFodder: nil,
-															},
+													Parameters: []ast.Parameter{
+														ast.Parameter{
+															NameFodder: ast.Fodder{},
+															Name: "str",
+															EqFodder: nil,
+															DefaultArg: nil,
+															CommaFodder: ast.Fodder{},
+														},
+														ast.Parameter{
+															NameFodder: ast.Fodder{},
+															Name: "j",
+															EqFodder: nil,
+															DefaultArg: nil,
+															CommaFodder: ast.Fodder{},
+														},
+														ast.Parameter{
+															NameFodder: ast.Fodder{},
+															Name: "v",
+															EqFodder: nil,
+															DefaultArg: nil,
+															CommaFodder: nil,
 														},
-														Optional: nil,
 													},
 													TrailingComma: false,
 													ParenRightFodder: ast.Fodder{},
@@ -49400,20 +49426,21 @@ var _StdAst = &ast.DesugaredObject{
 											},
 										},
 										ParenLeftFodder: ast.Fodder{},
-										Parameters: ast.Parameters{
-											Required: []ast.CommaSeparatedID{
-												ast.CommaSeparatedID{
-													NameFodder: ast.Fodder{},
-													Name: "str",
-													CommaFodder: ast.Fodder{},
-												},
-												ast.CommaSeparatedID{
-													NameFodder: ast.Fodder{},
-													Name: "i",
-													CommaFodder: nil,
-												},
+										Parameters: []ast.Parameter{
+											ast.Parameter{
+												NameFodder: ast.Fodder{},
+												Name: "str",
+												EqFodder: nil,
+												DefaultArg: nil,
+												CommaFodder: ast.Fodder{},
+											},
+											ast.Parameter{
+												NameFodder: ast.Fodder{},
+												Name: "i",
+												EqFodder: nil,
+												DefaultArg: nil,
+												CommaFodder: nil,
 											},
-											Optional: nil,
 										},
 										TrailingComma: false,
 										ParenRightFodder: ast.Fodder{},
@@ -49994,25 +50021,28 @@ var _StdAst = &ast.DesugaredObject{
 																},
 															},
 															ParenLeftFodder: ast.Fodder{},
-															Parameters: ast.Parameters{
-																Required: []ast.CommaSeparatedID{
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "str",
-																		CommaFodder: ast.Fodder{},
-																	},
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "j",
-																		CommaFodder: ast.Fodder{},
-																	},
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "v",
-																		CommaFodder: nil,
-																	},
+															Parameters: []ast.Parameter{
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "str",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: ast.Fodder{},
+																},
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "j",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: ast.Fodder{},
+																},
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "v",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: nil,
 																},
-																Optional: nil,
 															},
 															TrailingComma: false,
 															ParenRightFodder: ast.Fodder{},
@@ -54387,20 +54417,21 @@ var _StdAst = &ast.DesugaredObject{
 												},
 											},
 											ParenLeftFodder: ast.Fodder{},
-											Parameters: ast.Parameters{
-												Required: []ast.CommaSeparatedID{
-													ast.CommaSeparatedID{
-														NameFodder: ast.Fodder{},
-														Name: "str",
-														CommaFodder: ast.Fodder{},
-													},
-													ast.CommaSeparatedID{
-														NameFodder: ast.Fodder{},
-														Name: "i",
-														CommaFodder: nil,
-													},
+											Parameters: []ast.Parameter{
+												ast.Parameter{
+													NameFodder: ast.Fodder{},
+													Name: "str",
+													EqFodder: nil,
+													DefaultArg: nil,
+													CommaFodder: ast.Fodder{},
+												},
+												ast.Parameter{
+													NameFodder: ast.Fodder{},
+													Name: "i",
+													EqFodder: nil,
+													DefaultArg: nil,
+													CommaFodder: nil,
 												},
-												Optional: nil,
 											},
 											TrailingComma: false,
 											ParenRightFodder: ast.Fodder{},
@@ -55210,20 +55241,21 @@ var _StdAst = &ast.DesugaredObject{
 													},
 												},
 												ParenLeftFodder: ast.Fodder{},
-												Parameters: ast.Parameters{
-													Required: []ast.CommaSeparatedID{
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "str",
-															CommaFodder: ast.Fodder{},
-														},
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "i",
-															CommaFodder: nil,
-														},
+												Parameters: []ast.Parameter{
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "str",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: ast.Fodder{},
+													},
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "i",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: nil,
 													},
-													Optional: nil,
 												},
 												TrailingComma: false,
 												ParenRightFodder: ast.Fodder{},
@@ -56023,20 +56055,21 @@ var _StdAst = &ast.DesugaredObject{
 														},
 													},
 													ParenLeftFodder: ast.Fodder{},
-													Parameters: ast.Parameters{
-														Required: []ast.CommaSeparatedID{
-															ast.CommaSeparatedID{
-																NameFodder: ast.Fodder{},
-																Name: "str",
-																CommaFodder: ast.Fodder{},
-															},
-															ast.CommaSeparatedID{
-																NameFodder: ast.Fodder{},
-																Name: "i",
-																CommaFodder: nil,
-															},
+													Parameters: []ast.Parameter{
+														ast.Parameter{
+															NameFodder: ast.Fodder{},
+															Name: "str",
+															EqFodder: nil,
+															DefaultArg: nil,
+															CommaFodder: ast.Fodder{},
+														},
+														ast.Parameter{
+															NameFodder: ast.Fodder{},
+															Name: "i",
+															EqFodder: nil,
+															DefaultArg: nil,
+															CommaFodder: nil,
 														},
-														Optional: nil,
 													},
 													TrailingComma: false,
 													ParenRightFodder: ast.Fodder{},
@@ -60842,20 +60875,21 @@ var _StdAst = &ast.DesugaredObject{
 															},
 														},
 														ParenLeftFodder: ast.Fodder{},
-														Parameters: ast.Parameters{
-															Required: []ast.CommaSeparatedID{
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "str",
-																	CommaFodder: ast.Fodder{},
-																},
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "i",
-																	CommaFodder: nil,
-																},
+														Parameters: []ast.Parameter{
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "str",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: ast.Fodder{},
+															},
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "i",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: nil,
 															},
-															Optional: nil,
 														},
 														TrailingComma: false,
 														ParenRightFodder: ast.Fodder{},
@@ -62996,30 +63030,35 @@ var _StdAst = &ast.DesugaredObject{
 																},
 															},
 															ParenLeftFodder: ast.Fodder{},
-															Parameters: ast.Parameters{
-																Required: []ast.CommaSeparatedID{
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "str",
-																		CommaFodder: ast.Fodder{},
-																	},
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "i",
-																		CommaFodder: ast.Fodder{},
-																	},
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "out",
-																		CommaFodder: ast.Fodder{},
-																	},
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "cur",
-																		CommaFodder: nil,
-																	},
+															Parameters: []ast.Parameter{
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "str",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: ast.Fodder{},
+																},
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "i",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: ast.Fodder{},
+																},
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "out",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: ast.Fodder{},
+																},
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "cur",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: nil,
 																},
-																Optional: nil,
 															},
 															TrailingComma: false,
 															ParenRightFodder: ast.Fodder{},
@@ -64644,20 +64683,21 @@ var _StdAst = &ast.DesugaredObject{
 																		FreeVars: nil,
 																	},
 																	ParenLeftFodder: ast.Fodder{},
-																	Parameters: ast.Parameters{
-																		Required: []ast.CommaSeparatedID{
-																			ast.CommaSeparatedID{
-																				NameFodder: ast.Fodder{},
-																				Name: "w",
-																				CommaFodder: ast.Fodder{},
-																			},
-																			ast.CommaSeparatedID{
-																				NameFodder: ast.Fodder{},
-																				Name: "s",
-																				CommaFodder: nil,
-																			},
+																	Parameters: []ast.Parameter{
+																		ast.Parameter{
+																			NameFodder: ast.Fodder{},
+																			Name: "w",
+																			EqFodder: nil,
+																			DefaultArg: nil,
+																			CommaFodder: ast.Fodder{},
+																		},
+																		ast.Parameter{
+																			NameFodder: ast.Fodder{},
+																			Name: "s",
+																			EqFodder: nil,
+																			DefaultArg: nil,
+																			CommaFodder: nil,
 																		},
-																		Optional: nil,
 																	},
 																	TrailingComma: false,
 																	ParenRightFodder: ast.Fodder{},
@@ -64716,20 +64756,21 @@ var _StdAst = &ast.DesugaredObject{
 																						},
 																					},
 																					ParenLeftFodder: ast.Fodder{},
-																					Parameters: ast.Parameters{
-																						Required: []ast.CommaSeparatedID{
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "w",
-																								CommaFodder: ast.Fodder{},
-																							},
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "v",
-																								CommaFodder: nil,
-																							},
+																					Parameters: []ast.Parameter{
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "w",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: ast.Fodder{},
+																						},
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "v",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: nil,
 																						},
-																						Optional: nil,
 																					},
 																					TrailingComma: false,
 																					ParenRightFodder: ast.Fodder{},
@@ -65256,25 +65297,28 @@ var _StdAst = &ast.DesugaredObject{
 																			},
 																		},
 																		ParenLeftFodder: ast.Fodder{},
-																		Parameters: ast.Parameters{
-																			Required: []ast.CommaSeparatedID{
-																				ast.CommaSeparatedID{
-																					NameFodder: ast.Fodder{},
-																					Name: "str",
-																					CommaFodder: ast.Fodder{},
-																				},
-																				ast.CommaSeparatedID{
-																					NameFodder: ast.Fodder{},
-																					Name: "w",
-																					CommaFodder: ast.Fodder{},
-																				},
-																				ast.CommaSeparatedID{
-																					NameFodder: ast.Fodder{},
-																					Name: "s",
-																					CommaFodder: nil,
-																				},
+																		Parameters: []ast.Parameter{
+																			ast.Parameter{
+																				NameFodder: ast.Fodder{},
+																				Name: "str",
+																				EqFodder: nil,
+																				DefaultArg: nil,
+																				CommaFodder: ast.Fodder{},
+																			},
+																			ast.Parameter{
+																				NameFodder: ast.Fodder{},
+																				Name: "w",
+																				EqFodder: nil,
+																				DefaultArg: nil,
+																				CommaFodder: ast.Fodder{},
+																			},
+																			ast.Parameter{
+																				NameFodder: ast.Fodder{},
+																				Name: "s",
+																				EqFodder: nil,
+																				DefaultArg: nil,
+																				CommaFodder: nil,
 																			},
-																			Optional: nil,
 																		},
 																		TrailingComma: false,
 																		ParenRightFodder: ast.Fodder{},
@@ -65662,25 +65706,28 @@ var _StdAst = &ast.DesugaredObject{
 																				},
 																			},
 																			ParenLeftFodder: ast.Fodder{},
-																			Parameters: ast.Parameters{
-																				Required: []ast.CommaSeparatedID{
-																					ast.CommaSeparatedID{
-																						NameFodder: ast.Fodder{},
-																						Name: "str",
-																						CommaFodder: ast.Fodder{},
-																					},
-																					ast.CommaSeparatedID{
-																						NameFodder: ast.Fodder{},
-																						Name: "w",
-																						CommaFodder: ast.Fodder{},
-																					},
-																					ast.CommaSeparatedID{
-																						NameFodder: ast.Fodder{},
-																						Name: "s",
-																						CommaFodder: nil,
-																					},
+																			Parameters: []ast.Parameter{
+																				ast.Parameter{
+																					NameFodder: ast.Fodder{},
+																					Name: "str",
+																					EqFodder: nil,
+																					DefaultArg: nil,
+																					CommaFodder: ast.Fodder{},
+																				},
+																				ast.Parameter{
+																					NameFodder: ast.Fodder{},
+																					Name: "w",
+																					EqFodder: nil,
+																					DefaultArg: nil,
+																					CommaFodder: ast.Fodder{},
+																				},
+																				ast.Parameter{
+																					NameFodder: ast.Fodder{},
+																					Name: "s",
+																					EqFodder: nil,
+																					DefaultArg: nil,
+																					CommaFodder: nil,
 																				},
-																				Optional: nil,
 																			},
 																			TrailingComma: false,
 																			ParenRightFodder: ast.Fodder{},
@@ -66068,45 +66115,56 @@ var _StdAst = &ast.DesugaredObject{
 																					},
 																				},
 																				ParenLeftFodder: ast.Fodder{},
-																				Parameters: ast.Parameters{
-																					Required: []ast.CommaSeparatedID{
-																						ast.CommaSeparatedID{
-																							NameFodder: ast.Fodder{},
-																							Name: "n__",
-																							CommaFodder: ast.Fodder{},
-																						},
-																						ast.CommaSeparatedID{
-																							NameFodder: ast.Fodder{},
-																							Name: "min_chars",
-																							CommaFodder: ast.Fodder{},
-																						},
-																						ast.CommaSeparatedID{
-																							NameFodder: ast.Fodder{},
-																							Name: "min_digits",
-																							CommaFodder: ast.Fodder{},
-																						},
-																						ast.CommaSeparatedID{
-																							NameFodder: ast.Fodder{},
-																							Name: "blank",
-																							CommaFodder: ast.Fodder{},
-																						},
-																						ast.CommaSeparatedID{
-																							NameFodder: ast.Fodder{},
-																							Name: "sign",
-																							CommaFodder: ast.Fodder{},
-																						},
-																						ast.CommaSeparatedID{
-																							NameFodder: ast.Fodder{},
-																							Name: "radix",
-																							CommaFodder: ast.Fodder{},
-																						},
-																						ast.CommaSeparatedID{
-																							NameFodder: ast.Fodder{},
-																							Name: "zero_prefix",
-																							CommaFodder: nil,
-																						},
+																				Parameters: []ast.Parameter{
+																					ast.Parameter{
+																						NameFodder: ast.Fodder{},
+																						Name: "n__",
+																						EqFodder: nil,
+																						DefaultArg: nil,
+																						CommaFodder: ast.Fodder{},
+																					},
+																					ast.Parameter{
+																						NameFodder: ast.Fodder{},
+																						Name: "min_chars",
+																						EqFodder: nil,
+																						DefaultArg: nil,
+																						CommaFodder: ast.Fodder{},
+																					},
+																					ast.Parameter{
+																						NameFodder: ast.Fodder{},
+																						Name: "min_digits",
+																						EqFodder: nil,
+																						DefaultArg: nil,
+																						CommaFodder: ast.Fodder{},
+																					},
+																					ast.Parameter{
+																						NameFodder: ast.Fodder{},
+																						Name: "blank",
+																						EqFodder: nil,
+																						DefaultArg: nil,
+																						CommaFodder: ast.Fodder{},
+																					},
+																					ast.Parameter{
+																						NameFodder: ast.Fodder{},
+																						Name: "sign",
+																						EqFodder: nil,
+																						DefaultArg: nil,
+																						CommaFodder: ast.Fodder{},
+																					},
+																					ast.Parameter{
+																						NameFodder: ast.Fodder{},
+																						Name: "radix",
+																						EqFodder: nil,
+																						DefaultArg: nil,
+																						CommaFodder: ast.Fodder{},
+																					},
+																					ast.Parameter{
+																						NameFodder: ast.Fodder{},
+																						Name: "zero_prefix",
+																						EqFodder: nil,
+																						DefaultArg: nil,
+																						CommaFodder: nil,
 																					},
-																					Optional: nil,
 																				},
 																				TrailingComma: false,
 																				ParenRightFodder: ast.Fodder{},
@@ -66344,15 +66402,14 @@ var _StdAst = &ast.DesugaredObject{
 																										},
 																									},
 																									ParenLeftFodder: ast.Fodder{},
-																									Parameters: ast.Parameters{
-																										Required: []ast.CommaSeparatedID{
-																											ast.CommaSeparatedID{
-																												NameFodder: ast.Fodder{},
-																												Name: "n",
-																												CommaFodder: nil,
-																											},
+																									Parameters: []ast.Parameter{
+																										ast.Parameter{
+																											NameFodder: ast.Fodder{},
+																											Name: "n",
+																											EqFodder: nil,
+																											DefaultArg: nil,
+																											CommaFodder: nil,
 																										},
-																										Optional: nil,
 																									},
 																									TrailingComma: false,
 																									ParenRightFodder: ast.Fodder{},
@@ -68451,45 +68508,56 @@ var _StdAst = &ast.DesugaredObject{
 																						},
 																					},
 																					ParenLeftFodder: ast.Fodder{},
-																					Parameters: ast.Parameters{
-																						Required: []ast.CommaSeparatedID{
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "n__",
-																								CommaFodder: ast.Fodder{},
-																							},
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "min_chars",
-																								CommaFodder: ast.Fodder{},
-																							},
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "min_digits",
-																								CommaFodder: ast.Fodder{},
-																							},
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "blank",
-																								CommaFodder: ast.Fodder{},
-																							},
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "sign",
-																								CommaFodder: ast.Fodder{},
-																							},
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "add_zerox",
-																								CommaFodder: ast.Fodder{},
-																							},
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "capitals",
-																								CommaFodder: nil,
-																							},
+																					Parameters: []ast.Parameter{
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "n__",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: ast.Fodder{},
+																						},
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "min_chars",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: ast.Fodder{},
+																						},
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "min_digits",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: ast.Fodder{},
+																						},
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "blank",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: ast.Fodder{},
+																						},
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "sign",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: ast.Fodder{},
+																						},
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "add_zerox",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: ast.Fodder{},
+																						},
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "capitals",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: nil,
 																						},
-																						Optional: nil,
 																					},
 																					TrailingComma: false,
 																					ParenRightFodder: ast.Fodder{},
@@ -69453,15 +69521,14 @@ var _StdAst = &ast.DesugaredObject{
 																												},
 																											},
 																											ParenLeftFodder: ast.Fodder{},
-																											Parameters: ast.Parameters{
-																												Required: []ast.CommaSeparatedID{
-																													ast.CommaSeparatedID{
-																														NameFodder: ast.Fodder{},
-																														Name: "n",
-																														CommaFodder: nil,
-																													},
+																											Parameters: []ast.Parameter{
+																												ast.Parameter{
+																													NameFodder: ast.Fodder{},
+																													Name: "n",
+																													EqFodder: nil,
+																													DefaultArg: nil,
+																													CommaFodder: nil,
 																												},
-																												Optional: nil,
 																											},
 																											TrailingComma: false,
 																											ParenRightFodder: ast.Fodder{},
@@ -71912,15 +71979,14 @@ var _StdAst = &ast.DesugaredObject{
 																							},
 																						},
 																						ParenLeftFodder: ast.Fodder{},
-																						Parameters: ast.Parameters{
-																							Required: []ast.CommaSeparatedID{
-																								ast.CommaSeparatedID{
-																									NameFodder: ast.Fodder{},
-																									Name: "str",
-																									CommaFodder: nil,
-																								},
+																						Parameters: []ast.Parameter{
+																							ast.Parameter{
+																								NameFodder: ast.Fodder{},
+																								Name: "str",
+																								EqFodder: nil,
+																								DefaultArg: nil,
+																								CommaFodder: nil,
 																							},
-																							Optional: nil,
 																						},
 																						TrailingComma: false,
 																						ParenRightFodder: ast.Fodder{},
@@ -71979,20 +72045,21 @@ var _StdAst = &ast.DesugaredObject{
 																											},
 																										},
 																										ParenLeftFodder: ast.Fodder{},
-																										Parameters: ast.Parameters{
-																											Required: []ast.CommaSeparatedID{
-																												ast.CommaSeparatedID{
-																													NameFodder: ast.Fodder{},
-																													Name: "str",
-																													CommaFodder: ast.Fodder{},
-																												},
-																												ast.CommaSeparatedID{
-																													NameFodder: ast.Fodder{},
-																													Name: "i",
-																													CommaFodder: nil,
-																												},
+																										Parameters: []ast.Parameter{
+																											ast.Parameter{
+																												NameFodder: ast.Fodder{},
+																												Name: "str",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: ast.Fodder{},
+																											},
+																											ast.Parameter{
+																												NameFodder: ast.Fodder{},
+																												Name: "i",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: nil,
 																											},
-																											Optional: nil,
 																										},
 																										TrailingComma: false,
 																										ParenRightFodder: ast.Fodder{},
@@ -73004,45 +73071,56 @@ var _StdAst = &ast.DesugaredObject{
 																								},
 																							},
 																							ParenLeftFodder: ast.Fodder{},
-																							Parameters: ast.Parameters{
-																								Required: []ast.CommaSeparatedID{
-																									ast.CommaSeparatedID{
-																										NameFodder: ast.Fodder{},
-																										Name: "n__",
-																										CommaFodder: ast.Fodder{},
-																									},
-																									ast.CommaSeparatedID{
-																										NameFodder: ast.Fodder{},
-																										Name: "zero_pad",
-																										CommaFodder: ast.Fodder{},
-																									},
-																									ast.CommaSeparatedID{
-																										NameFodder: ast.Fodder{},
-																										Name: "blank",
-																										CommaFodder: ast.Fodder{},
-																									},
-																									ast.CommaSeparatedID{
-																										NameFodder: ast.Fodder{},
-																										Name: "sign",
-																										CommaFodder: ast.Fodder{},
-																									},
-																									ast.CommaSeparatedID{
-																										NameFodder: ast.Fodder{},
-																										Name: "ensure_pt",
-																										CommaFodder: ast.Fodder{},
-																									},
-																									ast.CommaSeparatedID{
-																										NameFodder: ast.Fodder{},
-																										Name: "trailing",
-																										CommaFodder: ast.Fodder{},
-																									},
-																									ast.CommaSeparatedID{
-																										NameFodder: ast.Fodder{},
-																										Name: "prec",
-																										CommaFodder: nil,
-																									},
+																							Parameters: []ast.Parameter{
+																								ast.Parameter{
+																									NameFodder: ast.Fodder{},
+																									Name: "n__",
+																									EqFodder: nil,
+																									DefaultArg: nil,
+																									CommaFodder: ast.Fodder{},
+																								},
+																								ast.Parameter{
+																									NameFodder: ast.Fodder{},
+																									Name: "zero_pad",
+																									EqFodder: nil,
+																									DefaultArg: nil,
+																									CommaFodder: ast.Fodder{},
+																								},
+																								ast.Parameter{
+																									NameFodder: ast.Fodder{},
+																									Name: "blank",
+																									EqFodder: nil,
+																									DefaultArg: nil,
+																									CommaFodder: ast.Fodder{},
+																								},
+																								ast.Parameter{
+																									NameFodder: ast.Fodder{},
+																									Name: "sign",
+																									EqFodder: nil,
+																									DefaultArg: nil,
+																									CommaFodder: ast.Fodder{},
+																								},
+																								ast.Parameter{
+																									NameFodder: ast.Fodder{},
+																									Name: "ensure_pt",
+																									EqFodder: nil,
+																									DefaultArg: nil,
+																									CommaFodder: ast.Fodder{},
+																								},
+																								ast.Parameter{
+																									NameFodder: ast.Fodder{},
+																									Name: "trailing",
+																									EqFodder: nil,
+																									DefaultArg: nil,
+																									CommaFodder: ast.Fodder{},
+																								},
+																								ast.Parameter{
+																									NameFodder: ast.Fodder{},
+																									Name: "prec",
+																									EqFodder: nil,
+																									DefaultArg: nil,
+																									CommaFodder: nil,
 																								},
-																								Optional: nil,
 																							},
 																							TrailingComma: false,
 																							ParenRightFodder: ast.Fodder{},
@@ -75706,50 +75784,63 @@ var _StdAst = &ast.DesugaredObject{
 																									},
 																								},
 																								ParenLeftFodder: ast.Fodder{},
-																								Parameters: ast.Parameters{
-																									Required: []ast.CommaSeparatedID{
-																										ast.CommaSeparatedID{
-																											NameFodder: ast.Fodder{},
-																											Name: "n__",
-																											CommaFodder: ast.Fodder{},
-																										},
-																										ast.CommaSeparatedID{
-																											NameFodder: ast.Fodder{},
-																											Name: "zero_pad",
-																											CommaFodder: ast.Fodder{},
-																										},
-																										ast.CommaSeparatedID{
-																											NameFodder: ast.Fodder{},
-																											Name: "blank",
-																											CommaFodder: ast.Fodder{},
-																										},
-																										ast.CommaSeparatedID{
-																											NameFodder: ast.Fodder{},
-																											Name: "sign",
-																											CommaFodder: ast.Fodder{},
-																										},
-																										ast.CommaSeparatedID{
-																											NameFodder: ast.Fodder{},
-																											Name: "ensure_pt",
-																											CommaFodder: ast.Fodder{},
-																										},
-																										ast.CommaSeparatedID{
-																											NameFodder: ast.Fodder{},
-																											Name: "trailing",
-																											CommaFodder: ast.Fodder{},
-																										},
-																										ast.CommaSeparatedID{
-																											NameFodder: ast.Fodder{},
-																											Name: "caps",
-																											CommaFodder: ast.Fodder{},
-																										},
-																										ast.CommaSeparatedID{
-																											NameFodder: ast.Fodder{},
-																											Name: "prec",
-																											CommaFodder: nil,
-																										},
+																								Parameters: []ast.Parameter{
+																									ast.Parameter{
+																										NameFodder: ast.Fodder{},
+																										Name: "n__",
+																										EqFodder: nil,
+																										DefaultArg: nil,
+																										CommaFodder: ast.Fodder{},
+																									},
+																									ast.Parameter{
+																										NameFodder: ast.Fodder{},
+																										Name: "zero_pad",
+																										EqFodder: nil,
+																										DefaultArg: nil,
+																										CommaFodder: ast.Fodder{},
+																									},
+																									ast.Parameter{
+																										NameFodder: ast.Fodder{},
+																										Name: "blank",
+																										EqFodder: nil,
+																										DefaultArg: nil,
+																										CommaFodder: ast.Fodder{},
+																									},
+																									ast.Parameter{
+																										NameFodder: ast.Fodder{},
+																										Name: "sign",
+																										EqFodder: nil,
+																										DefaultArg: nil,
+																										CommaFodder: ast.Fodder{},
+																									},
+																									ast.Parameter{
+																										NameFodder: ast.Fodder{},
+																										Name: "ensure_pt",
+																										EqFodder: nil,
+																										DefaultArg: nil,
+																										CommaFodder: ast.Fodder{},
+																									},
+																									ast.Parameter{
+																										NameFodder: ast.Fodder{},
+																										Name: "trailing",
+																										EqFodder: nil,
+																										DefaultArg: nil,
+																										CommaFodder: ast.Fodder{},
+																									},
+																									ast.Parameter{
+																										NameFodder: ast.Fodder{},
+																										Name: "caps",
+																										EqFodder: nil,
+																										DefaultArg: nil,
+																										CommaFodder: ast.Fodder{},
+																									},
+																									ast.Parameter{
+																										NameFodder: ast.Fodder{},
+																										Name: "prec",
+																										EqFodder: nil,
+																										DefaultArg: nil,
+																										CommaFodder: nil,
 																									},
-																									Optional: nil,
 																								},
 																								TrailingComma: false,
 																								ParenRightFodder: ast.Fodder{},
@@ -78035,35 +78126,42 @@ var _StdAst = &ast.DesugaredObject{
 																										},
 																									},
 																									ParenLeftFodder: ast.Fodder{},
-																									Parameters: ast.Parameters{
-																										Required: []ast.CommaSeparatedID{
-																											ast.CommaSeparatedID{
-																												NameFodder: ast.Fodder{},
-																												Name: "val",
-																												CommaFodder: ast.Fodder{},
-																											},
-																											ast.CommaSeparatedID{
-																												NameFodder: ast.Fodder{},
-																												Name: "code",
-																												CommaFodder: ast.Fodder{},
-																											},
-																											ast.CommaSeparatedID{
-																												NameFodder: ast.Fodder{},
-																												Name: "fw",
-																												CommaFodder: ast.Fodder{},
-																											},
-																											ast.CommaSeparatedID{
-																												NameFodder: ast.Fodder{},
-																												Name: "prec_or_null",
-																												CommaFodder: ast.Fodder{},
-																											},
-																											ast.CommaSeparatedID{
-																												NameFodder: ast.Fodder{},
-																												Name: "i",
-																												CommaFodder: nil,
-																											},
+																									Parameters: []ast.Parameter{
+																										ast.Parameter{
+																											NameFodder: ast.Fodder{},
+																											Name: "val",
+																											EqFodder: nil,
+																											DefaultArg: nil,
+																											CommaFodder: ast.Fodder{},
+																										},
+																										ast.Parameter{
+																											NameFodder: ast.Fodder{},
+																											Name: "code",
+																											EqFodder: nil,
+																											DefaultArg: nil,
+																											CommaFodder: ast.Fodder{},
+																										},
+																										ast.Parameter{
+																											NameFodder: ast.Fodder{},
+																											Name: "fw",
+																											EqFodder: nil,
+																											DefaultArg: nil,
+																											CommaFodder: ast.Fodder{},
+																										},
+																										ast.Parameter{
+																											NameFodder: ast.Fodder{},
+																											Name: "prec_or_null",
+																											EqFodder: nil,
+																											DefaultArg: nil,
+																											CommaFodder: ast.Fodder{},
+																										},
+																										ast.Parameter{
+																											NameFodder: ast.Fodder{},
+																											Name: "i",
+																											EqFodder: nil,
+																											DefaultArg: nil,
+																											CommaFodder: nil,
 																										},
-																										Optional: nil,
 																									},
 																									TrailingComma: false,
 																									ParenRightFodder: ast.Fodder{},
@@ -88948,35 +89046,42 @@ var _StdAst = &ast.DesugaredObject{
 																											},
 																										},
 																										ParenLeftFodder: ast.Fodder{},
-																										Parameters: ast.Parameters{
-																											Required: []ast.CommaSeparatedID{
-																												ast.CommaSeparatedID{
-																													NameFodder: ast.Fodder{},
-																													Name: "codes",
-																													CommaFodder: ast.Fodder{},
-																												},
-																												ast.CommaSeparatedID{
-																													NameFodder: ast.Fodder{},
-																													Name: "arr",
-																													CommaFodder: ast.Fodder{},
-																												},
-																												ast.CommaSeparatedID{
-																													NameFodder: ast.Fodder{},
-																													Name: "i",
-																													CommaFodder: ast.Fodder{},
-																												},
-																												ast.CommaSeparatedID{
-																													NameFodder: ast.Fodder{},
-																													Name: "j",
-																													CommaFodder: ast.Fodder{},
-																												},
-																												ast.CommaSeparatedID{
-																													NameFodder: ast.Fodder{},
-																													Name: "v",
-																													CommaFodder: nil,
-																												},
+																										Parameters: []ast.Parameter{
+																											ast.Parameter{
+																												NameFodder: ast.Fodder{},
+																												Name: "codes",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: ast.Fodder{},
+																											},
+																											ast.Parameter{
+																												NameFodder: ast.Fodder{},
+																												Name: "arr",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: ast.Fodder{},
+																											},
+																											ast.Parameter{
+																												NameFodder: ast.Fodder{},
+																												Name: "i",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: ast.Fodder{},
+																											},
+																											ast.Parameter{
+																												NameFodder: ast.Fodder{},
+																												Name: "j",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: ast.Fodder{},
+																											},
+																											ast.Parameter{
+																												NameFodder: ast.Fodder{},
+																												Name: "v",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: nil,
 																											},
-																											Optional: nil,
 																										},
 																										TrailingComma: false,
 																										ParenRightFodder: ast.Fodder{},
@@ -95201,30 +95306,35 @@ var _StdAst = &ast.DesugaredObject{
 																												},
 																											},
 																											ParenLeftFodder: ast.Fodder{},
-																											Parameters: ast.Parameters{
-																												Required: []ast.CommaSeparatedID{
-																													ast.CommaSeparatedID{
-																														NameFodder: ast.Fodder{},
-																														Name: "codes",
-																														CommaFodder: ast.Fodder{},
-																													},
-																													ast.CommaSeparatedID{
-																														NameFodder: ast.Fodder{},
-																														Name: "obj",
-																														CommaFodder: ast.Fodder{},
-																													},
-																													ast.CommaSeparatedID{
-																														NameFodder: ast.Fodder{},
-																														Name: "i",
-																														CommaFodder: ast.Fodder{},
-																													},
-																													ast.CommaSeparatedID{
-																														NameFodder: ast.Fodder{},
-																														Name: "v",
-																														CommaFodder: nil,
-																													},
+																											Parameters: []ast.Parameter{
+																												ast.Parameter{
+																													NameFodder: ast.Fodder{},
+																													Name: "codes",
+																													EqFodder: nil,
+																													DefaultArg: nil,
+																													CommaFodder: ast.Fodder{},
+																												},
+																												ast.Parameter{
+																													NameFodder: ast.Fodder{},
+																													Name: "obj",
+																													EqFodder: nil,
+																													DefaultArg: nil,
+																													CommaFodder: ast.Fodder{},
+																												},
+																												ast.Parameter{
+																													NameFodder: ast.Fodder{},
+																													Name: "i",
+																													EqFodder: nil,
+																													DefaultArg: nil,
+																													CommaFodder: ast.Fodder{},
+																												},
+																												ast.Parameter{
+																													NameFodder: ast.Fodder{},
+																													Name: "v",
+																													EqFodder: nil,
+																													DefaultArg: nil,
+																													CommaFodder: nil,
 																												},
-																												Optional: nil,
 																											},
 																											TrailingComma: false,
 																											ParenRightFodder: ast.Fodder{},
@@ -99530,25 +99640,28 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "func",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "init",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "func",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "init",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -99608,30 +99721,35 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "func",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "arr",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "running",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "idx",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "func",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "arr",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "running",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "idx",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -100473,25 +100591,28 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "func",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "init",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "func",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "init",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -100552,30 +100673,35 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "func",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "arr",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "running",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "idx",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "func",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "arr",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "running",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "idx",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -101375,25 +101501,28 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "filter_func",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "map_func",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "filter_func",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "map_func",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -102881,20 +103010,21 @@ var _StdAst = &ast.DesugaredObject{
 					FreeVars: nil,
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -103266,15 +103396,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "n",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "n",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -103873,15 +104002,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "n",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "n",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -104610,20 +104738,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -105585,20 +105714,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -106558,25 +106688,28 @@ var _StdAst = &ast.DesugaredObject{
 					FreeVars: nil,
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "x",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "minVal",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "maxVal",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "x",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "minVal",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "maxVal",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -106900,15 +107033,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arrs",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arrs",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -107031,20 +107163,21 @@ var _StdAst = &ast.DesugaredObject{
 										FreeVars: nil,
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "a",
-												CommaFodder: ast.Fodder{},
-											},
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "b",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "a",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: ast.Fodder{},
+										},
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "b",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -107225,15 +107358,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "ini",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "ini",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -107291,15 +107423,14 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "body",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "body",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -107543,15 +107674,14 @@ var _StdAst = &ast.DesugaredObject{
 																		},
 																	},
 																	ParenLeftFodder: nil,
-																	Parameters: ast.Parameters{
-																		Required: []ast.CommaSeparatedID{
-																			ast.CommaSeparatedID{
-																				NameFodder: nil,
-																				Name: "k",
-																				CommaFodder: nil,
-																			},
+																	Parameters: []ast.Parameter{
+																		ast.Parameter{
+																			NameFodder: nil,
+																			Name: "k",
+																			EqFodder: nil,
+																			DefaultArg: nil,
+																			CommaFodder: nil,
 																		},
-																		Optional: nil,
 																	},
 																	TrailingComma: false,
 																	ParenRightFodder: nil,
@@ -107957,15 +108087,14 @@ var _StdAst = &ast.DesugaredObject{
 																												},
 																											},
 																											ParenLeftFodder: nil,
-																											Parameters: ast.Parameters{
-																												Required: []ast.CommaSeparatedID{
-																													ast.CommaSeparatedID{
-																														NameFodder: nil,
-																														Name: "value",
-																														CommaFodder: nil,
-																													},
+																											Parameters: []ast.Parameter{
+																												ast.Parameter{
+																													NameFodder: nil,
+																													Name: "value",
+																													EqFodder: nil,
+																													DefaultArg: nil,
+																													CommaFodder: nil,
 																												},
-																												Optional: nil,
 																											},
 																											TrailingComma: false,
 																											ParenRightFodder: nil,
@@ -108708,20 +108837,21 @@ var _StdAst = &ast.DesugaredObject{
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "sname",
-												CommaFodder: ast.Fodder{},
-											},
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "sbody",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "sname",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: ast.Fodder{},
+										},
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "sbody",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -109504,15 +109634,14 @@ var _StdAst = &ast.DesugaredObject{
 														},
 													},
 													ParenLeftFodder: nil,
-													Parameters: ast.Parameters{
-														Required: []ast.CommaSeparatedID{
-															ast.CommaSeparatedID{
-																NameFodder: nil,
-																Name: "k",
-																CommaFodder: nil,
-															},
+													Parameters: []ast.Parameter{
+														ast.Parameter{
+															NameFodder: nil,
+															Name: "k",
+															EqFodder: nil,
+															DefaultArg: nil,
+															CommaFodder: nil,
 														},
-														Optional: nil,
 													},
 													TrailingComma: false,
 													ParenRightFodder: nil,
@@ -110371,15 +110500,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str_",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str_",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -110599,15 +110727,14 @@ var _StdAst = &ast.DesugaredObject{
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "ch",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "ch",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -112529,15 +112656,14 @@ var _StdAst = &ast.DesugaredObject{
 																				},
 																			},
 																			ParenLeftFodder: nil,
-																			Parameters: ast.Parameters{
-																				Required: []ast.CommaSeparatedID{
-																					ast.CommaSeparatedID{
-																						NameFodder: nil,
-																						Name: "ch",
-																						CommaFodder: nil,
-																					},
+																			Parameters: []ast.Parameter{
+																				ast.Parameter{
+																					NameFodder: nil,
+																					Name: "ch",
+																					EqFodder: nil,
+																					DefaultArg: nil,
+																					CommaFodder: nil,
 																				},
-																				Optional: nil,
 																			},
 																			TrailingComma: false,
 																			ParenRightFodder: nil,
@@ -112858,15 +112984,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -113050,15 +113175,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str_",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str_",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -113276,15 +113400,14 @@ var _StdAst = &ast.DesugaredObject{
 										FreeVars: nil,
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "ch",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "ch",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -113815,15 +113938,14 @@ var _StdAst = &ast.DesugaredObject{
 																				},
 																			},
 																			ParenLeftFodder: nil,
-																			Parameters: ast.Parameters{
-																				Required: []ast.CommaSeparatedID{
-																					ast.CommaSeparatedID{
-																						NameFodder: nil,
-																						Name: "ch",
-																						CommaFodder: nil,
-																					},
+																			Parameters: []ast.Parameter{
+																				ast.Parameter{
+																					NameFodder: nil,
+																					Name: "ch",
+																					EqFodder: nil,
+																					DefaultArg: nil,
+																					CommaFodder: nil,
 																				},
-																				Optional: nil,
 																			},
 																			TrailingComma: false,
 																			ParenRightFodder: nil,
@@ -114144,15 +114266,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str_",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str_",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -114370,15 +114491,14 @@ var _StdAst = &ast.DesugaredObject{
 										FreeVars: nil,
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "ch",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "ch",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -114671,20 +114791,21 @@ var _StdAst = &ast.DesugaredObject{
 												},
 											},
 											ParenLeftFodder: ast.Fodder{},
-											Parameters: ast.Parameters{
-												Required: []ast.CommaSeparatedID{
-													ast.CommaSeparatedID{
-														NameFodder: ast.Fodder{},
-														Name: "a",
-														CommaFodder: ast.Fodder{},
-													},
-													ast.CommaSeparatedID{
-														NameFodder: ast.Fodder{},
-														Name: "b",
-														CommaFodder: nil,
-													},
+											Parameters: []ast.Parameter{
+												ast.Parameter{
+													NameFodder: ast.Fodder{},
+													Name: "a",
+													EqFodder: nil,
+													DefaultArg: nil,
+													CommaFodder: ast.Fodder{},
+												},
+												ast.Parameter{
+													NameFodder: ast.Fodder{},
+													Name: "b",
+													EqFodder: nil,
+													DefaultArg: nil,
+													CommaFodder: nil,
 												},
-												Optional: nil,
 											},
 											TrailingComma: false,
 											ParenRightFodder: ast.Fodder{},
@@ -115028,15 +115149,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "value",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "value",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -115238,20 +115358,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "value",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "indent",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "value",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "indent",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -115312,25 +115433,28 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "v",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "path",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "cindent",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "v",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "path",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "cindent",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -117514,15 +117638,14 @@ var _StdAst = &ast.DesugaredObject{
 																																},
 																															},
 																															ParenLeftFodder: nil,
-																															Parameters: ast.Parameters{
-																																Required: []ast.CommaSeparatedID{
-																																	ast.CommaSeparatedID{
-																																		NameFodder: nil,
-																																		Name: "i",
-																																		CommaFodder: nil,
-																																	},
+																															Parameters: []ast.Parameter{
+																																ast.Parameter{
+																																	NameFodder: nil,
+																																	Name: "i",
+																																	EqFodder: nil,
+																																	DefaultArg: nil,
+																																	CommaFodder: nil,
 																																},
-																																Optional: nil,
 																															},
 																															TrailingComma: false,
 																															ParenRightFodder: nil,
@@ -118834,15 +118957,14 @@ var _StdAst = &ast.DesugaredObject{
 																															},
 																														},
 																														ParenLeftFodder: nil,
-																														Parameters: ast.Parameters{
-																															Required: []ast.CommaSeparatedID{
-																																ast.CommaSeparatedID{
-																																	NameFodder: nil,
-																																	Name: "k",
-																																	CommaFodder: nil,
-																																},
+																														Parameters: []ast.Parameter{
+																															ast.Parameter{
+																																NameFodder: nil,
+																																Name: "k",
+																																EqFodder: nil,
+																																DefaultArg: nil,
+																																CommaFodder: nil,
 																															},
-																															Optional: nil,
 																														},
 																														TrailingComma: false,
 																														ParenRightFodder: nil,
@@ -120204,41 +120326,39 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "value",
-							CommaFodder: ast.Fodder{},
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "value",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
 					},
-					Optional: []ast.NamedParameter{
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "indent_array_in_object",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.LiteralBoolean{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(939),
-											Column: int(49),
-										},
-										End: ast.Location{
-											Line: int(939),
-											Column: int(54),
-										},
-										File: p1,
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "indent_array_in_object",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.LiteralBoolean{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(939),
+										Column: int(49),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p9887,
-									FreeVars: nil,
+									End: ast.Location{
+										Line: int(939),
+										Column: int(54),
+									},
+									File: p1,
 								},
-								Value: false,
+								Fodder: ast.Fodder{},
+								Ctx: p9886,
+								FreeVars: nil,
 							},
-							CommaFodder: ast.Fodder{},
+							Value: false,
 						},
+						CommaFodder: ast.Fodder{},
 					},
 				},
 				TrailingComma: false,
@@ -120265,7 +120385,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p9887,
+						Ctx: p9886,
 						FreeVars: ast.Identifiers{
 							"indent_array_in_object",
 							"std",
@@ -120292,7 +120412,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: nil,
-									Ctx: p9893,
+									Ctx: p9892,
 									FreeVars: ast.Identifiers{
 										"aux",
 										"indent_array_in_object",
@@ -120300,25 +120420,28 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "v",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "path",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "cindent",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "v",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "path",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "cindent",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -120344,7 +120467,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p9898,
+										Ctx: p9897,
 										FreeVars: ast.Identifiers{
 											"aux",
 											"cindent",
@@ -120369,7 +120492,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p9898,
+											Ctx: p9897,
 											FreeVars: ast.Identifiers{
 												"v",
 											},
@@ -120389,7 +120512,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p9898,
+												Ctx: p9897,
 												FreeVars: ast.Identifiers{
 													"v",
 												},
@@ -120413,7 +120536,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p9898,
+												Ctx: p9897,
 												FreeVars: nil,
 											},
 											Value: true,
@@ -120442,7 +120565,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p9898,
+											Ctx: p9897,
 											FreeVars: nil,
 										},
 										Value: "true",
@@ -120472,7 +120595,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p9898,
+											Ctx: p9897,
 											FreeVars: ast.Identifiers{
 												"aux",
 												"cindent",
@@ -120497,7 +120620,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p9898,
+												Ctx: p9897,
 												FreeVars: ast.Identifiers{
 													"v",
 												},
@@ -120517,7 +120640,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p9898,
+													Ctx: p9897,
 													FreeVars: ast.Identifiers{
 														"v",
 													},
@@ -120541,7 +120664,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p9898,
+													Ctx: p9897,
 													FreeVars: nil,
 												},
 												Value: false,
@@ -120570,7 +120693,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p9898,
+												Ctx: p9897,
 												FreeVars: nil,
 											},
 											Value: "false",
@@ -120600,7 +120723,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p9898,
+												Ctx: p9897,
 												FreeVars: ast.Identifiers{
 													"aux",
 													"cindent",
@@ -120625,7 +120748,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p9898,
+													Ctx: p9897,
 													FreeVars: ast.Identifiers{
 														"v",
 													},
@@ -120645,7 +120768,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p9898,
+														Ctx: p9897,
 														FreeVars: ast.Identifiers{
 															"v",
 														},
@@ -120669,7 +120792,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p9898,
+														Ctx: p9897,
 														FreeVars: nil,
 													},
 												},
@@ -120697,7 +120820,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p9898,
+													Ctx: p9897,
 													FreeVars: nil,
 												},
 												Value: "null",
@@ -120727,7 +120850,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p9898,
+													Ctx: p9897,
 													FreeVars: ast.Identifiers{
 														"aux",
 														"cindent",
@@ -120752,7 +120875,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p9898,
+														Ctx: p9897,
 														FreeVars: ast.Identifiers{
 															"std",
 															"v",
@@ -120773,7 +120896,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p9898,
+															Ctx: p9897,
 															FreeVars: ast.Identifiers{
 																"std",
 															},
@@ -120845,7 +120968,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9939,
+																		Ctx: p9938,
 																		FreeVars: ast.Identifiers{
 																			"v",
 																		},
@@ -120878,7 +121001,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p9898,
+														Ctx: p9897,
 														FreeVars: ast.Identifiers{
 															"v",
 														},
@@ -120905,7 +121028,7 @@ var _StdAst = &ast.DesugaredObject{
 																	Comment: []string{},
 																},
 															},
-															Ctx: p9898,
+															Ctx: p9897,
 															FreeVars: nil,
 														},
 														Value: "",
@@ -120929,7 +121052,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p9898,
+															Ctx: p9897,
 															FreeVars: ast.Identifiers{
 																"v",
 															},
@@ -120960,7 +121083,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p9898,
+														Ctx: p9897,
 														FreeVars: ast.Identifiers{
 															"aux",
 															"cindent",
@@ -120985,7 +121108,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p9898,
+															Ctx: p9897,
 															FreeVars: ast.Identifiers{
 																"std",
 																"v",
@@ -121006,7 +121129,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p9898,
+																Ctx: p9897,
 																FreeVars: ast.Identifiers{
 																	"std",
 																},
@@ -121078,7 +121201,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9959,
+																			Ctx: p9958,
 																			FreeVars: ast.Identifiers{
 																				"v",
 																			},
@@ -121118,7 +121241,7 @@ var _StdAst = &ast.DesugaredObject{
 																	Comment: []string{},
 																},
 															},
-															Ctx: p9898,
+															Ctx: p9897,
 															FreeVars: ast.Identifiers{
 																"cindent",
 																"std",
@@ -121145,7 +121268,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9966,
+																		Ctx: p9965,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																			"v",
@@ -121166,7 +121289,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9966,
+																			Ctx: p9965,
 																			FreeVars: ast.Identifiers{
 																				"std",
 																			},
@@ -121238,7 +121361,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p9975,
+																						Ctx: p9974,
 																						FreeVars: ast.Identifiers{
 																							"v",
 																						},
@@ -121281,7 +121404,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p9898,
+																Ctx: p9897,
 																FreeVars: ast.Identifiers{
 																	"cindent",
 																	"len",
@@ -121304,7 +121427,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p9898,
+																	Ctx: p9897,
 																	FreeVars: ast.Identifiers{
 																		"len",
 																	},
@@ -121324,7 +121447,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"len",
 																		},
@@ -121348,7 +121471,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: nil,
 																	},
 																	OriginalString: "0",
@@ -121377,7 +121500,7 @@ var _StdAst = &ast.DesugaredObject{
 																			Comment: []string{},
 																		},
 																	},
-																	Ctx: p9898,
+																	Ctx: p9897,
 																	FreeVars: nil,
 																},
 																Value: "\"\"",
@@ -121407,7 +121530,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p9898,
+																	Ctx: p9897,
 																	FreeVars: ast.Identifiers{
 																		"cindent",
 																		"len",
@@ -121430,7 +121553,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"len",
 																			"v",
@@ -121451,7 +121574,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: ast.Identifiers{
 																				"len",
 																				"v",
@@ -121472,7 +121595,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p9898,
+																				Ctx: p9897,
 																				FreeVars: ast.Identifiers{
 																					"v",
 																				},
@@ -121495,7 +121618,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p9898,
+																				Ctx: p9897,
 																				FreeVars: ast.Identifiers{
 																					"len",
 																				},
@@ -121515,7 +121638,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p9898,
+																					Ctx: p9897,
 																					FreeVars: ast.Identifiers{
 																						"len",
 																					},
@@ -121539,7 +121662,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p9898,
+																					Ctx: p9897,
 																					FreeVars: nil,
 																				},
 																				OriginalString: "1",
@@ -121565,7 +121688,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: nil,
 																		},
 																		Value: "\n",
@@ -121596,7 +121719,7 @@ var _StdAst = &ast.DesugaredObject{
 																				Comment: []string{},
 																			},
 																		},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"cindent",
 																			"std",
@@ -121623,7 +121746,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p10007,
+																					Ctx: p10006,
 																					FreeVars: ast.Identifiers{
 																						"std",
 																						"v",
@@ -121644,7 +121767,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p10007,
+																						Ctx: p10006,
 																						FreeVars: ast.Identifiers{
 																							"std",
 																						},
@@ -121716,7 +121839,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10016,
+																									Ctx: p10015,
 																									FreeVars: ast.Identifiers{
 																										"v",
 																									},
@@ -121741,7 +121864,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10016,
+																									Ctx: p10015,
 																									FreeVars: nil,
 																								},
 																								Value: "\n",
@@ -121777,7 +121900,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: ast.Identifiers{
 																				"cindent",
 																				"split",
@@ -121799,7 +121922,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p9898,
+																				Ctx: p9897,
 																				FreeVars: ast.Identifiers{
 																					"std",
 																				},
@@ -121878,7 +122001,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p10029,
+																							Ctx: p10028,
 																							FreeVars: ast.Identifiers{
 																								"cindent",
 																							},
@@ -121898,7 +122021,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10029,
+																								Ctx: p10028,
 																								FreeVars: ast.Identifiers{
 																									"cindent",
 																								},
@@ -121918,7 +122041,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10029,
+																									Ctx: p10028,
 																									FreeVars: nil,
 																								},
 																								Value: "\n",
@@ -121942,7 +122065,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10029,
+																									Ctx: p10028,
 																									FreeVars: ast.Identifiers{
 																										"cindent",
 																									},
@@ -121967,7 +122090,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10029,
+																								Ctx: p10028,
 																								FreeVars: nil,
 																							},
 																							Value: "  ",
@@ -121993,7 +122116,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p10029,
+																							Ctx: p10028,
 																							FreeVars: ast.Identifiers{
 																								"split",
 																								"std",
@@ -122014,7 +122137,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10029,
+																								Ctx: p10028,
 																								FreeVars: nil,
 																							},
 																							Elements: []ast.CommaSeparatedExpr{
@@ -122034,7 +122157,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10042,
+																											Ctx: p10041,
 																											FreeVars: nil,
 																										},
 																										Value: "|",
@@ -122157,7 +122280,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10029,
+																												Ctx: p10028,
 																												FreeVars: ast.Identifiers{
 																													"split",
 																												},
@@ -122182,7 +122305,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10029,
+																												Ctx: p10028,
 																												FreeVars: nil,
 																											},
 																											OriginalString: "0",
@@ -122205,7 +122328,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10029,
+																												Ctx: p10028,
 																												FreeVars: ast.Identifiers{
 																													"split",
 																													"std",
@@ -122226,7 +122349,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10029,
+																													Ctx: p10028,
 																													FreeVars: ast.Identifiers{
 																														"split",
 																														"std",
@@ -122247,7 +122370,7 @@ var _StdAst = &ast.DesugaredObject{
 																															File: p1,
 																														},
 																														Fodder: ast.Fodder{},
-																														Ctx: p10029,
+																														Ctx: p10028,
 																														FreeVars: ast.Identifiers{
 																															"std",
 																														},
@@ -122319,7 +122442,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p10065,
+																																	Ctx: p10064,
 																																	FreeVars: ast.Identifiers{
 																																		"split",
 																																	},
@@ -122353,7 +122476,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10029,
+																													Ctx: p10028,
 																													FreeVars: nil,
 																												},
 																												OriginalString: "1",
@@ -122426,7 +122549,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																			"v",
@@ -122447,7 +122570,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: ast.Identifiers{
 																				"std",
 																			},
@@ -122526,7 +122649,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p10080,
+																						Ctx: p10079,
 																						FreeVars: ast.Identifiers{
 																							"v",
 																						},
@@ -122569,7 +122692,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p9898,
+															Ctx: p9897,
 															FreeVars: ast.Identifiers{
 																"aux",
 																"cindent",
@@ -122594,7 +122717,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p9898,
+																Ctx: p9897,
 																FreeVars: ast.Identifiers{
 																	"std",
 																	"v",
@@ -122615,7 +122738,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p9898,
+																	Ctx: p9897,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																	},
@@ -122687,7 +122810,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p10094,
+																				Ctx: p10093,
 																				FreeVars: ast.Identifiers{
 																					"v",
 																				},
@@ -122727,7 +122850,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p9898,
+																Ctx: p9897,
 																FreeVars: ast.Identifiers{
 																	"path",
 																},
@@ -122747,7 +122870,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p9898,
+																	Ctx: p9897,
 																	FreeVars: ast.Identifiers{
 																		"path",
 																	},
@@ -122767,7 +122890,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: nil,
 																	},
 																	Value: "Tried to manifest function at ",
@@ -122791,7 +122914,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"path",
 																		},
@@ -122823,7 +122946,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p9898,
+																Ctx: p9897,
 																FreeVars: ast.Identifiers{
 																	"aux",
 																	"cindent",
@@ -122848,7 +122971,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p9898,
+																	Ctx: p9897,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																		"v",
@@ -122869,7 +122992,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -122941,7 +123064,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p10116,
+																					Ctx: p10115,
 																					FreeVars: ast.Identifiers{
 																						"v",
 																					},
@@ -122981,7 +123104,7 @@ var _StdAst = &ast.DesugaredObject{
 																			Comment: []string{},
 																		},
 																	},
-																	Ctx: p9898,
+																	Ctx: p9897,
 																	FreeVars: ast.Identifiers{
 																		"aux",
 																		"cindent",
@@ -123005,7 +123128,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																			"v",
@@ -123026,7 +123149,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: ast.Identifiers{
 																				"std",
 																				"v",
@@ -123047,7 +123170,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p9898,
+																				Ctx: p9897,
 																				FreeVars: ast.Identifiers{
 																					"std",
 																				},
@@ -123119,7 +123242,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p10132,
+																							Ctx: p10131,
 																							FreeVars: ast.Identifiers{
 																								"v",
 																							},
@@ -123153,7 +123276,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: nil,
 																		},
 																		OriginalString: "0",
@@ -123182,7 +123305,7 @@ var _StdAst = &ast.DesugaredObject{
 																				Comment: []string{},
 																			},
 																		},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: nil,
 																	},
 																	Value: "[]",
@@ -123219,7 +123342,7 @@ var _StdAst = &ast.DesugaredObject{
 																				Comment: []string{},
 																			},
 																		},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"aux",
 																			"cindent",
@@ -123248,22 +123371,21 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: nil,
-																					Ctx: p10143,
+																					Ctx: p10142,
 																					FreeVars: ast.Identifiers{
 																						"cindent",
 																						"std",
 																					},
 																				},
 																				ParenLeftFodder: ast.Fodder{},
-																				Parameters: ast.Parameters{
-																					Required: []ast.CommaSeparatedID{
-																						ast.CommaSeparatedID{
-																							NameFodder: ast.Fodder{},
-																							Name: "value",
-																							CommaFodder: nil,
-																						},
+																				Parameters: []ast.Parameter{
+																					ast.Parameter{
+																						NameFodder: ast.Fodder{},
+																						Name: "value",
+																						EqFodder: nil,
+																						DefaultArg: nil,
+																						CommaFodder: nil,
 																					},
-																					Optional: nil,
 																				},
 																				TrailingComma: false,
 																				ParenRightFodder: ast.Fodder{},
@@ -123289,7 +123411,7 @@ var _StdAst = &ast.DesugaredObject{
 																								Comment: []string{},
 																							},
 																						},
-																						Ctx: p10148,
+																						Ctx: p10147,
 																						FreeVars: ast.Identifiers{
 																							"cindent",
 																							"std",
@@ -123311,7 +123433,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p10148,
+																							Ctx: p10147,
 																							FreeVars: ast.Identifiers{
 																								"std",
 																								"value",
@@ -123332,7 +123454,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10148,
+																								Ctx: p10147,
 																								FreeVars: ast.Identifiers{
 																									"std",
 																									"value",
@@ -123353,7 +123475,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10148,
+																									Ctx: p10147,
 																									FreeVars: ast.Identifiers{
 																										"std",
 																									},
@@ -123425,7 +123547,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10161,
+																												Ctx: p10160,
 																												FreeVars: ast.Identifiers{
 																													"value",
 																												},
@@ -123459,7 +123581,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10148,
+																								Ctx: p10147,
 																								FreeVars: ast.Identifiers{
 																									"std",
 																									"value",
@@ -123480,7 +123602,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10148,
+																									Ctx: p10147,
 																									FreeVars: ast.Identifiers{
 																										"std",
 																										"value",
@@ -123501,7 +123623,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10148,
+																										Ctx: p10147,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																										},
@@ -123573,7 +123695,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10174,
+																													Ctx: p10173,
 																													FreeVars: ast.Identifiers{
 																														"value",
 																													},
@@ -123607,7 +123729,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10148,
+																									Ctx: p10147,
 																									FreeVars: nil,
 																								},
 																								OriginalString: "0",
@@ -123630,7 +123752,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p10148,
+																							Ctx: p10147,
 																							FreeVars: ast.Identifiers{
 																								"cindent",
 																							},
@@ -123676,7 +123798,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10182,
+																										Ctx: p10181,
 																										FreeVars: ast.Identifiers{
 																											"cindent",
 																										},
@@ -123696,7 +123818,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10182,
+																											Ctx: p10181,
 																											FreeVars: ast.Identifiers{
 																												"cindent",
 																											},
@@ -123720,7 +123842,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10182,
+																											Ctx: p10181,
 																											FreeVars: nil,
 																										},
 																										Value: "  ",
@@ -123769,7 +123891,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10182,
+																										Ctx: p10181,
 																										FreeVars: nil,
 																									},
 																									Left: &ast.LiteralString{
@@ -123787,7 +123909,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10182,
+																											Ctx: p10181,
 																											FreeVars: nil,
 																										},
 																										Value: "\n",
@@ -123811,7 +123933,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10182,
+																											Ctx: p10181,
 																											FreeVars: nil,
 																										},
 																										Target: &ast.Self{
@@ -123881,7 +124003,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p10148,
+																							Ctx: p10147,
 																							FreeVars: ast.Identifiers{
 																								"cindent",
 																								"std",
@@ -123903,7 +124025,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10148,
+																								Ctx: p10147,
 																								FreeVars: ast.Identifiers{
 																									"std",
 																									"value",
@@ -123924,7 +124046,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10148,
+																									Ctx: p10147,
 																									FreeVars: ast.Identifiers{
 																										"std",
 																										"value",
@@ -123945,7 +124067,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10148,
+																										Ctx: p10147,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																										},
@@ -124017,7 +124139,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10206,
+																													Ctx: p10205,
 																													FreeVars: ast.Identifiers{
 																														"value",
 																													},
@@ -124051,7 +124173,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10148,
+																									Ctx: p10147,
 																									FreeVars: ast.Identifiers{
 																										"std",
 																										"value",
@@ -124072,7 +124194,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10148,
+																										Ctx: p10147,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																											"value",
@@ -124093,7 +124215,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10148,
+																											Ctx: p10147,
 																											FreeVars: ast.Identifiers{
 																												"std",
 																											},
@@ -124165,7 +124287,7 @@ var _StdAst = &ast.DesugaredObject{
 																															File: p1,
 																														},
 																														Fodder: ast.Fodder{},
-																														Ctx: p10219,
+																														Ctx: p10218,
 																														FreeVars: ast.Identifiers{
 																															"value",
 																														},
@@ -124199,7 +124321,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10148,
+																										Ctx: p10147,
 																										FreeVars: nil,
 																									},
 																									OriginalString: "0",
@@ -124222,7 +124344,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10148,
+																								Ctx: p10147,
 																								FreeVars: ast.Identifiers{
 																									"cindent",
 																								},
@@ -124268,7 +124390,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10227,
+																											Ctx: p10226,
 																											FreeVars: ast.Identifiers{
 																												"cindent",
 																											},
@@ -124288,7 +124410,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10227,
+																												Ctx: p10226,
 																												FreeVars: ast.Identifiers{
 																													"cindent",
 																												},
@@ -124312,7 +124434,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10227,
+																												Ctx: p10226,
 																												FreeVars: nil,
 																											},
 																											Value: "  ",
@@ -124361,7 +124483,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10227,
+																											Ctx: p10226,
 																											FreeVars: nil,
 																										},
 																										Value: " ",
@@ -124389,7 +124511,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10148,
+																								Ctx: p10147,
 																								FreeVars: ast.Identifiers{
 																									"cindent",
 																								},
@@ -124435,7 +124557,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10239,
+																											Ctx: p10238,
 																											FreeVars: ast.Identifiers{
 																												"cindent",
 																											},
@@ -124483,7 +124605,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10239,
+																											Ctx: p10238,
 																											FreeVars: nil,
 																										},
 																										Value: " ",
@@ -124524,7 +124646,7 @@ var _StdAst = &ast.DesugaredObject{
 																					Comment: []string{},
 																				},
 																			},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: ast.Identifiers{
 																				"aux",
 																				"cindent",
@@ -124554,7 +124676,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p10248,
+																						Ctx: p10247,
 																						FreeVars: ast.Identifiers{
 																							"std",
 																							"v",
@@ -124575,7 +124697,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p10248,
+																							Ctx: p10247,
 																							FreeVars: ast.Identifiers{
 																								"std",
 																							},
@@ -124647,7 +124769,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10257,
+																										Ctx: p10256,
 																										FreeVars: nil,
 																									},
 																									OriginalString: "0",
@@ -124670,7 +124792,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10257,
+																										Ctx: p10256,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																											"v",
@@ -124691,7 +124813,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10257,
+																											Ctx: p10256,
 																											FreeVars: ast.Identifiers{
 																												"std",
 																												"v",
@@ -124712,7 +124834,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10257,
+																												Ctx: p10256,
 																												FreeVars: ast.Identifiers{
 																													"std",
 																												},
@@ -124784,7 +124906,7 @@ var _StdAst = &ast.DesugaredObject{
 																																File: p1,
 																															},
 																															Fodder: ast.Fodder{},
-																															Ctx: p10269,
+																															Ctx: p10268,
 																															FreeVars: ast.Identifiers{
 																																"v",
 																															},
@@ -124818,7 +124940,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10257,
+																											Ctx: p10256,
 																											FreeVars: nil,
 																										},
 																										OriginalString: "1",
@@ -124860,7 +124982,7 @@ var _StdAst = &ast.DesugaredObject{
 																						Comment: []string{},
 																					},
 																				},
-																				Ctx: p9898,
+																				Ctx: p9897,
 																				FreeVars: ast.Identifiers{
 																					"aux",
 																					"cindent",
@@ -124998,15 +125120,14 @@ var _StdAst = &ast.DesugaredObject{
 																											},
 																										},
 																										ParenLeftFodder: nil,
-																										Parameters: ast.Parameters{
-																											Required: []ast.CommaSeparatedID{
-																												ast.CommaSeparatedID{
-																													NameFodder: nil,
-																													Name: "i",
-																													CommaFodder: nil,
-																												},
+																										Parameters: []ast.Parameter{
+																											ast.Parameter{
+																												NameFodder: nil,
+																												Name: "i",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: nil,
 																											},
-																											Optional: nil,
 																										},
 																										TrailingComma: false,
 																										ParenRightFodder: nil,
@@ -125131,15 +125252,14 @@ var _StdAst = &ast.DesugaredObject{
 																																},
 																															},
 																															ParenLeftFodder: nil,
-																															Parameters: ast.Parameters{
-																																Required: []ast.CommaSeparatedID{
-																																	ast.CommaSeparatedID{
-																																		NameFodder: nil,
-																																		Name: "param",
-																																		CommaFodder: nil,
-																																	},
+																															Parameters: []ast.Parameter{
+																																ast.Parameter{
+																																	NameFodder: nil,
+																																	Name: "param",
+																																	EqFodder: nil,
+																																	DefaultArg: nil,
+																																	CommaFodder: nil,
 																																},
-																																Optional: nil,
 																															},
 																															TrailingComma: false,
 																															ParenRightFodder: nil,
@@ -125184,7 +125304,7 @@ var _StdAst = &ast.DesugaredObject{
 																																					File: p1,
 																																				},
 																																				Fodder: ast.Fodder{},
-																																				Ctx: p10302,
+																																				Ctx: p10301,
 																																				FreeVars: ast.Identifiers{
 																																					"aux",
 																																					"i",
@@ -125208,7 +125328,7 @@ var _StdAst = &ast.DesugaredObject{
 																																						File: p1,
 																																					},
 																																					Fodder: ast.Fodder{},
-																																					Ctx: p10302,
+																																					Ctx: p10301,
 																																					FreeVars: ast.Identifiers{
 																																						"param",
 																																					},
@@ -125235,7 +125355,7 @@ var _StdAst = &ast.DesugaredObject{
 																																								Comment: []string{},
 																																							},
 																																						},
-																																						Ctx: p10302,
+																																						Ctx: p10301,
 																																						FreeVars: nil,
 																																					},
 																																					Value: "-",
@@ -125259,7 +125379,7 @@ var _StdAst = &ast.DesugaredObject{
 																																							File: p1,
 																																						},
 																																						Fodder: ast.Fodder{},
-																																						Ctx: p10302,
+																																						Ctx: p10301,
 																																						FreeVars: ast.Identifiers{
 																																							"param",
 																																						},
@@ -125330,7 +125450,7 @@ var _StdAst = &ast.DesugaredObject{
 																																						File: p1,
 																																					},
 																																					Fodder: ast.Fodder{},
-																																					Ctx: p10302,
+																																					Ctx: p10301,
 																																					FreeVars: ast.Identifiers{
 																																						"aux",
 																																						"i",
@@ -125354,7 +125474,7 @@ var _StdAst = &ast.DesugaredObject{
 																																							File: p1,
 																																						},
 																																						Fodder: ast.Fodder{},
-																																						Ctx: p10302,
+																																						Ctx: p10301,
 																																						FreeVars: ast.Identifiers{
 																																							"aux",
 																																						},
@@ -125380,7 +125500,7 @@ var _StdAst = &ast.DesugaredObject{
 																																										File: p1,
 																																									},
 																																									Fodder: ast.Fodder{},
-																																									Ctx: p10319,
+																																									Ctx: p10318,
 																																									FreeVars: ast.Identifiers{
 																																										"i",
 																																										"v",
@@ -125401,7 +125521,7 @@ var _StdAst = &ast.DesugaredObject{
 																																											File: p1,
 																																										},
 																																										Fodder: ast.Fodder{},
-																																										Ctx: p10319,
+																																										Ctx: p10318,
 																																										FreeVars: ast.Identifiers{
 																																											"v",
 																																										},
@@ -125424,7 +125544,7 @@ var _StdAst = &ast.DesugaredObject{
 																																											File: p1,
 																																										},
 																																										Fodder: ast.Fodder{},
-																																										Ctx: p10319,
+																																										Ctx: p10318,
 																																										FreeVars: ast.Identifiers{
 																																											"i",
 																																										},
@@ -125452,7 +125572,7 @@ var _StdAst = &ast.DesugaredObject{
 																																										File: p1,
 																																									},
 																																									Fodder: ast.Fodder{},
-																																									Ctx: p10319,
+																																									Ctx: p10318,
 																																									FreeVars: ast.Identifiers{
 																																										"i",
 																																										"path",
@@ -125473,7 +125593,7 @@ var _StdAst = &ast.DesugaredObject{
 																																											File: p1,
 																																										},
 																																										Fodder: ast.Fodder{},
-																																										Ctx: p10319,
+																																										Ctx: p10318,
 																																										FreeVars: ast.Identifiers{
 																																											"path",
 																																										},
@@ -125497,7 +125617,7 @@ var _StdAst = &ast.DesugaredObject{
 																																											File: p1,
 																																										},
 																																										Fodder: ast.Fodder{},
-																																										Ctx: p10319,
+																																										Ctx: p10318,
 																																										FreeVars: ast.Identifiers{
 																																											"i",
 																																										},
@@ -125519,7 +125639,7 @@ var _StdAst = &ast.DesugaredObject{
 																																														File: p1,
 																																													},
 																																													Fodder: ast.Fodder{},
-																																													Ctx: p10333,
+																																													Ctx: p10332,
 																																													FreeVars: ast.Identifiers{
 																																														"i",
 																																													},
@@ -125551,7 +125671,7 @@ var _StdAst = &ast.DesugaredObject{
 																																										File: p1,
 																																									},
 																																									Fodder: ast.Fodder{},
-																																									Ctx: p10319,
+																																									Ctx: p10318,
 																																									FreeVars: ast.Identifiers{
 																																										"param",
 																																									},
@@ -125640,7 +125760,7 @@ var _StdAst = &ast.DesugaredObject{
 																																	File: p1,
 																																},
 																																Fodder: ast.Fodder{},
-																																Ctx: p10341,
+																																Ctx: p10340,
 																																FreeVars: ast.Identifiers{
 																																	"i",
 																																	"params",
@@ -125664,7 +125784,7 @@ var _StdAst = &ast.DesugaredObject{
 																																				File: p1,
 																																			},
 																																			Fodder: ast.Fodder{},
-																																			Ctx: p10345,
+																																			Ctx: p10344,
 																																			FreeVars: ast.Identifiers{
 																																				"i",
 																																				"params",
@@ -125686,7 +125806,7 @@ var _StdAst = &ast.DesugaredObject{
 																																					File: p1,
 																																				},
 																																				Fodder: ast.Fodder{},
-																																				Ctx: p10345,
+																																				Ctx: p10344,
 																																				FreeVars: ast.Identifiers{
 																																					"params",
 																																				},
@@ -125712,7 +125832,7 @@ var _StdAst = &ast.DesugaredObject{
 																																								File: p1,
 																																							},
 																																							Fodder: ast.Fodder{},
-																																							Ctx: p10351,
+																																							Ctx: p10350,
 																																							FreeVars: ast.Identifiers{
 																																								"i",
 																																								"v",
@@ -125733,7 +125853,7 @@ var _StdAst = &ast.DesugaredObject{
 																																									File: p1,
 																																								},
 																																								Fodder: ast.Fodder{},
-																																								Ctx: p10351,
+																																								Ctx: p10350,
 																																								FreeVars: ast.Identifiers{
 																																									"v",
 																																								},
@@ -125756,7 +125876,7 @@ var _StdAst = &ast.DesugaredObject{
 																																									File: p1,
 																																								},
 																																								Fodder: ast.Fodder{},
-																																								Ctx: p10351,
+																																								Ctx: p10350,
 																																								FreeVars: ast.Identifiers{
 																																									"i",
 																																								},
@@ -125811,7 +125931,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10341,
+																											Ctx: p10340,
 																											FreeVars: ast.Identifiers{
 																												"range",
 																											},
@@ -125847,7 +125967,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p9898,
+																					Ctx: p9897,
 																					FreeVars: ast.Identifiers{
 																						"cindent",
 																						"parts",
@@ -125869,7 +125989,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p9898,
+																						Ctx: p9897,
 																						FreeVars: ast.Identifiers{
 																							"std",
 																						},
@@ -125948,7 +126068,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10369,
+																									Ctx: p10368,
 																									FreeVars: ast.Identifiers{
 																										"cindent",
 																									},
@@ -125968,7 +126088,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10369,
+																										Ctx: p10368,
 																										FreeVars: nil,
 																									},
 																									Value: "\n",
@@ -125992,7 +126112,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10369,
+																										Ctx: p10368,
 																										FreeVars: ast.Identifiers{
 																											"cindent",
 																										},
@@ -126018,7 +126138,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10369,
+																									Ctx: p10368,
 																									FreeVars: ast.Identifiers{
 																										"parts",
 																									},
@@ -126062,7 +126182,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p9898,
+																	Ctx: p9897,
 																	FreeVars: ast.Identifiers{
 																		"aux",
 																		"cindent",
@@ -126087,7 +126207,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																			"v",
@@ -126108,7 +126228,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: ast.Identifiers{
 																				"std",
 																			},
@@ -126180,7 +126300,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p10388,
+																						Ctx: p10387,
 																						FreeVars: ast.Identifiers{
 																							"v",
 																						},
@@ -126220,7 +126340,7 @@ var _StdAst = &ast.DesugaredObject{
 																				Comment: []string{},
 																			},
 																		},
-																		Ctx: p9898,
+																		Ctx: p9897,
 																		FreeVars: ast.Identifiers{
 																			"aux",
 																			"cindent",
@@ -126245,7 +126365,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: ast.Identifiers{
 																				"std",
 																				"v",
@@ -126266,7 +126386,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p9898,
+																				Ctx: p9897,
 																				FreeVars: ast.Identifiers{
 																					"std",
 																					"v",
@@ -126287,7 +126407,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p9898,
+																					Ctx: p9897,
 																					FreeVars: ast.Identifiers{
 																						"std",
 																					},
@@ -126359,7 +126479,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10404,
+																								Ctx: p10403,
 																								FreeVars: ast.Identifiers{
 																									"v",
 																								},
@@ -126393,7 +126513,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p9898,
+																				Ctx: p9897,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "0",
@@ -126422,7 +126542,7 @@ var _StdAst = &ast.DesugaredObject{
 																					Comment: []string{},
 																				},
 																			},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: nil,
 																		},
 																		Value: "{}",
@@ -126459,7 +126579,7 @@ var _StdAst = &ast.DesugaredObject{
 																					Comment: []string{},
 																				},
 																			},
-																			Ctx: p9898,
+																			Ctx: p9897,
 																			FreeVars: ast.Identifiers{
 																				"aux",
 																				"cindent",
@@ -126489,7 +126609,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: nil,
-																						Ctx: p10415,
+																						Ctx: p10414,
 																						FreeVars: ast.Identifiers{
 																							"cindent",
 																							"indent_array_in_object",
@@ -126497,15 +126617,14 @@ var _StdAst = &ast.DesugaredObject{
 																						},
 																					},
 																					ParenLeftFodder: ast.Fodder{},
-																					Parameters: ast.Parameters{
-																						Required: []ast.CommaSeparatedID{
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "value",
-																								CommaFodder: nil,
-																							},
+																					Parameters: []ast.Parameter{
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "value",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: nil,
 																						},
-																						Optional: nil,
 																					},
 																					TrailingComma: false,
 																					ParenRightFodder: ast.Fodder{},
@@ -126531,7 +126650,7 @@ var _StdAst = &ast.DesugaredObject{
 																									Comment: []string{},
 																								},
 																							},
-																							Ctx: p10420,
+																							Ctx: p10419,
 																							FreeVars: ast.Identifiers{
 																								"cindent",
 																								"indent_array_in_object",
@@ -126554,7 +126673,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10420,
+																								Ctx: p10419,
 																								FreeVars: ast.Identifiers{
 																									"std",
 																									"value",
@@ -126575,7 +126694,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10420,
+																									Ctx: p10419,
 																									FreeVars: ast.Identifiers{
 																										"std",
 																										"value",
@@ -126596,7 +126715,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10420,
+																										Ctx: p10419,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																										},
@@ -126668,7 +126787,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10433,
+																													Ctx: p10432,
 																													FreeVars: ast.Identifiers{
 																														"value",
 																													},
@@ -126702,7 +126821,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10420,
+																									Ctx: p10419,
 																									FreeVars: ast.Identifiers{
 																										"std",
 																										"value",
@@ -126723,7 +126842,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10420,
+																										Ctx: p10419,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																											"value",
@@ -126744,7 +126863,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10420,
+																											Ctx: p10419,
 																											FreeVars: ast.Identifiers{
 																												"std",
 																											},
@@ -126816,7 +126935,7 @@ var _StdAst = &ast.DesugaredObject{
 																															File: p1,
 																														},
 																														Fodder: ast.Fodder{},
-																														Ctx: p10446,
+																														Ctx: p10445,
 																														FreeVars: ast.Identifiers{
 																															"value",
 																														},
@@ -126850,7 +126969,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10420,
+																										Ctx: p10419,
 																										FreeVars: nil,
 																									},
 																									OriginalString: "0",
@@ -126873,7 +126992,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10420,
+																								Ctx: p10419,
 																								FreeVars: ast.Identifiers{
 																									"cindent",
 																									"indent_array_in_object",
@@ -126920,7 +127039,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10454,
+																											Ctx: p10453,
 																											FreeVars: ast.Identifiers{
 																												"cindent",
 																												"indent_array_in_object",
@@ -126941,7 +127060,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10454,
+																												Ctx: p10453,
 																												FreeVars: ast.Identifiers{
 																													"indent_array_in_object",
 																												},
@@ -126964,7 +127083,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10454,
+																												Ctx: p10453,
 																												FreeVars: ast.Identifiers{
 																													"cindent",
 																												},
@@ -126984,7 +127103,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10454,
+																													Ctx: p10453,
 																													FreeVars: ast.Identifiers{
 																														"cindent",
 																													},
@@ -127008,7 +127127,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10454,
+																													Ctx: p10453,
 																													FreeVars: nil,
 																												},
 																												Value: "  ",
@@ -127032,7 +127151,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10454,
+																												Ctx: p10453,
 																												FreeVars: ast.Identifiers{
 																													"cindent",
 																												},
@@ -127081,7 +127200,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10454,
+																											Ctx: p10453,
 																											FreeVars: nil,
 																										},
 																										Left: &ast.LiteralString{
@@ -127099,7 +127218,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10454,
+																												Ctx: p10453,
 																												FreeVars: nil,
 																											},
 																											Value: "\n",
@@ -127123,7 +127242,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10454,
+																												Ctx: p10453,
 																												FreeVars: nil,
 																											},
 																											Target: &ast.Self{
@@ -127193,7 +127312,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p10420,
+																								Ctx: p10419,
 																								FreeVars: ast.Identifiers{
 																									"cindent",
 																									"std",
@@ -127215,7 +127334,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10420,
+																									Ctx: p10419,
 																									FreeVars: ast.Identifiers{
 																										"std",
 																										"value",
@@ -127236,7 +127355,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10420,
+																										Ctx: p10419,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																											"value",
@@ -127257,7 +127376,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10420,
+																											Ctx: p10419,
 																											FreeVars: ast.Identifiers{
 																												"std",
 																											},
@@ -127329,7 +127448,7 @@ var _StdAst = &ast.DesugaredObject{
 																															File: p1,
 																														},
 																														Fodder: ast.Fodder{},
-																														Ctx: p10484,
+																														Ctx: p10483,
 																														FreeVars: ast.Identifiers{
 																															"value",
 																														},
@@ -127363,7 +127482,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10420,
+																										Ctx: p10419,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																											"value",
@@ -127384,7 +127503,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10420,
+																											Ctx: p10419,
 																											FreeVars: ast.Identifiers{
 																												"std",
 																												"value",
@@ -127405,7 +127524,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10420,
+																												Ctx: p10419,
 																												FreeVars: ast.Identifiers{
 																													"std",
 																												},
@@ -127477,7 +127596,7 @@ var _StdAst = &ast.DesugaredObject{
 																																File: p1,
 																															},
 																															Fodder: ast.Fodder{},
-																															Ctx: p10497,
+																															Ctx: p10496,
 																															FreeVars: ast.Identifiers{
 																																"value",
 																															},
@@ -127511,7 +127630,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10420,
+																											Ctx: p10419,
 																											FreeVars: nil,
 																										},
 																										OriginalString: "0",
@@ -127534,7 +127653,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10420,
+																									Ctx: p10419,
 																									FreeVars: ast.Identifiers{
 																										"cindent",
 																									},
@@ -127580,7 +127699,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10505,
+																												Ctx: p10504,
 																												FreeVars: ast.Identifiers{
 																													"cindent",
 																												},
@@ -127600,7 +127719,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10505,
+																													Ctx: p10504,
 																													FreeVars: ast.Identifiers{
 																														"cindent",
 																													},
@@ -127624,7 +127743,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10505,
+																													Ctx: p10504,
 																													FreeVars: nil,
 																												},
 																												Value: "  ",
@@ -127673,7 +127792,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10505,
+																												Ctx: p10504,
 																												FreeVars: nil,
 																											},
 																											Left: &ast.LiteralString{
@@ -127691,7 +127810,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10505,
+																													Ctx: p10504,
 																													FreeVars: nil,
 																												},
 																												Value: "\n",
@@ -127715,7 +127834,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10505,
+																													Ctx: p10504,
 																													FreeVars: nil,
 																												},
 																												Target: &ast.Self{
@@ -127785,7 +127904,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10420,
+																									Ctx: p10419,
 																									FreeVars: ast.Identifiers{
 																										"cindent",
 																									},
@@ -127831,7 +127950,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10521,
+																												Ctx: p10520,
 																												FreeVars: ast.Identifiers{
 																													"cindent",
 																												},
@@ -127879,7 +127998,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10521,
+																												Ctx: p10520,
 																												FreeVars: nil,
 																											},
 																											Value: " ",
@@ -127920,7 +128039,7 @@ var _StdAst = &ast.DesugaredObject{
 																						Comment: []string{},
 																					},
 																				},
-																				Ctx: p9898,
+																				Ctx: p9897,
 																				FreeVars: ast.Identifiers{
 																					"aux",
 																					"cindent",
@@ -128056,15 +128175,14 @@ var _StdAst = &ast.DesugaredObject{
 																											},
 																										},
 																										ParenLeftFodder: nil,
-																										Parameters: ast.Parameters{
-																											Required: []ast.CommaSeparatedID{
-																												ast.CommaSeparatedID{
-																													NameFodder: nil,
-																													Name: "k",
-																													CommaFodder: nil,
-																												},
+																										Parameters: []ast.Parameter{
+																											ast.Parameter{
+																												NameFodder: nil,
+																												Name: "k",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: nil,
 																											},
-																											Optional: nil,
 																										},
 																										TrailingComma: false,
 																										ParenRightFodder: nil,
@@ -128190,15 +128308,14 @@ var _StdAst = &ast.DesugaredObject{
 																																},
 																															},
 																															ParenLeftFodder: nil,
-																															Parameters: ast.Parameters{
-																																Required: []ast.CommaSeparatedID{
-																																	ast.CommaSeparatedID{
-																																		NameFodder: nil,
-																																		Name: "param",
-																																		CommaFodder: nil,
-																																	},
+																															Parameters: []ast.Parameter{
+																																ast.Parameter{
+																																	NameFodder: nil,
+																																	Name: "param",
+																																	EqFodder: nil,
+																																	DefaultArg: nil,
+																																	CommaFodder: nil,
 																																},
-																																Optional: nil,
 																															},
 																															TrailingComma: false,
 																															ParenRightFodder: nil,
@@ -128244,7 +128361,7 @@ var _StdAst = &ast.DesugaredObject{
 																																					File: p1,
 																																				},
 																																				Fodder: ast.Fodder{},
-																																				Ctx: p10555,
+																																				Ctx: p10554,
 																																				FreeVars: ast.Identifiers{
 																																					"aux",
 																																					"k",
@@ -128269,7 +128386,7 @@ var _StdAst = &ast.DesugaredObject{
 																																						File: p1,
 																																					},
 																																					Fodder: ast.Fodder{},
-																																					Ctx: p10555,
+																																					Ctx: p10554,
 																																					FreeVars: ast.Identifiers{
 																																						"k",
 																																						"param",
@@ -128291,7 +128408,7 @@ var _StdAst = &ast.DesugaredObject{
 																																							File: p1,
 																																						},
 																																						Fodder: ast.Fodder{},
-																																						Ctx: p10555,
+																																						Ctx: p10554,
 																																						FreeVars: ast.Identifiers{
 																																							"k",
 																																							"std",
@@ -128312,7 +128429,7 @@ var _StdAst = &ast.DesugaredObject{
 																																								File: p1,
 																																							},
 																																							Fodder: ast.Fodder{},
-																																							Ctx: p10555,
+																																							Ctx: p10554,
 																																							FreeVars: ast.Identifiers{
 																																								"k",
 																																								"std",
@@ -128333,7 +128450,7 @@ var _StdAst = &ast.DesugaredObject{
 																																									File: p1,
 																																								},
 																																								Fodder: ast.Fodder{},
-																																								Ctx: p10555,
+																																								Ctx: p10554,
 																																								FreeVars: ast.Identifiers{
 																																									"std",
 																																								},
@@ -128412,7 +128529,7 @@ var _StdAst = &ast.DesugaredObject{
 																																												File: p1,
 																																											},
 																																											Fodder: ast.Fodder{},
-																																											Ctx: p10571,
+																																											Ctx: p10570,
 																																											FreeVars: ast.Identifiers{
 																																												"k",
 																																											},
@@ -128446,7 +128563,7 @@ var _StdAst = &ast.DesugaredObject{
 																																								File: p1,
 																																							},
 																																							Fodder: ast.Fodder{},
-																																							Ctx: p10555,
+																																							Ctx: p10554,
 																																							FreeVars: nil,
 																																						},
 																																						Value: ":",
@@ -128471,7 +128588,7 @@ var _StdAst = &ast.DesugaredObject{
 																																							File: p1,
 																																						},
 																																						Fodder: ast.Fodder{},
-																																						Ctx: p10555,
+																																						Ctx: p10554,
 																																						FreeVars: ast.Identifiers{
 																																							"param",
 																																						},
@@ -128542,7 +128659,7 @@ var _StdAst = &ast.DesugaredObject{
 																																						File: p1,
 																																					},
 																																					Fodder: ast.Fodder{},
-																																					Ctx: p10555,
+																																					Ctx: p10554,
 																																					FreeVars: ast.Identifiers{
 																																						"aux",
 																																						"k",
@@ -128566,7 +128683,7 @@ var _StdAst = &ast.DesugaredObject{
 																																							File: p1,
 																																						},
 																																						Fodder: ast.Fodder{},
-																																						Ctx: p10555,
+																																						Ctx: p10554,
 																																						FreeVars: ast.Identifiers{
 																																							"aux",
 																																						},
@@ -128592,7 +128709,7 @@ var _StdAst = &ast.DesugaredObject{
 																																										File: p1,
 																																									},
 																																									Fodder: ast.Fodder{},
-																																									Ctx: p10585,
+																																									Ctx: p10584,
 																																									FreeVars: ast.Identifiers{
 																																										"k",
 																																										"v",
@@ -128613,7 +128730,7 @@ var _StdAst = &ast.DesugaredObject{
 																																											File: p1,
 																																										},
 																																										Fodder: ast.Fodder{},
-																																										Ctx: p10585,
+																																										Ctx: p10584,
 																																										FreeVars: ast.Identifiers{
 																																											"v",
 																																										},
@@ -128636,7 +128753,7 @@ var _StdAst = &ast.DesugaredObject{
 																																											File: p1,
 																																										},
 																																										Fodder: ast.Fodder{},
-																																										Ctx: p10585,
+																																										Ctx: p10584,
 																																										FreeVars: ast.Identifiers{
 																																											"k",
 																																										},
@@ -128664,7 +128781,7 @@ var _StdAst = &ast.DesugaredObject{
 																																										File: p1,
 																																									},
 																																									Fodder: ast.Fodder{},
-																																									Ctx: p10585,
+																																									Ctx: p10584,
 																																									FreeVars: ast.Identifiers{
 																																										"k",
 																																										"path",
@@ -128685,7 +128802,7 @@ var _StdAst = &ast.DesugaredObject{
 																																											File: p1,
 																																										},
 																																										Fodder: ast.Fodder{},
-																																										Ctx: p10585,
+																																										Ctx: p10584,
 																																										FreeVars: ast.Identifiers{
 																																											"path",
 																																										},
@@ -128709,7 +128826,7 @@ var _StdAst = &ast.DesugaredObject{
 																																											File: p1,
 																																										},
 																																										Fodder: ast.Fodder{},
-																																										Ctx: p10585,
+																																										Ctx: p10584,
 																																										FreeVars: ast.Identifiers{
 																																											"k",
 																																										},
@@ -128731,7 +128848,7 @@ var _StdAst = &ast.DesugaredObject{
 																																														File: p1,
 																																													},
 																																													Fodder: ast.Fodder{},
-																																													Ctx: p10599,
+																																													Ctx: p10598,
 																																													FreeVars: ast.Identifiers{
 																																														"k",
 																																													},
@@ -128763,7 +128880,7 @@ var _StdAst = &ast.DesugaredObject{
 																																										File: p1,
 																																									},
 																																									Fodder: ast.Fodder{},
-																																									Ctx: p10585,
+																																									Ctx: p10584,
 																																									FreeVars: ast.Identifiers{
 																																										"param",
 																																									},
@@ -128852,7 +128969,7 @@ var _StdAst = &ast.DesugaredObject{
 																																	File: p1,
 																																},
 																																Fodder: ast.Fodder{},
-																																Ctx: p10607,
+																																Ctx: p10606,
 																																FreeVars: ast.Identifiers{
 																																	"k",
 																																	"params",
@@ -128876,7 +128993,7 @@ var _StdAst = &ast.DesugaredObject{
 																																				File: p1,
 																																			},
 																																			Fodder: ast.Fodder{},
-																																			Ctx: p10611,
+																																			Ctx: p10610,
 																																			FreeVars: ast.Identifiers{
 																																				"k",
 																																				"params",
@@ -128898,7 +129015,7 @@ var _StdAst = &ast.DesugaredObject{
 																																					File: p1,
 																																				},
 																																				Fodder: ast.Fodder{},
-																																				Ctx: p10611,
+																																				Ctx: p10610,
 																																				FreeVars: ast.Identifiers{
 																																					"params",
 																																				},
@@ -128924,7 +129041,7 @@ var _StdAst = &ast.DesugaredObject{
 																																								File: p1,
 																																							},
 																																							Fodder: ast.Fodder{},
-																																							Ctx: p10617,
+																																							Ctx: p10616,
 																																							FreeVars: ast.Identifiers{
 																																								"k",
 																																								"v",
@@ -128945,7 +129062,7 @@ var _StdAst = &ast.DesugaredObject{
 																																									File: p1,
 																																								},
 																																								Fodder: ast.Fodder{},
-																																								Ctx: p10617,
+																																								Ctx: p10616,
 																																								FreeVars: ast.Identifiers{
 																																									"v",
 																																								},
@@ -128968,7 +129085,7 @@ var _StdAst = &ast.DesugaredObject{
 																																									File: p1,
 																																								},
 																																								Fodder: ast.Fodder{},
-																																								Ctx: p10617,
+																																								Ctx: p10616,
 																																								FreeVars: ast.Identifiers{
 																																									"k",
 																																								},
@@ -129023,7 +129140,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10607,
+																											Ctx: p10606,
 																											FreeVars: ast.Identifiers{
 																												"std",
 																												"v",
@@ -129044,7 +129161,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10607,
+																												Ctx: p10606,
 																												FreeVars: ast.Identifiers{
 																													"std",
 																												},
@@ -129116,7 +129233,7 @@ var _StdAst = &ast.DesugaredObject{
 																																File: p1,
 																															},
 																															Fodder: ast.Fodder{},
-																															Ctx: p10632,
+																															Ctx: p10631,
 																															FreeVars: ast.Identifiers{
 																																"v",
 																															},
@@ -129162,7 +129279,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p9898,
+																					Ctx: p9897,
 																					FreeVars: ast.Identifiers{
 																						"cindent",
 																						"lines",
@@ -129184,7 +129301,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p9898,
+																						Ctx: p9897,
 																						FreeVars: ast.Identifiers{
 																							"std",
 																						},
@@ -129263,7 +129380,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10644,
+																									Ctx: p10643,
 																									FreeVars: ast.Identifiers{
 																										"cindent",
 																									},
@@ -129283,7 +129400,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10644,
+																										Ctx: p10643,
 																										FreeVars: nil,
 																									},
 																									Value: "\n",
@@ -129307,7 +129424,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10644,
+																										Ctx: p10643,
 																										FreeVars: ast.Identifiers{
 																											"cindent",
 																										},
@@ -129333,7 +129450,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10644,
+																									Ctx: p10643,
 																									FreeVars: ast.Identifiers{
 																										"lines",
 																									},
@@ -129401,7 +129518,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p9887,
+							Ctx: p9886,
 							FreeVars: ast.Identifiers{
 								"aux",
 								"value",
@@ -129429,7 +129546,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p9887,
+								Ctx: p9886,
 								FreeVars: ast.Identifiers{
 									"aux",
 								},
@@ -129455,7 +129572,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p10659,
+											Ctx: p10658,
 											FreeVars: ast.Identifiers{
 												"value",
 											},
@@ -129480,7 +129597,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p10659,
+											Ctx: p10658,
 											FreeVars: nil,
 										},
 										Elements: nil,
@@ -129505,7 +129622,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p10659,
+											Ctx: p10658,
 											FreeVars: nil,
 										},
 										Value: "",
@@ -129571,67 +129688,65 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "value",
-							CommaFodder: ast.Fodder{},
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "value",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
 					},
-					Optional: []ast.NamedParameter{
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "indent_array_in_object",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.LiteralBoolean{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(1022),
-											Column: int(52),
-										},
-										End: ast.Location{
-											Line: int(1022),
-											Column: int(57),
-										},
-										File: p1,
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "indent_array_in_object",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.LiteralBoolean{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(1022),
+										Column: int(52),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p10669,
-									FreeVars: nil,
-								},
-								Value: false,
-							},
-							CommaFodder: ast.Fodder{},
-						},
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "c_document_end",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.LiteralBoolean{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(1022),
-											Column: int(74),
-										},
-										End: ast.Location{
-											Line: int(1022),
-											Column: int(78),
-										},
-										File: p1,
+									End: ast.Location{
+										Line: int(1022),
+										Column: int(57),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p10669,
-									FreeVars: nil,
+									File: p1,
 								},
-								Value: true,
+								Fodder: ast.Fodder{},
+								Ctx: p10667,
+								FreeVars: nil,
 							},
-							CommaFodder: ast.Fodder{},
+							Value: false,
 						},
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "c_document_end",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.LiteralBoolean{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(1022),
+										Column: int(74),
+									},
+									End: ast.Location{
+										Line: int(1022),
+										Column: int(78),
+									},
+									File: p1,
+								},
+								Fodder: ast.Fodder{},
+								Ctx: p10667,
+								FreeVars: nil,
+							},
+							Value: true,
+						},
+						CommaFodder: ast.Fodder{},
 					},
 				},
 				TrailingComma: false,
@@ -129658,7 +129773,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p10669,
+						Ctx: p10667,
 						FreeVars: ast.Identifiers{
 							"c_document_end",
 							"indent_array_in_object",
@@ -129681,7 +129796,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p10669,
+							Ctx: p10667,
 							FreeVars: ast.Identifiers{
 								"std",
 								"value",
@@ -129703,7 +129818,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p10669,
+								Ctx: p10667,
 								FreeVars: ast.Identifiers{
 									"std",
 									"value",
@@ -129724,7 +129839,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10669,
+									Ctx: p10667,
 									FreeVars: ast.Identifiers{
 										"std",
 									},
@@ -129796,7 +129911,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p10685,
+												Ctx: p10683,
 												FreeVars: ast.Identifiers{
 													"value",
 												},
@@ -129837,7 +129952,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p10669,
+							Ctx: p10667,
 							FreeVars: ast.Identifiers{
 								"std",
 								"value",
@@ -129858,7 +129973,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p10669,
+								Ctx: p10667,
 								FreeVars: ast.Identifiers{
 									"std",
 									"value",
@@ -129879,7 +129994,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10669,
+									Ctx: p10667,
 									FreeVars: nil,
 								},
 								Value: "manifestYamlStream only takes arrays, got ",
@@ -129903,7 +130018,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10669,
+									Ctx: p10667,
 									FreeVars: ast.Identifiers{
 										"std",
 										"value",
@@ -129924,7 +130039,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p10669,
+										Ctx: p10667,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -129996,7 +130111,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p10702,
+													Ctx: p10700,
 													FreeVars: ast.Identifiers{
 														"value",
 													},
@@ -130038,7 +130153,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p10669,
+							Ctx: p10667,
 							FreeVars: ast.Identifiers{
 								"c_document_end",
 								"indent_array_in_object",
@@ -130061,7 +130176,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p10669,
+								Ctx: p10667,
 								FreeVars: ast.Identifiers{
 									"indent_array_in_object",
 									"std",
@@ -130090,7 +130205,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p10669,
+									Ctx: p10667,
 									FreeVars: nil,
 								},
 								Value: "---\n",
@@ -130114,7 +130229,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10669,
+									Ctx: p10667,
 									FreeVars: ast.Identifiers{
 										"indent_array_in_object",
 										"std",
@@ -130136,7 +130251,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p10669,
+										Ctx: p10667,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -130215,7 +130330,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p10721,
+													Ctx: p10719,
 													FreeVars: nil,
 												},
 												Value: "\n---\n",
@@ -130341,15 +130456,14 @@ var _StdAst = &ast.DesugaredObject{
 																	},
 																},
 																ParenLeftFodder: nil,
-																Parameters: ast.Parameters{
-																	Required: []ast.CommaSeparatedID{
-																		ast.CommaSeparatedID{
-																			NameFodder: nil,
-																			Name: "e",
-																			CommaFodder: nil,
-																		},
+																Parameters: []ast.Parameter{
+																	ast.Parameter{
+																		NameFodder: nil,
+																		Name: "e",
+																		EqFodder: nil,
+																		DefaultArg: nil,
+																		CommaFodder: nil,
 																	},
-																	Optional: nil,
 																},
 																TrailingComma: false,
 																ParenRightFodder: nil,
@@ -130392,7 +130506,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p10737,
+																					Ctx: p10735,
 																					FreeVars: ast.Identifiers{
 																						"e",
 																						"indent_array_in_object",
@@ -130414,7 +130528,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p10737,
+																						Ctx: p10735,
 																						FreeVars: ast.Identifiers{
 																							"std",
 																						},
@@ -130486,7 +130600,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10746,
+																									Ctx: p10744,
 																									FreeVars: ast.Identifiers{
 																										"e",
 																									},
@@ -130511,7 +130625,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10746,
+																									Ctx: p10744,
 																									FreeVars: ast.Identifiers{
 																										"indent_array_in_object",
 																									},
@@ -130553,7 +130667,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p10721,
+																	Ctx: p10719,
 																	FreeVars: ast.Identifiers{
 																		"value",
 																	},
@@ -130605,7 +130719,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p10669,
+								Ctx: p10667,
 								FreeVars: ast.Identifiers{
 									"c_document_end",
 								},
@@ -130625,7 +130739,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10669,
+									Ctx: p10667,
 									FreeVars: ast.Identifiers{
 										"c_document_end",
 									},
@@ -130648,7 +130762,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10669,
+									Ctx: p10667,
 									FreeVars: nil,
 								},
 								Value: "\n...\n",
@@ -130671,7 +130785,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10669,
+									Ctx: p10667,
 									FreeVars: nil,
 								},
 								Value: "\n",
@@ -130729,15 +130843,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "v",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "v",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -130763,7 +130876,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p10765,
+						Ctx: p10763,
 						FreeVars: ast.Identifiers{
 							"std",
 							"v",
@@ -130784,7 +130897,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p10765,
+							Ctx: p10763,
 							FreeVars: ast.Identifiers{
 								"std",
 								"v",
@@ -130805,7 +130918,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p10765,
+								Ctx: p10763,
 								FreeVars: ast.Identifiers{
 									"std",
 								},
@@ -130877,7 +130990,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p10776,
+											Ctx: p10774,
 											FreeVars: ast.Identifiers{
 												"v",
 											},
@@ -130917,7 +131030,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p10765,
+							Ctx: p10763,
 							FreeVars: ast.Identifiers{
 								"std",
 								"v",
@@ -131043,15 +131156,14 @@ var _StdAst = &ast.DesugaredObject{
 														},
 													},
 													ParenLeftFodder: nil,
-													Parameters: ast.Parameters{
-														Required: []ast.CommaSeparatedID{
-															ast.CommaSeparatedID{
-																NameFodder: nil,
-																Name: "k",
-																CommaFodder: nil,
-															},
+													Parameters: []ast.Parameter{
+														ast.Parameter{
+															NameFodder: nil,
+															Name: "k",
+															EqFodder: nil,
+															DefaultArg: nil,
+															CommaFodder: nil,
 														},
-														Optional: nil,
 													},
 													TrailingComma: false,
 													ParenRightFodder: nil,
@@ -131195,7 +131307,7 @@ var _StdAst = &ast.DesugaredObject{
 																								Comment: []string{},
 																							},
 																						},
-																						Ctx: p10806,
+																						Ctx: p10804,
 																						FreeVars: nil,
 																					},
 																					Value: "%s: %s",
@@ -131220,7 +131332,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p10806,
+																						Ctx: p10804,
 																						FreeVars: ast.Identifiers{
 																							"k",
 																							"std",
@@ -131244,7 +131356,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10811,
+																									Ctx: p10809,
 																									FreeVars: ast.Identifiers{
 																										"k",
 																										"std",
@@ -131265,7 +131377,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10811,
+																										Ctx: p10809,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																										},
@@ -131337,7 +131449,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10820,
+																													Ctx: p10818,
 																													FreeVars: ast.Identifiers{
 																														"k",
 																													},
@@ -131372,7 +131484,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p10811,
+																									Ctx: p10809,
 																									FreeVars: ast.Identifiers{
 																										"k",
 																										"std",
@@ -131394,7 +131506,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p10811,
+																										Ctx: p10809,
 																										FreeVars: ast.Identifiers{
 																											"std",
 																										},
@@ -131466,7 +131578,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p10831,
+																													Ctx: p10829,
 																													FreeVars: ast.Identifiers{
 																														"k",
 																														"v",
@@ -131487,7 +131599,7 @@ var _StdAst = &ast.DesugaredObject{
 																															File: p1,
 																														},
 																														Fodder: ast.Fodder{},
-																														Ctx: p10831,
+																														Ctx: p10829,
 																														FreeVars: ast.Identifiers{
 																															"v",
 																														},
@@ -131510,7 +131622,7 @@ var _StdAst = &ast.DesugaredObject{
 																															File: p1,
 																														},
 																														Fodder: ast.Fodder{},
-																														Ctx: p10831,
+																														Ctx: p10829,
 																														FreeVars: ast.Identifiers{
 																															"k",
 																														},
@@ -131571,7 +131683,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p10838,
+														Ctx: p10836,
 														FreeVars: ast.Identifiers{
 															"std",
 															"v",
@@ -131592,7 +131704,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p10838,
+															Ctx: p10836,
 															FreeVars: ast.Identifiers{
 																"std",
 															},
@@ -131664,7 +131776,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p10847,
+																		Ctx: p10845,
 																		FreeVars: ast.Identifiers{
 																			"v",
 																		},
@@ -131810,7 +131922,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p10765,
+												Ctx: p10763,
 												FreeVars: nil,
 											},
 											Value: "{%s}",
@@ -131835,7 +131947,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p10765,
+												Ctx: p10763,
 												FreeVars: ast.Identifiers{
 													"fields",
 													"std",
@@ -131858,7 +131970,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p10863,
+															Ctx: p10861,
 															FreeVars: ast.Identifiers{
 																"fields",
 																"std",
@@ -131879,7 +131991,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p10863,
+																Ctx: p10861,
 																FreeVars: ast.Identifiers{
 																	"std",
 																},
@@ -131951,7 +132063,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p10872,
+																			Ctx: p10870,
 																			FreeVars: nil,
 																		},
 																		Value: ", ",
@@ -131976,7 +132088,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p10872,
+																			Ctx: p10870,
 																			FreeVars: ast.Identifiers{
 																				"fields",
 																			},
@@ -132033,7 +132145,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p10765,
+							Ctx: p10763,
 							FreeVars: ast.Identifiers{
 								"std",
 								"v",
@@ -132054,7 +132166,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p10765,
+								Ctx: p10763,
 								FreeVars: ast.Identifiers{
 									"std",
 									"v",
@@ -132075,7 +132187,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10765,
+									Ctx: p10763,
 									FreeVars: ast.Identifiers{
 										"std",
 									},
@@ -132147,7 +132259,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p10887,
+												Ctx: p10885,
 												FreeVars: ast.Identifiers{
 													"v",
 												},
@@ -132280,7 +132392,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p10765,
+												Ctx: p10763,
 												FreeVars: nil,
 											},
 											Value: "[%s]",
@@ -132305,7 +132417,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p10765,
+												Ctx: p10763,
 												FreeVars: ast.Identifiers{
 													"std",
 													"v",
@@ -132328,7 +132440,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p10903,
+															Ctx: p10901,
 															FreeVars: ast.Identifiers{
 																"std",
 																"v",
@@ -132349,7 +132461,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p10903,
+																Ctx: p10901,
 																FreeVars: ast.Identifiers{
 																	"std",
 																},
@@ -132421,7 +132533,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p10912,
+																			Ctx: p10910,
 																			FreeVars: nil,
 																		},
 																		Value: ", ",
@@ -132545,15 +132657,14 @@ var _StdAst = &ast.DesugaredObject{
 																							},
 																						},
 																						ParenLeftFodder: nil,
-																						Parameters: ast.Parameters{
-																							Required: []ast.CommaSeparatedID{
-																								ast.CommaSeparatedID{
-																									NameFodder: nil,
-																									Name: "v2",
-																									CommaFodder: nil,
-																								},
+																						Parameters: []ast.Parameter{
+																							ast.Parameter{
+																								NameFodder: nil,
+																								Name: "v2",
+																								EqFodder: nil,
+																								DefaultArg: nil,
+																								CommaFodder: nil,
 																							},
-																							Optional: nil,
 																						},
 																						TrailingComma: false,
 																						ParenRightFodder: nil,
@@ -132595,7 +132706,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p10928,
+																											Ctx: p10926,
 																											FreeVars: ast.Identifiers{
 																												"std",
 																												"v2",
@@ -132616,7 +132727,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p10928,
+																												Ctx: p10926,
 																												FreeVars: ast.Identifiers{
 																													"std",
 																												},
@@ -132688,7 +132799,7 @@ var _StdAst = &ast.DesugaredObject{
 																																File: p1,
 																															},
 																															Fodder: ast.Fodder{},
-																															Ctx: p10937,
+																															Ctx: p10935,
 																															FreeVars: ast.Identifiers{
 																																"v2",
 																															},
@@ -132730,7 +132841,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p10912,
+																							Ctx: p10910,
 																							FreeVars: ast.Identifiers{
 																								"v",
 																							},
@@ -132796,7 +132907,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p10765,
+								Ctx: p10763,
 								FreeVars: ast.Identifiers{
 									"std",
 									"v",
@@ -132817,7 +132928,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10765,
+									Ctx: p10763,
 									FreeVars: ast.Identifiers{
 										"std",
 										"v",
@@ -132838,7 +132949,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p10765,
+										Ctx: p10763,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -132910,7 +133021,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p10953,
+													Ctx: p10951,
 													FreeVars: ast.Identifiers{
 														"v",
 													},
@@ -133043,7 +133154,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p10765,
+													Ctx: p10763,
 													FreeVars: nil,
 												},
 												Value: "%s",
@@ -133068,7 +133179,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p10765,
+													Ctx: p10763,
 													FreeVars: ast.Identifiers{
 														"std",
 														"v",
@@ -133091,7 +133202,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p10969,
+																Ctx: p10967,
 																FreeVars: ast.Identifiers{
 																	"std",
 																	"v",
@@ -133112,7 +133223,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p10969,
+																	Ctx: p10967,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																	},
@@ -133184,7 +133295,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p10978,
+																				Ctx: p10976,
 																				FreeVars: ast.Identifiers{
 																					"v",
 																				},
@@ -133240,7 +133351,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p10765,
+									Ctx: p10763,
 									FreeVars: ast.Identifiers{
 										"std",
 										"v",
@@ -133261,7 +133372,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p10765,
+										Ctx: p10763,
 										FreeVars: ast.Identifiers{
 											"std",
 											"v",
@@ -133282,7 +133393,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p10765,
+											Ctx: p10763,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -133354,7 +133465,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p10992,
+														Ctx: p10990,
 														FreeVars: ast.Identifiers{
 															"v",
 														},
@@ -133394,7 +133505,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p10765,
+										Ctx: p10763,
 										FreeVars: nil,
 									},
 									Expr: &ast.LiteralString{
@@ -133412,7 +133523,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p10765,
+											Ctx: p10763,
 											FreeVars: nil,
 										},
 										Value: "cannot manifest function",
@@ -133443,7 +133554,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p10765,
+										Ctx: p10763,
 										FreeVars: ast.Identifiers{
 											"std",
 											"v",
@@ -133464,7 +133575,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p10765,
+											Ctx: p10763,
 											FreeVars: ast.Identifiers{
 												"std",
 												"v",
@@ -133485,7 +133596,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p10765,
+												Ctx: p10763,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -133557,7 +133668,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11009,
+															Ctx: p11007,
 															FreeVars: ast.Identifiers{
 																"v",
 															},
@@ -133590,7 +133701,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p10765,
+											Ctx: p10763,
 											FreeVars: ast.Identifiers{
 												"std",
 												"v",
@@ -133611,7 +133722,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p10765,
+												Ctx: p10763,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -133690,7 +133801,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11021,
+															Ctx: p11019,
 															FreeVars: ast.Identifiers{
 																"v",
 															},
@@ -133730,7 +133841,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p10765,
+											Ctx: p10763,
 											FreeVars: ast.Identifiers{
 												"v",
 											},
@@ -133750,7 +133861,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p10765,
+												Ctx: p10763,
 												FreeVars: ast.Identifiers{
 													"v",
 												},
@@ -133770,7 +133881,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p10765,
+													Ctx: p10763,
 													FreeVars: ast.Identifiers{
 														"v",
 													},
@@ -133794,7 +133905,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p10765,
+													Ctx: p10763,
 													FreeVars: nil,
 												},
 												Value: true,
@@ -133823,7 +133934,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p10765,
+												Ctx: p10763,
 												FreeVars: nil,
 											},
 											Value: "True",
@@ -133853,7 +133964,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p10765,
+												Ctx: p10763,
 												FreeVars: ast.Identifiers{
 													"v",
 												},
@@ -133873,7 +133984,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p10765,
+													Ctx: p10763,
 													FreeVars: ast.Identifiers{
 														"v",
 													},
@@ -133893,7 +134004,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p10765,
+														Ctx: p10763,
 														FreeVars: ast.Identifiers{
 															"v",
 														},
@@ -133917,7 +134028,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p10765,
+														Ctx: p10763,
 														FreeVars: nil,
 													},
 													Value: false,
@@ -133946,7 +134057,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p10765,
+													Ctx: p10763,
 													FreeVars: nil,
 												},
 												Value: "False",
@@ -133976,7 +134087,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p10765,
+													Ctx: p10763,
 													FreeVars: ast.Identifiers{
 														"v",
 													},
@@ -133996,7 +134107,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p10765,
+														Ctx: p10763,
 														FreeVars: ast.Identifiers{
 															"v",
 														},
@@ -134016,7 +134127,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p10765,
+															Ctx: p10763,
 															FreeVars: ast.Identifiers{
 																"v",
 															},
@@ -134040,7 +134151,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p10765,
+															Ctx: p10763,
 															FreeVars: nil,
 														},
 													},
@@ -134068,7 +134179,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p10765,
+														Ctx: p10763,
 														FreeVars: nil,
 													},
 													Value: "None",
@@ -134151,15 +134262,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "conf",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "conf",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -134185,7 +134295,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p11060,
+						Ctx: p11058,
 						FreeVars: ast.Identifiers{
 							"conf",
 							"std",
@@ -134311,15 +134421,14 @@ var _StdAst = &ast.DesugaredObject{
 													},
 												},
 												ParenLeftFodder: nil,
-												Parameters: ast.Parameters{
-													Required: []ast.CommaSeparatedID{
-														ast.CommaSeparatedID{
-															NameFodder: nil,
-															Name: "k",
-															CommaFodder: nil,
-														},
+												Parameters: []ast.Parameter{
+													ast.Parameter{
+														NameFodder: nil,
+														Name: "k",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: nil,
 													},
-													Optional: nil,
 												},
 												TrailingComma: false,
 												ParenRightFodder: nil,
@@ -134456,7 +134565,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11086,
+																					Ctx: p11084,
 																					FreeVars: nil,
 																				},
 																				Value: "%s = %s",
@@ -134481,7 +134590,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11086,
+																					Ctx: p11084,
 																					FreeVars: ast.Identifiers{
 																						"conf",
 																						"k",
@@ -134505,7 +134614,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11091,
+																								Ctx: p11089,
 																								FreeVars: ast.Identifiers{
 																									"k",
 																								},
@@ -134530,7 +134639,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11091,
+																								Ctx: p11089,
 																								FreeVars: ast.Identifiers{
 																									"conf",
 																									"k",
@@ -134552,7 +134661,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11091,
+																									Ctx: p11089,
 																									FreeVars: ast.Identifiers{
 																										"std",
 																									},
@@ -134624,7 +134733,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p11102,
+																												Ctx: p11100,
 																												FreeVars: ast.Identifiers{
 																													"conf",
 																													"k",
@@ -134645,7 +134754,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p11102,
+																													Ctx: p11100,
 																													FreeVars: ast.Identifiers{
 																														"conf",
 																													},
@@ -134668,7 +134777,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p11102,
+																													Ctx: p11100,
 																													FreeVars: ast.Identifiers{
 																														"k",
 																													},
@@ -134729,7 +134838,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11109,
+													Ctx: p11107,
 													FreeVars: ast.Identifiers{
 														"conf",
 														"std",
@@ -134750,7 +134859,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11109,
+														Ctx: p11107,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -134822,7 +134931,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11118,
+																	Ctx: p11116,
 																	FreeVars: ast.Identifiers{
 																		"conf",
 																	},
@@ -134868,7 +134977,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p11060,
+							Ctx: p11058,
 							FreeVars: ast.Identifiers{
 								"std",
 								"vars",
@@ -134889,7 +134998,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p11060,
+								Ctx: p11058,
 								FreeVars: ast.Identifiers{
 									"std",
 								},
@@ -134968,7 +135077,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p11130,
+											Ctx: p11128,
 											FreeVars: nil,
 										},
 										Value: "\n",
@@ -134993,7 +135102,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p11130,
+											Ctx: p11128,
 											FreeVars: ast.Identifiers{
 												"vars",
 											},
@@ -135013,7 +135122,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11130,
+												Ctx: p11128,
 												FreeVars: ast.Identifiers{
 													"vars",
 												},
@@ -135037,7 +135146,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11130,
+												Ctx: p11128,
 												FreeVars: nil,
 											},
 											Elements: []ast.CommaSeparatedExpr{
@@ -135057,7 +135166,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11138,
+															Ctx: p11136,
 															FreeVars: nil,
 														},
 														Value: "",
@@ -135130,15 +135239,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "value",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "value",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -135164,7 +135272,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p11145,
+						Ctx: p11143,
 						FreeVars: ast.Identifiers{
 							"std",
 							"value",
@@ -135185,7 +135293,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p11145,
+							Ctx: p11143,
 							FreeVars: ast.Identifiers{
 								"std",
 								"value",
@@ -135207,7 +135315,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p11145,
+								Ctx: p11143,
 								FreeVars: ast.Identifiers{
 									"std",
 									"value",
@@ -135228,7 +135336,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p11145,
+									Ctx: p11143,
 									FreeVars: ast.Identifiers{
 										"std",
 									},
@@ -135300,7 +135408,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11158,
+												Ctx: p11156,
 												FreeVars: ast.Identifiers{
 													"value",
 												},
@@ -135341,7 +135449,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p11145,
+							Ctx: p11143,
 							FreeVars: ast.Identifiers{
 								"std",
 								"value",
@@ -135455,7 +135563,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11145,
+												Ctx: p11143,
 												FreeVars: nil,
 											},
 											Value: "Expected a JSONML value (an array), got %s",
@@ -135480,7 +135588,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11145,
+												Ctx: p11143,
 												FreeVars: ast.Identifiers{
 													"std",
 													"value",
@@ -135501,7 +135609,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11145,
+													Ctx: p11143,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -135573,7 +135681,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11181,
+																Ctx: p11179,
 																FreeVars: ast.Identifiers{
 																	"value",
 																},
@@ -135631,7 +135739,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p11145,
+							Ctx: p11143,
 							FreeVars: ast.Identifiers{
 								"std",
 								"value",
@@ -135657,22 +135765,21 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: nil,
-										Ctx: p11189,
+										Ctx: p11187,
 										FreeVars: ast.Identifiers{
 											"aux",
 											"std",
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "v",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "v",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -135698,7 +135805,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p11194,
+											Ctx: p11192,
 											FreeVars: ast.Identifiers{
 												"aux",
 												"std",
@@ -135720,7 +135827,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11194,
+												Ctx: p11192,
 												FreeVars: ast.Identifiers{
 													"std",
 													"v",
@@ -135741,7 +135848,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11194,
+													Ctx: p11192,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -135813,7 +135920,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11205,
+																Ctx: p11203,
 																FreeVars: ast.Identifiers{
 																	"v",
 																},
@@ -135853,7 +135960,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p11194,
+												Ctx: p11192,
 												FreeVars: ast.Identifiers{
 													"v",
 												},
@@ -135890,7 +135997,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p11194,
+												Ctx: p11192,
 												FreeVars: ast.Identifiers{
 													"aux",
 													"std",
@@ -135917,7 +136024,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11216,
+															Ctx: p11214,
 															FreeVars: ast.Identifiers{
 																"v",
 															},
@@ -135937,7 +136044,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11216,
+																Ctx: p11214,
 																FreeVars: ast.Identifiers{
 																	"v",
 																},
@@ -135960,7 +136067,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11216,
+																Ctx: p11214,
 																FreeVars: nil,
 															},
 															OriginalString: "0",
@@ -135994,7 +136101,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p11194,
+													Ctx: p11192,
 													FreeVars: ast.Identifiers{
 														"aux",
 														"std",
@@ -136022,7 +136129,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11226,
+																Ctx: p11224,
 																FreeVars: ast.Identifiers{
 																	"std",
 																	"v",
@@ -136043,7 +136150,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11226,
+																	Ctx: p11224,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																		"v",
@@ -136064,7 +136171,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11226,
+																		Ctx: p11224,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																			"v",
@@ -136085,7 +136192,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11226,
+																			Ctx: p11224,
 																			FreeVars: ast.Identifiers{
 																				"std",
 																			},
@@ -136157,7 +136264,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11239,
+																						Ctx: p11237,
 																						FreeVars: ast.Identifiers{
 																							"v",
 																						},
@@ -136191,7 +136298,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11226,
+																		Ctx: p11224,
 																		FreeVars: nil,
 																	},
 																	OriginalString: "1",
@@ -136214,7 +136321,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11226,
+																	Ctx: p11224,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																		"v",
@@ -136235,7 +136342,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11226,
+																		Ctx: p11224,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -136307,7 +136414,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11251,
+																					Ctx: p11249,
 																					FreeVars: ast.Identifiers{
 																						"v",
 																					},
@@ -136327,7 +136434,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11251,
+																						Ctx: p11249,
 																						FreeVars: ast.Identifiers{
 																							"v",
 																						},
@@ -136350,7 +136457,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11251,
+																						Ctx: p11249,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "1",
@@ -136395,7 +136502,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p11194,
+														Ctx: p11192,
 														FreeVars: ast.Identifiers{
 															"aux",
 															"has_attrs",
@@ -136424,7 +136531,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11261,
+																	Ctx: p11259,
 																	FreeVars: ast.Identifiers{
 																		"has_attrs",
 																		"v",
@@ -136445,7 +136552,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11261,
+																		Ctx: p11259,
 																		FreeVars: ast.Identifiers{
 																			"has_attrs",
 																		},
@@ -136468,7 +136575,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11261,
+																		Ctx: p11259,
 																		FreeVars: ast.Identifiers{
 																			"v",
 																		},
@@ -136488,7 +136595,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11261,
+																			Ctx: p11259,
 																			FreeVars: ast.Identifiers{
 																				"v",
 																			},
@@ -136511,7 +136618,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11261,
+																			Ctx: p11259,
 																			FreeVars: nil,
 																		},
 																		OriginalString: "1",
@@ -136535,7 +136642,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11261,
+																		Ctx: p11259,
 																		FreeVars: nil,
 																	},
 																	Asserts: ast.Nodes{},
@@ -136569,7 +136676,7 @@ var _StdAst = &ast.DesugaredObject{
 																	Comment: []string{},
 																},
 															},
-															Ctx: p11194,
+															Ctx: p11192,
 															FreeVars: ast.Identifiers{
 																"attrs",
 																"aux",
@@ -136599,7 +136706,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11276,
+																		Ctx: p11274,
 																		FreeVars: ast.Identifiers{
 																			"has_attrs",
 																			"std",
@@ -136621,7 +136728,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11276,
+																			Ctx: p11274,
 																			FreeVars: ast.Identifiers{
 																				"has_attrs",
 																			},
@@ -136737,7 +136844,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11276,
+																							Ctx: p11274,
 																							FreeVars: ast.Identifiers{
 																								"v",
 																							},
@@ -136762,7 +136869,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11276,
+																							Ctx: p11274,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "2",
@@ -136930,7 +137037,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11276,
+																							Ctx: p11274,
 																							FreeVars: ast.Identifiers{
 																								"v",
 																							},
@@ -136955,7 +137062,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11276,
+																							Ctx: p11274,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "1",
@@ -137041,7 +137148,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p11194,
+																Ctx: p11192,
 																FreeVars: ast.Identifiers{
 																	"attrs",
 																	"aux",
@@ -137070,7 +137177,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11311,
+																			Ctx: p11309,
 																			FreeVars: ast.Identifiers{
 																				"attrs",
 																				"std",
@@ -137091,7 +137198,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11311,
+																				Ctx: p11309,
 																				FreeVars: ast.Identifiers{
 																					"std",
 																				},
@@ -137170,7 +137277,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11321,
+																							Ctx: p11319,
 																							FreeVars: nil,
 																						},
 																						Value: "",
@@ -137295,15 +137402,14 @@ var _StdAst = &ast.DesugaredObject{
 																											},
 																										},
 																										ParenLeftFodder: nil,
-																										Parameters: ast.Parameters{
-																											Required: []ast.CommaSeparatedID{
-																												ast.CommaSeparatedID{
-																													NameFodder: nil,
-																													Name: "k",
-																													CommaFodder: nil,
-																												},
+																										Parameters: []ast.Parameter{
+																											ast.Parameter{
+																												NameFodder: nil,
+																												Name: "k",
+																												EqFodder: nil,
+																												DefaultArg: nil,
+																												CommaFodder: nil,
 																											},
-																											Optional: nil,
 																										},
 																										TrailingComma: false,
 																										ParenRightFodder: nil,
@@ -137440,7 +137546,7 @@ var _StdAst = &ast.DesugaredObject{
 																																				File: p1,
 																																			},
 																																			Fodder: ast.Fodder{},
-																																			Ctx: p11345,
+																																			Ctx: p11343,
 																																			FreeVars: nil,
 																																		},
 																																		Value: " %s=\"%s\"",
@@ -137465,7 +137571,7 @@ var _StdAst = &ast.DesugaredObject{
 																																				File: p1,
 																																			},
 																																			Fodder: ast.Fodder{},
-																																			Ctx: p11345,
+																																			Ctx: p11343,
 																																			FreeVars: ast.Identifiers{
 																																				"attrs",
 																																				"k",
@@ -137488,7 +137594,7 @@ var _StdAst = &ast.DesugaredObject{
 																																							File: p1,
 																																						},
 																																						Fodder: ast.Fodder{},
-																																						Ctx: p11350,
+																																						Ctx: p11348,
 																																						FreeVars: ast.Identifiers{
 																																							"k",
 																																						},
@@ -137513,7 +137619,7 @@ var _StdAst = &ast.DesugaredObject{
 																																							File: p1,
 																																						},
 																																						Fodder: ast.Fodder{},
-																																						Ctx: p11350,
+																																						Ctx: p11348,
 																																						FreeVars: ast.Identifiers{
 																																							"attrs",
 																																							"k",
@@ -137534,7 +137640,7 @@ var _StdAst = &ast.DesugaredObject{
 																																								File: p1,
 																																							},
 																																							Fodder: ast.Fodder{},
-																																							Ctx: p11350,
+																																							Ctx: p11348,
 																																							FreeVars: ast.Identifiers{
 																																								"attrs",
 																																							},
@@ -137557,7 +137663,7 @@ var _StdAst = &ast.DesugaredObject{
 																																								File: p1,
 																																							},
 																																							Fodder: ast.Fodder{},
-																																							Ctx: p11350,
+																																							Ctx: p11348,
 																																							FreeVars: ast.Identifiers{
 																																								"k",
 																																							},
@@ -137608,7 +137714,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p11321,
+																											Ctx: p11319,
 																											FreeVars: ast.Identifiers{
 																												"attrs",
 																												"std",
@@ -137629,7 +137735,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p11321,
+																												Ctx: p11319,
 																												FreeVars: ast.Identifiers{
 																													"std",
 																												},
@@ -137701,7 +137807,7 @@ var _StdAst = &ast.DesugaredObject{
 																																File: p1,
 																															},
 																															Fodder: ast.Fodder{},
-																															Ctx: p11367,
+																															Ctx: p11365,
 																															FreeVars: ast.Identifiers{
 																																"attrs",
 																															},
@@ -137757,7 +137863,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11194,
+																	Ctx: p11192,
 																	FreeVars: ast.Identifiers{
 																		"attrs_str",
 																		"aux",
@@ -137781,7 +137887,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11194,
+																		Ctx: p11192,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -137860,7 +137966,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11379,
+																					Ctx: p11377,
 																					FreeVars: ast.Identifiers{
 																						"attrs_str",
 																						"aux",
@@ -137886,7 +137992,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11383,
+																								Ctx: p11381,
 																								FreeVars: nil,
 																							},
 																							Value: "<",
@@ -137911,7 +138017,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11383,
+																								Ctx: p11381,
 																								FreeVars: ast.Identifiers{
 																									"tag",
 																								},
@@ -137936,7 +138042,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11383,
+																								Ctx: p11381,
 																								FreeVars: ast.Identifiers{
 																									"attrs_str",
 																								},
@@ -137961,7 +138067,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11383,
+																								Ctx: p11381,
 																								FreeVars: nil,
 																							},
 																							Value: ">",
@@ -138086,15 +138192,14 @@ var _StdAst = &ast.DesugaredObject{
 																												},
 																											},
 																											ParenLeftFodder: nil,
-																											Parameters: ast.Parameters{
-																												Required: []ast.CommaSeparatedID{
-																													ast.CommaSeparatedID{
-																														NameFodder: nil,
-																														Name: "x",
-																														CommaFodder: nil,
-																													},
+																											Parameters: []ast.Parameter{
+																												ast.Parameter{
+																													NameFodder: nil,
+																													Name: "x",
+																													EqFodder: nil,
+																													DefaultArg: nil,
+																													CommaFodder: nil,
 																												},
-																												Optional: nil,
 																											},
 																											TrailingComma: false,
 																											ParenRightFodder: nil,
@@ -138136,7 +138241,7 @@ var _StdAst = &ast.DesugaredObject{
 																																	File: p1,
 																																},
 																																Fodder: ast.Fodder{},
-																																Ctx: p11404,
+																																Ctx: p11402,
 																																FreeVars: ast.Identifiers{
 																																	"aux",
 																																	"x",
@@ -138157,7 +138262,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p11404,
+																																	Ctx: p11402,
 																																	FreeVars: ast.Identifiers{
 																																		"aux",
 																																	},
@@ -138183,7 +138288,7 @@ var _StdAst = &ast.DesugaredObject{
 																																					File: p1,
 																																				},
 																																				Fodder: ast.Fodder{},
-																																				Ctx: p11410,
+																																				Ctx: p11408,
 																																				FreeVars: ast.Identifiers{
 																																					"x",
 																																				},
@@ -138225,7 +138330,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p11383,
+																												Ctx: p11381,
 																												FreeVars: ast.Identifiers{
 																													"children",
 																												},
@@ -138260,7 +138365,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11383,
+																								Ctx: p11381,
 																								FreeVars: nil,
 																							},
 																							Value: "</",
@@ -138285,7 +138390,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11383,
+																								Ctx: p11381,
 																								FreeVars: ast.Identifiers{
 																									"tag",
 																								},
@@ -138310,7 +138415,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11383,
+																								Ctx: p11381,
 																								FreeVars: nil,
 																							},
 																							Value: ">",
@@ -138359,7 +138464,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p11145,
+								Ctx: p11143,
 								FreeVars: ast.Identifiers{
 									"aux",
 									"value",
@@ -138387,7 +138492,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p11145,
+									Ctx: p11143,
 									FreeVars: ast.Identifiers{
 										"aux",
 									},
@@ -138413,7 +138518,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11425,
+												Ctx: p11423,
 												FreeVars: ast.Identifiers{
 													"value",
 												},
@@ -138481,15 +138586,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "input",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "input",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -138515,7 +138619,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p11433,
+						Ctx: p11431,
 						FreeVars: ast.Identifiers{
 							"base64_table",
 							"input",
@@ -138549,7 +138653,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p11438,
+									Ctx: p11436,
 									FreeVars: ast.Identifiers{
 										"input",
 										"std",
@@ -138570,7 +138674,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p11438,
+										Ctx: p11436,
 										FreeVars: ast.Identifiers{
 											"input",
 											"std",
@@ -138591,7 +138695,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p11438,
+											Ctx: p11436,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -138663,7 +138767,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11449,
+														Ctx: p11447,
 														FreeVars: ast.Identifiers{
 															"input",
 														},
@@ -138696,7 +138800,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p11438,
+										Ctx: p11436,
 										FreeVars: ast.Identifiers{
 											"input",
 											"std",
@@ -138717,7 +138821,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p11438,
+											Ctx: p11436,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -138796,21 +138900,20 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11461,
+														Ctx: p11459,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
 													},
 													ParenLeftFodder: ast.Fodder{},
-													Parameters: ast.Parameters{
-														Required: []ast.CommaSeparatedID{
-															ast.CommaSeparatedID{
-																NameFodder: ast.Fodder{},
-																Name: "c",
-																CommaFodder: nil,
-															},
+													Parameters: []ast.Parameter{
+														ast.Parameter{
+															NameFodder: ast.Fodder{},
+															Name: "c",
+															EqFodder: nil,
+															DefaultArg: nil,
+															CommaFodder: nil,
 														},
-														Optional: nil,
 													},
 													TrailingComma: false,
 													ParenRightFodder: ast.Fodder{},
@@ -138829,7 +138932,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11465,
+															Ctx: p11463,
 															FreeVars: ast.Identifiers{
 																"c",
 																"std",
@@ -138850,7 +138953,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11465,
+																Ctx: p11463,
 																FreeVars: ast.Identifiers{
 																	"std",
 																},
@@ -138922,7 +139025,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11474,
+																			Ctx: p11472,
 																			FreeVars: ast.Identifiers{
 																				"c",
 																			},
@@ -138958,7 +139061,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11461,
+														Ctx: p11459,
 														FreeVars: ast.Identifiers{
 															"input",
 														},
@@ -139005,7 +139108,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p11438,
+										Ctx: p11436,
 										FreeVars: ast.Identifiers{
 											"input",
 										},
@@ -139039,7 +139142,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p11433,
+							Ctx: p11431,
 							FreeVars: ast.Identifiers{
 								"base64_table",
 								"bytes",
@@ -139066,7 +139169,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: nil,
-										Ctx: p11487,
+										Ctx: p11485,
 										FreeVars: ast.Identifiers{
 											"aux",
 											"base64_table",
@@ -139074,25 +139177,28 @@ var _StdAst = &ast.DesugaredObject{
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "arr",
-												CommaFodder: ast.Fodder{},
-											},
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "i",
-												CommaFodder: ast.Fodder{},
-											},
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "r",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "arr",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: ast.Fodder{},
+										},
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "i",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: ast.Fodder{},
+										},
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "r",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -139118,7 +139224,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p11492,
+											Ctx: p11490,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"aux",
@@ -139143,7 +139249,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11492,
+												Ctx: p11490,
 												FreeVars: ast.Identifiers{
 													"arr",
 													"i",
@@ -139165,7 +139271,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11492,
+													Ctx: p11490,
 													FreeVars: ast.Identifiers{
 														"i",
 													},
@@ -139189,7 +139295,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11492,
+													Ctx: p11490,
 													FreeVars: ast.Identifiers{
 														"arr",
 														"std",
@@ -139210,7 +139316,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11492,
+														Ctx: p11490,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -139282,7 +139388,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11507,
+																	Ctx: p11505,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																	},
@@ -139323,7 +139429,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p11492,
+												Ctx: p11490,
 												FreeVars: ast.Identifiers{
 													"r",
 												},
@@ -139353,7 +139459,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11492,
+												Ctx: p11490,
 												FreeVars: ast.Identifiers{
 													"arr",
 													"aux",
@@ -139378,7 +139484,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11492,
+													Ctx: p11490,
 													FreeVars: ast.Identifiers{
 														"arr",
 														"i",
@@ -139400,7 +139506,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11492,
+														Ctx: p11490,
 														FreeVars: ast.Identifiers{
 															"i",
 														},
@@ -139420,7 +139526,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11492,
+															Ctx: p11490,
 															FreeVars: ast.Identifiers{
 																"i",
 															},
@@ -139444,7 +139550,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11492,
+															Ctx: p11490,
 															FreeVars: nil,
 														},
 														OriginalString: "1",
@@ -139467,7 +139573,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11492,
+														Ctx: p11490,
 														FreeVars: ast.Identifiers{
 															"arr",
 															"std",
@@ -139488,7 +139594,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11492,
+															Ctx: p11490,
 															FreeVars: ast.Identifiers{
 																"std",
 															},
@@ -139560,7 +139666,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11531,
+																		Ctx: p11529,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																		},
@@ -139601,7 +139707,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p11492,
+													Ctx: p11490,
 													FreeVars: ast.Identifiers{
 														"arr",
 														"aux",
@@ -139630,7 +139736,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11538,
+																Ctx: p11536,
 																FreeVars: ast.Identifiers{
 																	"arr",
 																	"base64_table",
@@ -139652,7 +139758,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11538,
+																	Ctx: p11536,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																		"base64_table",
@@ -139674,7 +139780,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11538,
+																		Ctx: p11536,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																			"base64_table",
@@ -139711,7 +139817,7 @@ var _StdAst = &ast.DesugaredObject{
 																					},
 																				},
 																			},
-																			Ctx: p11538,
+																			Ctx: p11536,
 																			FreeVars: ast.Identifiers{
 																				"base64_table",
 																			},
@@ -139734,7 +139840,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11538,
+																			Ctx: p11536,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																				"i",
@@ -139755,7 +139861,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11538,
+																				Ctx: p11536,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"i",
@@ -139776,7 +139882,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11538,
+																					Ctx: p11536,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"i",
@@ -139797,7 +139903,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11538,
+																						Ctx: p11536,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																						},
@@ -139820,7 +139926,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11538,
+																						Ctx: p11536,
 																						FreeVars: ast.Identifiers{
 																							"i",
 																						},
@@ -139847,7 +139953,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11538,
+																					Ctx: p11536,
 																					FreeVars: nil,
 																				},
 																				OriginalString: "252",
@@ -139870,7 +139976,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11538,
+																				Ctx: p11536,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "2",
@@ -139896,7 +140002,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11538,
+																		Ctx: p11536,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																			"base64_table",
@@ -139933,7 +140039,7 @@ var _StdAst = &ast.DesugaredObject{
 																					},
 																				},
 																			},
-																			Ctx: p11538,
+																			Ctx: p11536,
 																			FreeVars: ast.Identifiers{
 																				"base64_table",
 																			},
@@ -139956,7 +140062,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11538,
+																			Ctx: p11536,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																				"i",
@@ -139977,7 +140083,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11538,
+																				Ctx: p11536,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"i",
@@ -139998,7 +140104,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11538,
+																					Ctx: p11536,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"i",
@@ -140019,7 +140125,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11538,
+																						Ctx: p11536,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																						},
@@ -140042,7 +140148,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11538,
+																						Ctx: p11536,
 																						FreeVars: ast.Identifiers{
 																							"i",
 																						},
@@ -140069,7 +140175,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11538,
+																					Ctx: p11536,
 																					FreeVars: nil,
 																				},
 																				OriginalString: "3",
@@ -140092,7 +140198,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11538,
+																				Ctx: p11536,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "4",
@@ -140126,7 +140232,7 @@ var _StdAst = &ast.DesugaredObject{
 																			Comment: []string{},
 																		},
 																	},
-																	Ctx: p11538,
+																	Ctx: p11536,
 																	FreeVars: nil,
 																},
 																Value: "==",
@@ -140153,7 +140259,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11492,
+														Ctx: p11490,
 														FreeVars: ast.Identifiers{
 															"arr",
 															"aux",
@@ -140184,7 +140290,7 @@ var _StdAst = &ast.DesugaredObject{
 																	Comment: []string{},
 																},
 															},
-															Ctx: p11492,
+															Ctx: p11490,
 															FreeVars: ast.Identifiers{
 																"aux",
 															},
@@ -140210,7 +140316,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11587,
+																		Ctx: p11585,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																		},
@@ -140235,7 +140341,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11587,
+																		Ctx: p11585,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																		},
@@ -140255,7 +140361,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11587,
+																			Ctx: p11585,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																			},
@@ -140279,7 +140385,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11587,
+																			Ctx: p11585,
 																			FreeVars: nil,
 																		},
 																		OriginalString: "3",
@@ -140303,7 +140409,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11587,
+																		Ctx: p11585,
 																		FreeVars: ast.Identifiers{
 																			"r",
 																			"str",
@@ -140324,7 +140430,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11587,
+																			Ctx: p11585,
 																			FreeVars: ast.Identifiers{
 																				"r",
 																			},
@@ -140348,7 +140454,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11587,
+																			Ctx: p11585,
 																			FreeVars: ast.Identifiers{
 																				"str",
 																			},
@@ -140390,7 +140496,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11492,
+													Ctx: p11490,
 													FreeVars: ast.Identifiers{
 														"arr",
 														"aux",
@@ -140415,7 +140521,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11492,
+														Ctx: p11490,
 														FreeVars: ast.Identifiers{
 															"arr",
 															"i",
@@ -140437,7 +140543,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11492,
+															Ctx: p11490,
 															FreeVars: ast.Identifiers{
 																"i",
 															},
@@ -140457,7 +140563,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11492,
+																Ctx: p11490,
 																FreeVars: ast.Identifiers{
 																	"i",
 																},
@@ -140481,7 +140587,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11492,
+																Ctx: p11490,
 																FreeVars: nil,
 															},
 															OriginalString: "2",
@@ -140504,7 +140610,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11492,
+															Ctx: p11490,
 															FreeVars: ast.Identifiers{
 																"arr",
 																"std",
@@ -140525,7 +140631,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11492,
+																Ctx: p11490,
 																FreeVars: ast.Identifiers{
 																	"std",
 																},
@@ -140597,7 +140703,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11619,
+																			Ctx: p11617,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																			},
@@ -140638,7 +140744,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p11492,
+														Ctx: p11490,
 														FreeVars: ast.Identifiers{
 															"arr",
 															"aux",
@@ -140667,7 +140773,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11626,
+																	Ctx: p11624,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																		"base64_table",
@@ -140689,7 +140795,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11626,
+																		Ctx: p11624,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																			"base64_table",
@@ -140711,7 +140817,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11626,
+																			Ctx: p11624,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																				"base64_table",
@@ -140733,7 +140839,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11626,
+																				Ctx: p11624,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"base64_table",
@@ -140770,7 +140876,7 @@ var _StdAst = &ast.DesugaredObject{
 																							},
 																						},
 																					},
-																					Ctx: p11626,
+																					Ctx: p11624,
 																					FreeVars: ast.Identifiers{
 																						"base64_table",
 																					},
@@ -140793,7 +140899,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11626,
+																					Ctx: p11624,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"i",
@@ -140814,7 +140920,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11626,
+																						Ctx: p11624,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -140835,7 +140941,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11626,
+																							Ctx: p11624,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -140856,7 +140962,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11626,
+																								Ctx: p11624,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																								},
@@ -140879,7 +140985,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11626,
+																								Ctx: p11624,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -140906,7 +141012,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11626,
+																							Ctx: p11624,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "252",
@@ -140929,7 +141035,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11626,
+																						Ctx: p11624,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "2",
@@ -140955,7 +141061,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11626,
+																				Ctx: p11624,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"base64_table",
@@ -140992,7 +141098,7 @@ var _StdAst = &ast.DesugaredObject{
 																							},
 																						},
 																					},
-																					Ctx: p11626,
+																					Ctx: p11624,
 																					FreeVars: ast.Identifiers{
 																						"base64_table",
 																					},
@@ -141015,7 +141121,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11626,
+																					Ctx: p11624,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"i",
@@ -141036,7 +141142,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11626,
+																						Ctx: p11624,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -141057,7 +141163,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11626,
+																							Ctx: p11624,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -141078,7 +141184,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11626,
+																								Ctx: p11624,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																									"i",
@@ -141099,7 +141205,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11626,
+																									Ctx: p11624,
 																									FreeVars: ast.Identifiers{
 																										"arr",
 																									},
@@ -141122,7 +141228,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11626,
+																									Ctx: p11624,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -141149,7 +141255,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11626,
+																								Ctx: p11624,
 																								FreeVars: nil,
 																							},
 																							OriginalString: "3",
@@ -141172,7 +141278,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11626,
+																							Ctx: p11624,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "4",
@@ -141195,7 +141301,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11626,
+																						Ctx: p11624,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -141216,7 +141322,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11626,
+																							Ctx: p11624,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -141237,7 +141343,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11626,
+																								Ctx: p11624,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																									"i",
@@ -141258,7 +141364,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11626,
+																									Ctx: p11624,
 																									FreeVars: ast.Identifiers{
 																										"arr",
 																									},
@@ -141281,7 +141387,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11626,
+																									Ctx: p11624,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -141301,7 +141407,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p11626,
+																										Ctx: p11624,
 																										FreeVars: ast.Identifiers{
 																											"i",
 																										},
@@ -141325,7 +141431,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p11626,
+																										Ctx: p11624,
 																										FreeVars: nil,
 																									},
 																									OriginalString: "1",
@@ -141351,7 +141457,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11626,
+																								Ctx: p11624,
 																								FreeVars: nil,
 																							},
 																							OriginalString: "240",
@@ -141374,7 +141480,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11626,
+																							Ctx: p11624,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "4",
@@ -141402,7 +141508,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11626,
+																			Ctx: p11624,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																				"base64_table",
@@ -141439,7 +141545,7 @@ var _StdAst = &ast.DesugaredObject{
 																						},
 																					},
 																				},
-																				Ctx: p11626,
+																				Ctx: p11624,
 																				FreeVars: ast.Identifiers{
 																					"base64_table",
 																				},
@@ -141462,7 +141568,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11626,
+																				Ctx: p11624,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"i",
@@ -141483,7 +141589,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11626,
+																					Ctx: p11624,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"i",
@@ -141504,7 +141610,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11626,
+																						Ctx: p11624,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -141525,7 +141631,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11626,
+																							Ctx: p11624,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																							},
@@ -141548,7 +141654,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11626,
+																							Ctx: p11624,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																							},
@@ -141568,7 +141674,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11626,
+																								Ctx: p11624,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -141592,7 +141698,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11626,
+																								Ctx: p11624,
 																								FreeVars: nil,
 																							},
 																							OriginalString: "1",
@@ -141618,7 +141724,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11626,
+																						Ctx: p11624,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "15",
@@ -141641,7 +141747,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11626,
+																					Ctx: p11624,
 																					FreeVars: nil,
 																				},
 																				OriginalString: "2",
@@ -141675,7 +141781,7 @@ var _StdAst = &ast.DesugaredObject{
 																				Comment: []string{},
 																			},
 																		},
-																		Ctx: p11626,
+																		Ctx: p11624,
 																		FreeVars: nil,
 																	},
 																	Value: "=",
@@ -141702,7 +141808,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11492,
+															Ctx: p11490,
 															FreeVars: ast.Identifiers{
 																"arr",
 																"aux",
@@ -141733,7 +141839,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p11492,
+																Ctx: p11490,
 																FreeVars: ast.Identifiers{
 																	"aux",
 																},
@@ -141759,7 +141865,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11715,
+																			Ctx: p11713,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																			},
@@ -141784,7 +141890,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11715,
+																			Ctx: p11713,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																			},
@@ -141804,7 +141910,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11715,
+																				Ctx: p11713,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -141828,7 +141934,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11715,
+																				Ctx: p11713,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "3",
@@ -141852,7 +141958,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11715,
+																			Ctx: p11713,
 																			FreeVars: ast.Identifiers{
 																				"r",
 																				"str",
@@ -141873,7 +141979,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11715,
+																				Ctx: p11713,
 																				FreeVars: ast.Identifiers{
 																					"r",
 																				},
@@ -141897,7 +142003,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11715,
+																				Ctx: p11713,
 																				FreeVars: ast.Identifiers{
 																					"str",
 																				},
@@ -141946,7 +142052,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p11492,
+														Ctx: p11490,
 														FreeVars: ast.Identifiers{
 															"arr",
 															"aux",
@@ -141975,7 +142081,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11734,
+																	Ctx: p11732,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																		"base64_table",
@@ -141997,7 +142103,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11734,
+																		Ctx: p11732,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																			"base64_table",
@@ -142019,7 +142125,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11734,
+																			Ctx: p11732,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																				"base64_table",
@@ -142041,7 +142147,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11734,
+																				Ctx: p11732,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"base64_table",
@@ -142078,7 +142184,7 @@ var _StdAst = &ast.DesugaredObject{
 																							},
 																						},
 																					},
-																					Ctx: p11734,
+																					Ctx: p11732,
 																					FreeVars: ast.Identifiers{
 																						"base64_table",
 																					},
@@ -142101,7 +142207,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11734,
+																					Ctx: p11732,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"i",
@@ -142122,7 +142228,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -142143,7 +142249,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -142164,7 +142270,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																								},
@@ -142187,7 +142293,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -142214,7 +142320,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "252",
@@ -142237,7 +142343,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "2",
@@ -142263,7 +142369,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11734,
+																				Ctx: p11732,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"base64_table",
@@ -142300,7 +142406,7 @@ var _StdAst = &ast.DesugaredObject{
 																							},
 																						},
 																					},
-																					Ctx: p11734,
+																					Ctx: p11732,
 																					FreeVars: ast.Identifiers{
 																						"base64_table",
 																					},
@@ -142323,7 +142429,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11734,
+																					Ctx: p11732,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"i",
@@ -142344,7 +142450,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -142365,7 +142471,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -142386,7 +142492,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																									"i",
@@ -142407,7 +142513,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11734,
+																									Ctx: p11732,
 																									FreeVars: ast.Identifiers{
 																										"arr",
 																									},
@@ -142430,7 +142536,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11734,
+																									Ctx: p11732,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -142457,7 +142563,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: nil,
 																							},
 																							OriginalString: "3",
@@ -142480,7 +142586,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "4",
@@ -142503,7 +142609,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -142524,7 +142630,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -142545,7 +142651,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																									"i",
@@ -142566,7 +142672,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11734,
+																									Ctx: p11732,
 																									FreeVars: ast.Identifiers{
 																										"arr",
 																									},
@@ -142589,7 +142695,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11734,
+																									Ctx: p11732,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -142609,7 +142715,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p11734,
+																										Ctx: p11732,
 																										FreeVars: ast.Identifiers{
 																											"i",
 																										},
@@ -142633,7 +142739,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p11734,
+																										Ctx: p11732,
 																										FreeVars: nil,
 																									},
 																									OriginalString: "1",
@@ -142659,7 +142765,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: nil,
 																							},
 																							OriginalString: "240",
@@ -142682,7 +142788,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "4",
@@ -142710,7 +142816,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11734,
+																			Ctx: p11732,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																				"base64_table",
@@ -142747,7 +142853,7 @@ var _StdAst = &ast.DesugaredObject{
 																						},
 																					},
 																				},
-																				Ctx: p11734,
+																				Ctx: p11732,
 																				FreeVars: ast.Identifiers{
 																					"base64_table",
 																				},
@@ -142770,7 +142876,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11734,
+																				Ctx: p11732,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"i",
@@ -142791,7 +142897,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11734,
+																					Ctx: p11732,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"i",
@@ -142812,7 +142918,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -142833,7 +142939,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -142854,7 +142960,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																								},
@@ -142877,7 +142983,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -142897,7 +143003,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11734,
+																									Ctx: p11732,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -142921,7 +143027,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11734,
+																									Ctx: p11732,
 																									FreeVars: nil,
 																								},
 																								OriginalString: "1",
@@ -142947,7 +143053,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "15",
@@ -142970,7 +143076,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "2",
@@ -142993,7 +143099,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11734,
+																					Ctx: p11732,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"i",
@@ -143014,7 +143120,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -143035,7 +143141,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -143056,7 +143162,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																								},
@@ -143079,7 +143185,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p11734,
+																								Ctx: p11732,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -143099,7 +143205,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11734,
+																									Ctx: p11732,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -143123,7 +143229,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p11734,
+																									Ctx: p11732,
 																									FreeVars: nil,
 																								},
 																								OriginalString: "2",
@@ -143149,7 +143255,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p11734,
+																							Ctx: p11732,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "192",
@@ -143172,7 +143278,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "6",
@@ -143200,7 +143306,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11734,
+																		Ctx: p11732,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																			"base64_table",
@@ -143237,7 +143343,7 @@ var _StdAst = &ast.DesugaredObject{
 																					},
 																				},
 																			},
-																			Ctx: p11734,
+																			Ctx: p11732,
 																			FreeVars: ast.Identifiers{
 																				"base64_table",
 																			},
@@ -143260,7 +143366,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11734,
+																			Ctx: p11732,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																				"i",
@@ -143281,7 +143387,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11734,
+																				Ctx: p11732,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"i",
@@ -143302,7 +143408,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11734,
+																					Ctx: p11732,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																					},
@@ -143325,7 +143431,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p11734,
+																					Ctx: p11732,
 																					FreeVars: ast.Identifiers{
 																						"i",
 																					},
@@ -143345,7 +143451,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: ast.Identifiers{
 																							"i",
 																						},
@@ -143369,7 +143475,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p11734,
+																						Ctx: p11732,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "2",
@@ -143395,7 +143501,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11734,
+																				Ctx: p11732,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "63",
@@ -143424,7 +143530,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11492,
+															Ctx: p11490,
 															FreeVars: ast.Identifiers{
 																"arr",
 																"aux",
@@ -143455,7 +143561,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p11492,
+																Ctx: p11490,
 																FreeVars: ast.Identifiers{
 																	"aux",
 																},
@@ -143481,7 +143587,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11856,
+																			Ctx: p11854,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																			},
@@ -143506,7 +143612,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11856,
+																			Ctx: p11854,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																			},
@@ -143526,7 +143632,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11856,
+																				Ctx: p11854,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -143550,7 +143656,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11856,
+																				Ctx: p11854,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "3",
@@ -143574,7 +143680,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p11856,
+																			Ctx: p11854,
 																			FreeVars: ast.Identifiers{
 																				"r",
 																				"str",
@@ -143595,7 +143701,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11856,
+																				Ctx: p11854,
 																				FreeVars: ast.Identifiers{
 																					"r",
 																				},
@@ -143619,7 +143725,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p11856,
+																				Ctx: p11854,
 																				FreeVars: ast.Identifiers{
 																					"str",
 																				},
@@ -143668,7 +143774,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p11433,
+								Ctx: p11431,
 								FreeVars: ast.Identifiers{
 									"aux",
 									"bytes",
@@ -143695,7 +143801,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p11874,
+											Ctx: p11872,
 											FreeVars: ast.Identifiers{
 												"bytes",
 												"std",
@@ -143716,7 +143822,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11874,
+												Ctx: p11872,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -143788,24 +143894,25 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11883,
+															Ctx: p11881,
 															FreeVars: nil,
 														},
 														ParenLeftFodder: ast.Fodder{},
-														Parameters: ast.Parameters{
-															Required: []ast.CommaSeparatedID{
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "r",
-																	CommaFodder: ast.Fodder{},
-																},
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "a",
-																	CommaFodder: nil,
-																},
+														Parameters: []ast.Parameter{
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "r",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: ast.Fodder{},
+															},
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "a",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: nil,
 															},
-															Optional: nil,
 														},
 														TrailingComma: false,
 														ParenRightFodder: ast.Fodder{},
@@ -143824,7 +143931,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11886,
+																Ctx: p11884,
 																FreeVars: ast.Identifiers{
 																	"a",
 																	"r",
@@ -143845,7 +143952,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11886,
+																	Ctx: p11884,
 																	FreeVars: ast.Identifiers{
 																		"r",
 																	},
@@ -143869,7 +143976,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11886,
+																	Ctx: p11884,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																	},
@@ -143889,7 +143996,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11886,
+																		Ctx: p11884,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																		},
@@ -143913,7 +144020,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p11886,
+																		Ctx: p11884,
 																		FreeVars: nil,
 																	},
 																	OriginalString: "256",
@@ -143939,7 +144046,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11883,
+															Ctx: p11881,
 															FreeVars: ast.Identifiers{
 																"bytes",
 															},
@@ -143964,7 +144071,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11883,
+															Ctx: p11881,
 															FreeVars: nil,
 														},
 														Value: true,
@@ -144005,7 +144112,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p11433,
+									Ctx: p11431,
 									FreeVars: ast.Identifiers{
 										"aux",
 										"bytes",
@@ -144027,7 +144134,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p11433,
+										Ctx: p11431,
 										FreeVars: ast.Identifiers{
 											"sanity",
 										},
@@ -144048,7 +144155,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p11433,
+											Ctx: p11431,
 											FreeVars: ast.Identifiers{
 												"sanity",
 											},
@@ -144079,7 +144186,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p11433,
+										Ctx: p11431,
 										FreeVars: nil,
 									},
 									Expr: &ast.LiteralString{
@@ -144097,7 +144204,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p11433,
+											Ctx: p11431,
 											FreeVars: nil,
 										},
 										Value: "Can only base64 encode strings / arrays of single bytes.",
@@ -144128,7 +144235,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p11433,
+										Ctx: p11431,
 										FreeVars: ast.Identifiers{
 											"aux",
 											"bytes",
@@ -144156,7 +144263,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p11433,
+											Ctx: p11431,
 											FreeVars: ast.Identifiers{
 												"aux",
 											},
@@ -144182,7 +144289,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11916,
+														Ctx: p11914,
 														FreeVars: ast.Identifiers{
 															"bytes",
 														},
@@ -144207,7 +144314,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11916,
+														Ctx: p11914,
 														FreeVars: nil,
 													},
 													OriginalString: "0",
@@ -144230,7 +144337,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11916,
+														Ctx: p11914,
 														FreeVars: nil,
 													},
 													Value: "",
@@ -144300,15 +144407,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -144334,7 +144440,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p11926,
+						Ctx: p11924,
 						FreeVars: ast.Identifiers{
 							"base64_inv",
 							"std",
@@ -144356,7 +144462,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p11926,
+							Ctx: p11924,
 							FreeVars: ast.Identifiers{
 								"std",
 								"str",
@@ -144470,7 +144576,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11926,
+												Ctx: p11924,
 												FreeVars: ast.Identifiers{
 													"std",
 													"str",
@@ -144491,7 +144597,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11926,
+													Ctx: p11924,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -144563,7 +144669,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p11947,
+																Ctx: p11945,
 																FreeVars: ast.Identifiers{
 																	"str",
 																},
@@ -144598,7 +144704,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11926,
+												Ctx: p11924,
 												FreeVars: nil,
 											},
 											OriginalString: "4",
@@ -144630,7 +144736,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p11926,
+								Ctx: p11924,
 								FreeVars: nil,
 							},
 							OriginalString: "0",
@@ -144659,7 +144765,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p11926,
+							Ctx: p11924,
 							FreeVars: ast.Identifiers{
 								"std",
 								"str",
@@ -144773,7 +144879,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11926,
+												Ctx: p11924,
 												FreeVars: nil,
 											},
 											Value: "Not a base64 encoded string \"%s\"",
@@ -144798,7 +144904,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11926,
+												Ctx: p11924,
 												FreeVars: ast.Identifiers{
 													"str",
 												},
@@ -144846,7 +144952,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p11926,
+							Ctx: p11924,
 							FreeVars: ast.Identifiers{
 								"base64_inv",
 								"std",
@@ -144873,7 +144979,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: nil,
-										Ctx: p11971,
+										Ctx: p11969,
 										FreeVars: ast.Identifiers{
 											"aux",
 											"base64_inv",
@@ -144881,25 +144987,28 @@ var _StdAst = &ast.DesugaredObject{
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "str",
-												CommaFodder: ast.Fodder{},
-											},
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "i",
-												CommaFodder: ast.Fodder{},
-											},
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "r",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "str",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: ast.Fodder{},
+										},
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "i",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: ast.Fodder{},
+										},
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "r",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -144925,7 +145034,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p11976,
+											Ctx: p11974,
 											FreeVars: ast.Identifiers{
 												"aux",
 												"base64_inv",
@@ -144950,7 +145059,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p11976,
+												Ctx: p11974,
 												FreeVars: ast.Identifiers{
 													"i",
 													"std",
@@ -144972,7 +145081,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11976,
+													Ctx: p11974,
 													FreeVars: ast.Identifiers{
 														"i",
 													},
@@ -144996,7 +145105,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p11976,
+													Ctx: p11974,
 													FreeVars: ast.Identifiers{
 														"std",
 														"str",
@@ -145017,7 +145126,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p11976,
+														Ctx: p11974,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -145089,7 +145198,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p11991,
+																	Ctx: p11989,
 																	FreeVars: ast.Identifiers{
 																		"str",
 																	},
@@ -145130,7 +145239,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p11976,
+												Ctx: p11974,
 												FreeVars: ast.Identifiers{
 													"r",
 												},
@@ -145175,7 +145284,7 @@ var _StdAst = &ast.DesugaredObject{
 														},
 													},
 												},
-												Ctx: p11976,
+												Ctx: p11974,
 												FreeVars: ast.Identifiers{
 													"aux",
 													"base64_inv",
@@ -145204,7 +145313,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12003,
+															Ctx: p12001,
 															FreeVars: ast.Identifiers{
 																"base64_inv",
 																"i",
@@ -145228,7 +145337,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12007,
+																		Ctx: p12005,
 																		FreeVars: ast.Identifiers{
 																			"base64_inv",
 																			"i",
@@ -145250,7 +145359,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12007,
+																			Ctx: p12005,
 																			FreeVars: ast.Identifiers{
 																				"base64_inv",
 																				"i",
@@ -145272,7 +145381,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12007,
+																				Ctx: p12005,
 																				FreeVars: ast.Identifiers{
 																					"base64_inv",
 																					"i",
@@ -145294,7 +145403,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12007,
+																					Ctx: p12005,
 																					FreeVars: ast.Identifiers{
 																						"base64_inv",
 																					},
@@ -145317,7 +145426,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12007,
+																					Ctx: p12005,
 																					FreeVars: ast.Identifiers{
 																						"i",
 																						"str",
@@ -145338,7 +145447,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12007,
+																						Ctx: p12005,
 																						FreeVars: ast.Identifiers{
 																							"str",
 																						},
@@ -145361,7 +145470,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12007,
+																						Ctx: p12005,
 																						FreeVars: ast.Identifiers{
 																							"i",
 																						},
@@ -145391,7 +145500,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12007,
+																				Ctx: p12005,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "2",
@@ -145414,7 +145523,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12007,
+																			Ctx: p12005,
 																			FreeVars: ast.Identifiers{
 																				"base64_inv",
 																				"i",
@@ -145436,7 +145545,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12007,
+																				Ctx: p12005,
 																				FreeVars: ast.Identifiers{
 																					"base64_inv",
 																					"i",
@@ -145458,7 +145567,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12007,
+																					Ctx: p12005,
 																					FreeVars: ast.Identifiers{
 																						"base64_inv",
 																					},
@@ -145481,7 +145590,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12007,
+																					Ctx: p12005,
 																					FreeVars: ast.Identifiers{
 																						"i",
 																						"str",
@@ -145502,7 +145611,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12007,
+																						Ctx: p12005,
 																						FreeVars: ast.Identifiers{
 																							"str",
 																						},
@@ -145525,7 +145634,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12007,
+																						Ctx: p12005,
 																						FreeVars: ast.Identifiers{
 																							"i",
 																						},
@@ -145545,7 +145654,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12007,
+																							Ctx: p12005,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																							},
@@ -145569,7 +145678,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12007,
+																							Ctx: p12005,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "1",
@@ -145598,7 +145707,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12007,
+																				Ctx: p12005,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "4",
@@ -145645,7 +145754,7 @@ var _StdAst = &ast.DesugaredObject{
 															},
 														},
 													},
-													Ctx: p11976,
+													Ctx: p11974,
 													FreeVars: ast.Identifiers{
 														"aux",
 														"base64_inv",
@@ -145682,7 +145791,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p12045,
+																Ctx: p12043,
 																FreeVars: ast.Identifiers{
 																	"base64_inv",
 																	"i",
@@ -145704,7 +145813,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12045,
+																	Ctx: p12043,
 																	FreeVars: ast.Identifiers{
 																		"i",
 																		"str",
@@ -145725,7 +145834,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12045,
+																		Ctx: p12043,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																			"str",
@@ -145746,7 +145855,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12045,
+																			Ctx: p12043,
 																			FreeVars: ast.Identifiers{
 																				"str",
 																			},
@@ -145769,7 +145878,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12045,
+																			Ctx: p12043,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																			},
@@ -145789,7 +145898,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12045,
+																				Ctx: p12043,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -145813,7 +145922,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12045,
+																				Ctx: p12043,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "2",
@@ -145839,7 +145948,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12045,
+																		Ctx: p12043,
 																		FreeVars: nil,
 																	},
 																	Value: "=",
@@ -145863,7 +145972,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12045,
+																	Ctx: p12043,
 																	FreeVars: nil,
 																},
 																Elements: nil,
@@ -145893,7 +146002,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12045,
+																	Ctx: p12043,
 																	FreeVars: ast.Identifiers{
 																		"base64_inv",
 																		"i",
@@ -145917,7 +146026,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12065,
+																				Ctx: p12063,
 																				FreeVars: ast.Identifiers{
 																					"base64_inv",
 																					"i",
@@ -145939,7 +146048,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12065,
+																					Ctx: p12063,
 																					FreeVars: ast.Identifiers{
 																						"base64_inv",
 																						"i",
@@ -145961,7 +146070,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12065,
+																						Ctx: p12063,
 																						FreeVars: ast.Identifiers{
 																							"base64_inv",
 																							"i",
@@ -145983,7 +146092,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12065,
+																							Ctx: p12063,
 																							FreeVars: ast.Identifiers{
 																								"base64_inv",
 																								"i",
@@ -146005,7 +146114,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12065,
+																								Ctx: p12063,
 																								FreeVars: ast.Identifiers{
 																									"base64_inv",
 																								},
@@ -146028,7 +146137,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12065,
+																								Ctx: p12063,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																									"str",
@@ -146049,7 +146158,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12065,
+																									Ctx: p12063,
 																									FreeVars: ast.Identifiers{
 																										"str",
 																									},
@@ -146072,7 +146181,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12065,
+																									Ctx: p12063,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -146092,7 +146201,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p12065,
+																										Ctx: p12063,
 																										FreeVars: ast.Identifiers{
 																											"i",
 																										},
@@ -146116,7 +146225,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p12065,
+																										Ctx: p12063,
 																										FreeVars: nil,
 																									},
 																									OriginalString: "1",
@@ -146145,7 +146254,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12065,
+																							Ctx: p12063,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "15",
@@ -146168,7 +146277,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12065,
+																						Ctx: p12063,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "4",
@@ -146191,7 +146300,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12065,
+																					Ctx: p12063,
 																					FreeVars: ast.Identifiers{
 																						"base64_inv",
 																						"i",
@@ -146213,7 +146322,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12065,
+																						Ctx: p12063,
 																						FreeVars: ast.Identifiers{
 																							"base64_inv",
 																							"i",
@@ -146235,7 +146344,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12065,
+																							Ctx: p12063,
 																							FreeVars: ast.Identifiers{
 																								"base64_inv",
 																							},
@@ -146258,7 +146367,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12065,
+																							Ctx: p12063,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																								"str",
@@ -146279,7 +146388,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12065,
+																								Ctx: p12063,
 																								FreeVars: ast.Identifiers{
 																									"str",
 																								},
@@ -146302,7 +146411,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12065,
+																								Ctx: p12063,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -146322,7 +146431,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12065,
+																									Ctx: p12063,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -146346,7 +146455,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12065,
+																									Ctx: p12063,
 																									FreeVars: nil,
 																								},
 																								OriginalString: "2",
@@ -146375,7 +146484,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12065,
+																						Ctx: p12063,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "2",
@@ -146423,7 +146532,7 @@ var _StdAst = &ast.DesugaredObject{
 																},
 															},
 														},
-														Ctx: p11976,
+														Ctx: p11974,
 														FreeVars: ast.Identifiers{
 															"aux",
 															"base64_inv",
@@ -146461,7 +146570,7 @@ var _StdAst = &ast.DesugaredObject{
 																			Comment: []string{},
 																		},
 																	},
-																	Ctx: p12109,
+																	Ctx: p12107,
 																	FreeVars: ast.Identifiers{
 																		"base64_inv",
 																		"i",
@@ -146483,7 +146592,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12109,
+																		Ctx: p12107,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																			"str",
@@ -146504,7 +146613,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12109,
+																			Ctx: p12107,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																				"str",
@@ -146525,7 +146634,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12109,
+																				Ctx: p12107,
 																				FreeVars: ast.Identifiers{
 																					"str",
 																				},
@@ -146548,7 +146657,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12109,
+																				Ctx: p12107,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -146568,7 +146677,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12109,
+																					Ctx: p12107,
 																					FreeVars: ast.Identifiers{
 																						"i",
 																					},
@@ -146592,7 +146701,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12109,
+																					Ctx: p12107,
 																					FreeVars: nil,
 																				},
 																				OriginalString: "3",
@@ -146618,7 +146727,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12109,
+																			Ctx: p12107,
 																			FreeVars: nil,
 																		},
 																		Value: "=",
@@ -146642,7 +146751,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12109,
+																		Ctx: p12107,
 																		FreeVars: nil,
 																	},
 																	Elements: nil,
@@ -146672,7 +146781,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12109,
+																		Ctx: p12107,
 																		FreeVars: ast.Identifiers{
 																			"base64_inv",
 																			"i",
@@ -146696,7 +146805,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12129,
+																					Ctx: p12127,
 																					FreeVars: ast.Identifiers{
 																						"base64_inv",
 																						"i",
@@ -146718,7 +146827,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12129,
+																						Ctx: p12127,
 																						FreeVars: ast.Identifiers{
 																							"base64_inv",
 																							"i",
@@ -146740,7 +146849,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12129,
+																							Ctx: p12127,
 																							FreeVars: ast.Identifiers{
 																								"base64_inv",
 																								"i",
@@ -146762,7 +146871,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12129,
+																								Ctx: p12127,
 																								FreeVars: ast.Identifiers{
 																									"base64_inv",
 																									"i",
@@ -146784,7 +146893,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12129,
+																									Ctx: p12127,
 																									FreeVars: ast.Identifiers{
 																										"base64_inv",
 																									},
@@ -146807,7 +146916,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12129,
+																									Ctx: p12127,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																										"str",
@@ -146828,7 +146937,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p12129,
+																										Ctx: p12127,
 																										FreeVars: ast.Identifiers{
 																											"str",
 																										},
@@ -146851,7 +146960,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p12129,
+																										Ctx: p12127,
 																										FreeVars: ast.Identifiers{
 																											"i",
 																										},
@@ -146871,7 +146980,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p12129,
+																											Ctx: p12127,
 																											FreeVars: ast.Identifiers{
 																												"i",
 																											},
@@ -146895,7 +147004,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p12129,
+																											Ctx: p12127,
 																											FreeVars: nil,
 																										},
 																										OriginalString: "2",
@@ -146924,7 +147033,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12129,
+																								Ctx: p12127,
 																								FreeVars: nil,
 																							},
 																							OriginalString: "3",
@@ -146947,7 +147056,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12129,
+																							Ctx: p12127,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "6",
@@ -146970,7 +147079,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12129,
+																						Ctx: p12127,
 																						FreeVars: ast.Identifiers{
 																							"base64_inv",
 																							"i",
@@ -146992,7 +147101,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12129,
+																							Ctx: p12127,
 																							FreeVars: ast.Identifiers{
 																								"base64_inv",
 																							},
@@ -147015,7 +147124,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12129,
+																							Ctx: p12127,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																								"str",
@@ -147036,7 +147145,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12129,
+																								Ctx: p12127,
 																								FreeVars: ast.Identifiers{
 																									"str",
 																								},
@@ -147059,7 +147168,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12129,
+																								Ctx: p12127,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -147079,7 +147188,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12129,
+																									Ctx: p12127,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -147103,7 +147212,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12129,
+																									Ctx: p12127,
 																									FreeVars: nil,
 																								},
 																								OriginalString: "3",
@@ -147142,7 +147251,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p11976,
+															Ctx: p11974,
 															FreeVars: ast.Identifiers{
 																"aux",
 																"i",
@@ -147175,7 +147284,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p11976,
+																Ctx: p11974,
 																FreeVars: ast.Identifiers{
 																	"aux",
 																},
@@ -147201,7 +147310,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12170,
+																			Ctx: p12168,
 																			FreeVars: ast.Identifiers{
 																				"str",
 																			},
@@ -147226,7 +147335,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12170,
+																			Ctx: p12168,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																			},
@@ -147246,7 +147355,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12170,
+																				Ctx: p12168,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -147270,7 +147379,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12170,
+																				Ctx: p12168,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "4",
@@ -147294,7 +147403,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12170,
+																			Ctx: p12168,
 																			FreeVars: ast.Identifiers{
 																				"n1",
 																				"n2",
@@ -147317,7 +147426,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12170,
+																				Ctx: p12168,
 																				FreeVars: ast.Identifiers{
 																					"n1",
 																					"n2",
@@ -147339,7 +147448,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12170,
+																					Ctx: p12168,
 																					FreeVars: ast.Identifiers{
 																						"n1",
 																						"r",
@@ -147360,7 +147469,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12170,
+																						Ctx: p12168,
 																						FreeVars: ast.Identifiers{
 																							"r",
 																						},
@@ -147384,7 +147493,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12170,
+																						Ctx: p12168,
 																						FreeVars: ast.Identifiers{
 																							"n1",
 																						},
@@ -147409,7 +147518,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12170,
+																					Ctx: p12168,
 																					FreeVars: ast.Identifiers{
 																						"n2",
 																					},
@@ -147434,7 +147543,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12170,
+																				Ctx: p12168,
 																				FreeVars: ast.Identifiers{
 																					"n3",
 																				},
@@ -147476,7 +147585,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p11926,
+								Ctx: p11924,
 								FreeVars: ast.Identifiers{
 									"aux",
 									"str",
@@ -147504,7 +147613,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p11926,
+									Ctx: p11924,
 									FreeVars: ast.Identifiers{
 										"aux",
 									},
@@ -147530,7 +147639,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12198,
+												Ctx: p12196,
 												FreeVars: ast.Identifiers{
 													"str",
 												},
@@ -147555,7 +147664,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12198,
+												Ctx: p12196,
 												FreeVars: nil,
 											},
 											OriginalString: "0",
@@ -147578,7 +147687,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12198,
+												Ctx: p12196,
 												FreeVars: nil,
 											},
 											Elements: nil,
@@ -147645,15 +147754,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -147679,7 +147787,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p12208,
+						Ctx: p12206,
 						FreeVars: ast.Identifiers{
 							"std",
 							"str",
@@ -147705,7 +147813,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p12212,
+									Ctx: p12210,
 									FreeVars: ast.Identifiers{
 										"std",
 										"str",
@@ -147726,7 +147834,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p12212,
+										Ctx: p12210,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -147798,7 +147906,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12221,
+													Ctx: p12219,
 													FreeVars: ast.Identifiers{
 														"str",
 													},
@@ -147834,7 +147942,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p12208,
+							Ctx: p12206,
 							FreeVars: ast.Identifiers{
 								"bytes",
 								"std",
@@ -147855,7 +147963,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p12208,
+								Ctx: p12206,
 								FreeVars: ast.Identifiers{
 									"std",
 								},
@@ -147934,7 +148042,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12233,
+											Ctx: p12231,
 											FreeVars: nil,
 										},
 										Value: "",
@@ -147959,7 +148067,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12233,
+											Ctx: p12231,
 											FreeVars: ast.Identifiers{
 												"bytes",
 												"std",
@@ -147980,7 +148088,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12233,
+												Ctx: p12231,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -148052,21 +148160,20 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12243,
+															Ctx: p12241,
 															FreeVars: ast.Identifiers{
 																"std",
 															},
 														},
 														ParenLeftFodder: ast.Fodder{},
-														Parameters: ast.Parameters{
-															Required: []ast.CommaSeparatedID{
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "b",
-																	CommaFodder: nil,
-																},
+														Parameters: []ast.Parameter{
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "b",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: nil,
 															},
-															Optional: nil,
 														},
 														TrailingComma: false,
 														ParenRightFodder: ast.Fodder{},
@@ -148085,7 +148192,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p12247,
+																Ctx: p12245,
 																FreeVars: ast.Identifiers{
 																	"b",
 																	"std",
@@ -148106,7 +148213,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12247,
+																	Ctx: p12245,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																	},
@@ -148178,7 +148285,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12256,
+																				Ctx: p12254,
 																				FreeVars: ast.Identifiers{
 																					"b",
 																				},
@@ -148214,7 +148321,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12243,
+															Ctx: p12241,
 															FreeVars: ast.Identifiers{
 																"bytes",
 															},
@@ -148290,15 +148397,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -148324,7 +148430,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p12266,
+						Ctx: p12264,
 						FreeVars: ast.Identifiers{
 							"arr",
 							"std",
@@ -148350,7 +148456,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p12270,
+									Ctx: p12268,
 									FreeVars: ast.Identifiers{
 										"arr",
 										"std",
@@ -148371,7 +148477,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p12270,
+										Ctx: p12268,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -148443,7 +148549,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12279,
+													Ctx: p12277,
 													FreeVars: ast.Identifiers{
 														"arr",
 													},
@@ -148479,7 +148585,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p12266,
+							Ctx: p12264,
 							FreeVars: ast.Identifiers{
 								"arr",
 								"l",
@@ -148501,7 +148607,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p12266,
+								Ctx: p12264,
 								FreeVars: ast.Identifiers{
 									"std",
 								},
@@ -148580,7 +148686,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12291,
+											Ctx: p12289,
 											FreeVars: ast.Identifiers{
 												"l",
 											},
@@ -148605,22 +148711,21 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12291,
+											Ctx: p12289,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"l",
 											},
 										},
 										ParenLeftFodder: ast.Fodder{},
-										Parameters: ast.Parameters{
-											Required: []ast.CommaSeparatedID{
-												ast.CommaSeparatedID{
-													NameFodder: ast.Fodder{},
-													Name: "i",
-													CommaFodder: nil,
-												},
+										Parameters: []ast.Parameter{
+											ast.Parameter{
+												NameFodder: ast.Fodder{},
+												Name: "i",
+												EqFodder: nil,
+												DefaultArg: nil,
+												CommaFodder: nil,
 											},
-											Optional: nil,
 										},
 										TrailingComma: false,
 										ParenRightFodder: ast.Fodder{},
@@ -148639,7 +148744,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12297,
+												Ctx: p12295,
 												FreeVars: ast.Identifiers{
 													"arr",
 													"i",
@@ -148661,7 +148766,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12297,
+													Ctx: p12295,
 													FreeVars: ast.Identifiers{
 														"arr",
 													},
@@ -148684,7 +148789,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12297,
+													Ctx: p12295,
 													FreeVars: ast.Identifiers{
 														"i",
 														"l",
@@ -148705,7 +148810,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12297,
+														Ctx: p12295,
 														FreeVars: ast.Identifiers{
 															"i",
 															"l",
@@ -148726,7 +148831,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12297,
+															Ctx: p12295,
 															FreeVars: ast.Identifiers{
 																"l",
 															},
@@ -148750,7 +148855,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12297,
+															Ctx: p12295,
 															FreeVars: ast.Identifiers{
 																"i",
 															},
@@ -148775,7 +148880,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12297,
+														Ctx: p12295,
 														FreeVars: nil,
 													},
 													OriginalString: "1",
@@ -148845,43 +148950,41 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: ast.Fodder{},
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
 					},
-					Optional: []ast.NamedParameter{
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "keyF",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.Var{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(1155),
-											Column: int(18),
-										},
-										End: ast.Location{
-											Line: int(1155),
-											Column: int(20),
-										},
-										File: p1,
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "keyF",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.Var{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(1155),
+										Column: int(18),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p12316,
-									FreeVars: ast.Identifiers{
-										"id",
+									End: ast.Location{
+										Line: int(1155),
+										Column: int(20),
 									},
+									File: p1,
+								},
+								Fodder: ast.Fodder{},
+								Ctx: p12313,
+								FreeVars: ast.Identifiers{
+									"id",
 								},
-								Id: "id",
 							},
-							CommaFodder: ast.Fodder{},
+							Id: "id",
 						},
+						CommaFodder: ast.Fodder{},
 					},
 				},
 				TrailingComma: false,
@@ -148908,7 +149011,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p12316,
+						Ctx: p12313,
 						FreeVars: ast.Identifiers{
 							"arr",
 							"id",
@@ -148936,7 +149039,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: nil,
-									Ctx: p12323,
+									Ctx: p12320,
 									FreeVars: ast.Identifiers{
 										"id",
 										"quickSort",
@@ -148944,43 +149047,41 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "arr",
-											CommaFodder: ast.Fodder{},
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "arr",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
 									},
-									Optional: []ast.NamedParameter{
-										ast.NamedParameter{
-											NameFodder: ast.Fodder{},
-											Name: "keyF",
-											EqFodder: ast.Fodder{},
-											DefaultArg: &ast.Var{
-												NodeBase: ast.NodeBase{
-													LocRange: ast.LocationRange{
-														FileName: "<std>",
-														Begin: ast.Location{
-															Line: int(1156),
-															Column: int(31),
-														},
-														End: ast.Location{
-															Line: int(1156),
-															Column: int(33),
-														},
-														File: p1,
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "keyF",
+										EqFodder: ast.Fodder{},
+										DefaultArg: &ast.Var{
+											NodeBase: ast.NodeBase{
+												LocRange: ast.LocationRange{
+													FileName: "<std>",
+													Begin: ast.Location{
+														Line: int(1156),
+														Column: int(31),
 													},
-													Fodder: ast.Fodder{},
-													Ctx: p12328,
-													FreeVars: ast.Identifiers{
-														"id",
+													End: ast.Location{
+														Line: int(1156),
+														Column: int(33),
 													},
+													File: p1,
+												},
+												Fodder: ast.Fodder{},
+												Ctx: p12324,
+												FreeVars: ast.Identifiers{
+													"id",
 												},
-												Id: "id",
 											},
-											CommaFodder: ast.Fodder{},
+											Id: "id",
 										},
+										CommaFodder: ast.Fodder{},
 									},
 								},
 								TrailingComma: false,
@@ -149007,7 +149108,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p12328,
+										Ctx: p12324,
 										FreeVars: ast.Identifiers{
 											"arr",
 											"keyF",
@@ -149035,7 +149136,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12335,
+													Ctx: p12331,
 													FreeVars: ast.Identifiers{
 														"arr",
 														"std",
@@ -149056,7 +149157,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12335,
+														Ctx: p12331,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -149128,7 +149229,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12344,
+																	Ctx: p12340,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																	},
@@ -149171,7 +149272,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p12328,
+											Ctx: p12324,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"keyF",
@@ -149195,7 +149296,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12328,
+												Ctx: p12324,
 												FreeVars: ast.Identifiers{
 													"arr",
 													"std",
@@ -149216,7 +149317,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12328,
+													Ctx: p12324,
 													FreeVars: ast.Identifiers{
 														"arr",
 														"std",
@@ -149237,7 +149338,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12328,
+														Ctx: p12324,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -149309,7 +149410,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12360,
+																	Ctx: p12356,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																	},
@@ -149343,7 +149444,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12328,
+													Ctx: p12324,
 													FreeVars: nil,
 												},
 												OriginalString: "1",
@@ -149372,7 +149473,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p12328,
+												Ctx: p12324,
 												FreeVars: ast.Identifiers{
 													"arr",
 												},
@@ -149409,7 +149510,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p12328,
+												Ctx: p12324,
 												FreeVars: ast.Identifiers{
 													"arr",
 													"keyF",
@@ -149438,7 +149539,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12372,
+															Ctx: p12368,
 															FreeVars: nil,
 														},
 														OriginalString: "0",
@@ -149469,7 +149570,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p12328,
+													Ctx: p12324,
 													FreeVars: ast.Identifiers{
 														"arr",
 														"keyF",
@@ -149499,7 +149600,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p12378,
+																Ctx: p12374,
 																FreeVars: ast.Identifiers{
 																	"arr",
 																	"keyF",
@@ -149521,7 +149622,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12378,
+																	Ctx: p12374,
 																	FreeVars: ast.Identifiers{
 																		"keyF",
 																	},
@@ -149547,7 +149648,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12384,
+																				Ctx: p12380,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																					"pos",
@@ -149568,7 +149669,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12384,
+																					Ctx: p12380,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																					},
@@ -149591,7 +149692,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12384,
+																					Ctx: p12380,
 																					FreeVars: ast.Identifiers{
 																						"pos",
 																					},
@@ -149637,7 +149738,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p12328,
+														Ctx: p12324,
 														FreeVars: ast.Identifiers{
 															"arr",
 															"keyF",
@@ -149668,7 +149769,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12395,
+																	Ctx: p12391,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																		"l",
@@ -149691,7 +149792,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12395,
+																		Ctx: p12391,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -149763,7 +149864,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12404,
+																					Ctx: p12400,
 																					FreeVars: ast.Identifiers{
 																						"l",
 																					},
@@ -149783,7 +149884,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12404,
+																						Ctx: p12400,
 																						FreeVars: ast.Identifiers{
 																							"l",
 																						},
@@ -149807,7 +149908,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12404,
+																						Ctx: p12400,
 																						FreeVars: nil,
 																					},
 																					OriginalString: "1",
@@ -149831,22 +149932,21 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12404,
+																					Ctx: p12400,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																						"pos",
 																					},
 																				},
 																				ParenLeftFodder: ast.Fodder{},
-																				Parameters: ast.Parameters{
-																					Required: []ast.CommaSeparatedID{
-																						ast.CommaSeparatedID{
-																							NameFodder: ast.Fodder{},
-																							Name: "i",
-																							CommaFodder: nil,
-																						},
+																				Parameters: []ast.Parameter{
+																					ast.Parameter{
+																						NameFodder: ast.Fodder{},
+																						Name: "i",
+																						EqFodder: nil,
+																						DefaultArg: nil,
+																						CommaFodder: nil,
 																					},
-																					Optional: nil,
 																				},
 																				TrailingComma: false,
 																				ParenRightFodder: ast.Fodder{},
@@ -149865,7 +149965,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12413,
+																						Ctx: p12409,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"i",
@@ -149887,7 +149987,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12413,
+																							Ctx: p12409,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																								"pos",
@@ -149908,7 +150008,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12413,
+																								Ctx: p12409,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -149932,7 +150032,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12413,
+																								Ctx: p12409,
 																								FreeVars: ast.Identifiers{
 																									"pos",
 																								},
@@ -149956,7 +150056,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12413,
+																							Ctx: p12409,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -149977,7 +150077,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12413,
+																								Ctx: p12409,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																								},
@@ -150000,7 +150100,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12413,
+																								Ctx: p12409,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -150026,7 +150126,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12413,
+																							Ctx: p12409,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																								"i",
@@ -150047,7 +150147,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12413,
+																								Ctx: p12409,
 																								FreeVars: ast.Identifiers{
 																									"arr",
 																								},
@@ -150070,7 +150170,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12413,
+																								Ctx: p12409,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -150090,7 +150190,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12413,
+																									Ctx: p12409,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -150114,7 +150214,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12413,
+																									Ctx: p12409,
 																									FreeVars: nil,
 																								},
 																								OriginalString: "1",
@@ -150161,7 +150261,7 @@ var _StdAst = &ast.DesugaredObject{
 																	Comment: []string{},
 																},
 															},
-															Ctx: p12328,
+															Ctx: p12324,
 															FreeVars: ast.Identifiers{
 																"arr",
 																"keyF",
@@ -150192,7 +150292,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12441,
+																		Ctx: p12437,
 																		FreeVars: ast.Identifiers{
 																			"keyF",
 																			"pivot",
@@ -150215,7 +150315,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12441,
+																			Ctx: p12437,
 																			FreeVars: ast.Identifiers{
 																				"std",
 																			},
@@ -150287,22 +150387,21 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12450,
+																						Ctx: p12446,
 																						FreeVars: ast.Identifiers{
 																							"keyF",
 																							"pivot",
 																						},
 																					},
 																					ParenLeftFodder: ast.Fodder{},
-																					Parameters: ast.Parameters{
-																						Required: []ast.CommaSeparatedID{
-																							ast.CommaSeparatedID{
-																								NameFodder: ast.Fodder{},
-																								Name: "x",
-																								CommaFodder: nil,
-																							},
+																					Parameters: []ast.Parameter{
+																						ast.Parameter{
+																							NameFodder: ast.Fodder{},
+																							Name: "x",
+																							EqFodder: nil,
+																							DefaultArg: nil,
+																							CommaFodder: nil,
 																						},
-																						Optional: nil,
 																					},
 																					TrailingComma: false,
 																					ParenRightFodder: ast.Fodder{},
@@ -150321,7 +150420,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12454,
+																							Ctx: p12450,
 																							FreeVars: ast.Identifiers{
 																								"keyF",
 																								"pivot",
@@ -150343,7 +150442,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12454,
+																								Ctx: p12450,
 																								FreeVars: ast.Identifiers{
 																									"keyF",
 																									"x",
@@ -150364,7 +150463,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12454,
+																									Ctx: p12450,
 																									FreeVars: ast.Identifiers{
 																										"keyF",
 																									},
@@ -150390,7 +150489,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p12462,
+																												Ctx: p12458,
 																												FreeVars: ast.Identifiers{
 																													"x",
 																												},
@@ -150424,7 +150523,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12454,
+																								Ctx: p12450,
 																								FreeVars: ast.Identifiers{
 																									"pivot",
 																								},
@@ -150451,7 +150550,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12450,
+																						Ctx: p12446,
 																						FreeVars: ast.Identifiers{
 																							"rest",
 																						},
@@ -150494,7 +150593,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p12328,
+																Ctx: p12324,
 																FreeVars: ast.Identifiers{
 																	"arr",
 																	"keyF",
@@ -150526,7 +150625,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12473,
+																			Ctx: p12469,
 																			FreeVars: ast.Identifiers{
 																				"keyF",
 																				"pivot",
@@ -150549,7 +150648,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12473,
+																				Ctx: p12469,
 																				FreeVars: ast.Identifiers{
 																					"std",
 																				},
@@ -150621,22 +150720,21 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12482,
+																							Ctx: p12478,
 																							FreeVars: ast.Identifiers{
 																								"keyF",
 																								"pivot",
 																							},
 																						},
 																						ParenLeftFodder: ast.Fodder{},
-																						Parameters: ast.Parameters{
-																							Required: []ast.CommaSeparatedID{
-																								ast.CommaSeparatedID{
-																									NameFodder: ast.Fodder{},
-																									Name: "x",
-																									CommaFodder: nil,
-																								},
+																						Parameters: []ast.Parameter{
+																							ast.Parameter{
+																								NameFodder: ast.Fodder{},
+																								Name: "x",
+																								EqFodder: nil,
+																								DefaultArg: nil,
+																								CommaFodder: nil,
 																							},
-																							Optional: nil,
 																						},
 																						TrailingComma: false,
 																						ParenRightFodder: ast.Fodder{},
@@ -150655,7 +150753,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12486,
+																								Ctx: p12482,
 																								FreeVars: ast.Identifiers{
 																									"keyF",
 																									"pivot",
@@ -150677,7 +150775,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12486,
+																									Ctx: p12482,
 																									FreeVars: ast.Identifiers{
 																										"keyF",
 																										"x",
@@ -150698,7 +150796,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p12486,
+																										Ctx: p12482,
 																										FreeVars: ast.Identifiers{
 																											"keyF",
 																										},
@@ -150724,7 +150822,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p12494,
+																													Ctx: p12490,
 																													FreeVars: ast.Identifiers{
 																														"x",
 																													},
@@ -150758,7 +150856,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12486,
+																									Ctx: p12482,
 																									FreeVars: ast.Identifiers{
 																										"pivot",
 																									},
@@ -150785,7 +150883,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12482,
+																							Ctx: p12478,
 																							FreeVars: ast.Identifiers{
 																								"rest",
 																							},
@@ -150821,7 +150919,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12328,
+																	Ctx: p12324,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																		"keyF",
@@ -150846,7 +150944,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12328,
+																		Ctx: p12324,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																			"keyF",
@@ -150870,7 +150968,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12328,
+																			Ctx: p12324,
 																			FreeVars: ast.Identifiers{
 																				"keyF",
 																				"left",
@@ -150899,7 +150997,7 @@ var _StdAst = &ast.DesugaredObject{
 																						Comment: []string{},
 																					},
 																				},
-																				Ctx: p12328,
+																				Ctx: p12324,
 																				FreeVars: ast.Identifiers{
 																					"quickSort",
 																				},
@@ -150925,7 +151023,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12511,
+																							Ctx: p12507,
 																							FreeVars: ast.Identifiers{
 																								"left",
 																							},
@@ -150950,7 +151048,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12511,
+																							Ctx: p12507,
 																							FreeVars: ast.Identifiers{
 																								"keyF",
 																							},
@@ -150984,7 +151082,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12328,
+																			Ctx: p12324,
 																			FreeVars: ast.Identifiers{
 																				"arr",
 																				"pos",
@@ -151007,7 +151105,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12519,
+																						Ctx: p12515,
 																						FreeVars: ast.Identifiers{
 																							"arr",
 																							"pos",
@@ -151028,7 +151126,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12519,
+																							Ctx: p12515,
 																							FreeVars: ast.Identifiers{
 																								"arr",
 																							},
@@ -151051,7 +151149,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12519,
+																							Ctx: p12515,
 																							FreeVars: ast.Identifiers{
 																								"pos",
 																							},
@@ -151085,7 +151183,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12328,
+																		Ctx: p12324,
 																		FreeVars: ast.Identifiers{
 																			"keyF",
 																			"quickSort",
@@ -151107,7 +151205,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12328,
+																			Ctx: p12324,
 																			FreeVars: ast.Identifiers{
 																				"quickSort",
 																			},
@@ -151133,7 +151231,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12531,
+																						Ctx: p12527,
 																						FreeVars: ast.Identifiers{
 																							"right",
 																						},
@@ -151158,7 +151256,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12531,
+																						Ctx: p12527,
 																						FreeVars: ast.Identifiers{
 																							"keyF",
 																						},
@@ -151210,7 +151308,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p12316,
+							Ctx: p12313,
 							FreeVars: ast.Identifiers{
 								"arr",
 								"keyF",
@@ -151238,27 +151336,28 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: nil,
-										Ctx: p12540,
+										Ctx: p12536,
 										FreeVars: ast.Identifiers{
 											"keyF",
 											"std",
 										},
 									},
 									ParenLeftFodder: ast.Fodder{},
-									Parameters: ast.Parameters{
-										Required: []ast.CommaSeparatedID{
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "a",
-												CommaFodder: ast.Fodder{},
-											},
-											ast.CommaSeparatedID{
-												NameFodder: ast.Fodder{},
-												Name: "b",
-												CommaFodder: nil,
-											},
+									Parameters: []ast.Parameter{
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "a",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: ast.Fodder{},
+										},
+										ast.Parameter{
+											NameFodder: ast.Fodder{},
+											Name: "b",
+											EqFodder: nil,
+											DefaultArg: nil,
+											CommaFodder: nil,
 										},
-										Optional: nil,
 									},
 									TrailingComma: false,
 									ParenRightFodder: ast.Fodder{},
@@ -151284,7 +151383,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p12545,
+											Ctx: p12541,
 											FreeVars: ast.Identifiers{
 												"a",
 												"b",
@@ -151312,7 +151411,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12549,
+														Ctx: p12545,
 														FreeVars: ast.Identifiers{
 															"a",
 															"std",
@@ -151333,7 +151432,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12549,
+															Ctx: p12545,
 															FreeVars: ast.Identifiers{
 																"std",
 															},
@@ -151405,7 +151504,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12558,
+																		Ctx: p12554,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																		},
@@ -151444,7 +151543,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12561,
+														Ctx: p12557,
 														FreeVars: ast.Identifiers{
 															"b",
 															"std",
@@ -151465,7 +151564,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12561,
+															Ctx: p12557,
 															FreeVars: ast.Identifiers{
 																"std",
 															},
@@ -151537,7 +151636,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12570,
+																		Ctx: p12566,
 																		FreeVars: ast.Identifiers{
 																			"b",
 																		},
@@ -151580,7 +151679,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p12545,
+												Ctx: p12541,
 												FreeVars: ast.Identifiers{
 													"a",
 													"b",
@@ -151610,7 +151709,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: nil,
-															Ctx: p12577,
+															Ctx: p12573,
 															FreeVars: ast.Identifiers{
 																"a",
 																"aux",
@@ -151622,25 +151721,28 @@ var _StdAst = &ast.DesugaredObject{
 															},
 														},
 														ParenLeftFodder: ast.Fodder{},
-														Parameters: ast.Parameters{
-															Required: []ast.CommaSeparatedID{
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "i",
-																	CommaFodder: ast.Fodder{},
-																},
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "j",
-																	CommaFodder: ast.Fodder{},
-																},
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "prefix",
-																	CommaFodder: nil,
-																},
+														Parameters: []ast.Parameter{
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "i",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: ast.Fodder{},
+															},
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "j",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: ast.Fodder{},
+															},
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "prefix",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: nil,
 															},
-															Optional: nil,
 														},
 														TrailingComma: false,
 														ParenRightFodder: ast.Fodder{},
@@ -151666,7 +151768,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p12582,
+																Ctx: p12578,
 																FreeVars: ast.Identifiers{
 																	"a",
 																	"aux",
@@ -151695,7 +151797,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12582,
+																	Ctx: p12578,
 																	FreeVars: ast.Identifiers{
 																		"i",
 																		"la",
@@ -151716,7 +151818,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12582,
+																		Ctx: p12578,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																		},
@@ -151740,7 +151842,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12582,
+																		Ctx: p12578,
 																		FreeVars: ast.Identifiers{
 																			"la",
 																		},
@@ -151764,7 +151866,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12582,
+																	Ctx: p12578,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																		"j",
@@ -151794,7 +151896,7 @@ var _StdAst = &ast.DesugaredObject{
 																				Comment: []string{},
 																			},
 																		},
-																		Ctx: p12582,
+																		Ctx: p12578,
 																		FreeVars: ast.Identifiers{
 																			"prefix",
 																		},
@@ -151912,7 +152014,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12582,
+																						Ctx: p12578,
 																						FreeVars: ast.Identifiers{
 																							"b",
 																						},
@@ -151937,7 +152039,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p12582,
+																						Ctx: p12578,
 																						FreeVars: ast.Identifiers{
 																							"j",
 																						},
@@ -152022,7 +152124,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12582,
+																	Ctx: p12578,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																		"aux",
@@ -152050,7 +152152,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12582,
+																		Ctx: p12578,
 																		FreeVars: ast.Identifiers{
 																			"j",
 																			"lb",
@@ -152071,7 +152173,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12582,
+																			Ctx: p12578,
 																			FreeVars: ast.Identifiers{
 																				"j",
 																			},
@@ -152095,7 +152197,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12582,
+																			Ctx: p12578,
 																			FreeVars: ast.Identifiers{
 																				"lb",
 																			},
@@ -152119,7 +152221,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12582,
+																		Ctx: p12578,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																			"i",
@@ -152149,7 +152251,7 @@ var _StdAst = &ast.DesugaredObject{
 																					Comment: []string{},
 																				},
 																			},
-																			Ctx: p12582,
+																			Ctx: p12578,
 																			FreeVars: ast.Identifiers{
 																				"prefix",
 																			},
@@ -152267,7 +152369,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12582,
+																							Ctx: p12578,
 																							FreeVars: ast.Identifiers{
 																								"a",
 																							},
@@ -152292,7 +152394,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12582,
+																							Ctx: p12578,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																							},
@@ -152384,7 +152486,7 @@ var _StdAst = &ast.DesugaredObject{
 																				Comment: []string{},
 																			},
 																		},
-																		Ctx: p12582,
+																		Ctx: p12578,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																			"aux",
@@ -152410,7 +152512,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12582,
+																			Ctx: p12578,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"b",
@@ -152434,7 +152536,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12582,
+																				Ctx: p12578,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																					"i",
@@ -152456,7 +152558,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12582,
+																					Ctx: p12578,
 																					FreeVars: ast.Identifiers{
 																						"keyF",
 																					},
@@ -152482,7 +152584,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12649,
+																								Ctx: p12645,
 																								FreeVars: ast.Identifiers{
 																									"a",
 																									"i",
@@ -152503,7 +152605,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12649,
+																									Ctx: p12645,
 																									FreeVars: ast.Identifiers{
 																										"a",
 																									},
@@ -152526,7 +152628,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12649,
+																									Ctx: p12645,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -152563,7 +152665,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12582,
+																				Ctx: p12578,
 																				FreeVars: ast.Identifiers{
 																					"b",
 																					"j",
@@ -152585,7 +152687,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p12582,
+																					Ctx: p12578,
 																					FreeVars: ast.Identifiers{
 																						"keyF",
 																					},
@@ -152611,7 +152713,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12661,
+																								Ctx: p12657,
 																								FreeVars: ast.Identifiers{
 																									"b",
 																									"j",
@@ -152632,7 +152734,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12661,
+																									Ctx: p12657,
 																									FreeVars: ast.Identifiers{
 																										"b",
 																									},
@@ -152655,7 +152757,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p12661,
+																									Ctx: p12657,
 																									FreeVars: ast.Identifiers{
 																										"j",
 																									},
@@ -152692,7 +152794,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12582,
+																			Ctx: p12578,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"aux",
@@ -152723,7 +152825,7 @@ var _StdAst = &ast.DesugaredObject{
 																						Comment: []string{},
 																					},
 																				},
-																				Ctx: p12582,
+																				Ctx: p12578,
 																				FreeVars: ast.Identifiers{
 																					"aux",
 																				},
@@ -152749,7 +152851,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12674,
+																							Ctx: p12670,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																							},
@@ -152769,7 +152871,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12674,
+																								Ctx: p12670,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -152793,7 +152895,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12674,
+																								Ctx: p12670,
 																								FreeVars: nil,
 																							},
 																							OriginalString: "1",
@@ -152817,7 +152919,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12674,
+																							Ctx: p12670,
 																							FreeVars: ast.Identifiers{
 																								"j",
 																							},
@@ -152842,7 +152944,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12674,
+																							Ctx: p12670,
 																							FreeVars: ast.Identifiers{
 																								"a",
 																								"i",
@@ -152864,7 +152966,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12674,
+																								Ctx: p12670,
 																								FreeVars: ast.Identifiers{
 																									"prefix",
 																								},
@@ -152888,7 +152990,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12674,
+																								Ctx: p12670,
 																								FreeVars: ast.Identifiers{
 																									"a",
 																									"i",
@@ -152911,7 +153013,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p12689,
+																											Ctx: p12685,
 																											FreeVars: ast.Identifiers{
 																												"a",
 																												"i",
@@ -152932,7 +153034,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p12689,
+																												Ctx: p12685,
 																												FreeVars: ast.Identifiers{
 																													"a",
 																												},
@@ -152955,7 +153057,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p12689,
+																												Ctx: p12685,
 																												FreeVars: ast.Identifiers{
 																													"i",
 																												},
@@ -153005,7 +153107,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12582,
+																			Ctx: p12578,
 																			FreeVars: ast.Identifiers{
 																				"aux",
 																				"b",
@@ -153036,7 +153138,7 @@ var _StdAst = &ast.DesugaredObject{
 																						Comment: []string{},
 																					},
 																				},
-																				Ctx: p12582,
+																				Ctx: p12578,
 																				FreeVars: ast.Identifiers{
 																					"aux",
 																				},
@@ -153062,7 +153164,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12703,
+																							Ctx: p12699,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																							},
@@ -153087,7 +153189,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12703,
+																							Ctx: p12699,
 																							FreeVars: ast.Identifiers{
 																								"j",
 																							},
@@ -153107,7 +153209,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12703,
+																								Ctx: p12699,
 																								FreeVars: ast.Identifiers{
 																									"j",
 																								},
@@ -153131,7 +153233,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12703,
+																								Ctx: p12699,
 																								FreeVars: nil,
 																							},
 																							OriginalString: "1",
@@ -153155,7 +153257,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12703,
+																							Ctx: p12699,
 																							FreeVars: ast.Identifiers{
 																								"b",
 																								"j",
@@ -153177,7 +153279,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12703,
+																								Ctx: p12699,
 																								FreeVars: ast.Identifiers{
 																									"prefix",
 																								},
@@ -153201,7 +153303,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p12703,
+																								Ctx: p12699,
 																								FreeVars: ast.Identifiers{
 																									"b",
 																									"j",
@@ -153224,7 +153326,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p12718,
+																											Ctx: p12714,
 																											FreeVars: ast.Identifiers{
 																												"b",
 																												"j",
@@ -153245,7 +153347,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p12718,
+																												Ctx: p12714,
 																												FreeVars: ast.Identifiers{
 																													"b",
 																												},
@@ -153268,7 +153370,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p12718,
+																												Ctx: p12714,
 																												FreeVars: ast.Identifiers{
 																													"j",
 																												},
@@ -153318,7 +153420,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12545,
+													Ctx: p12541,
 													FreeVars: ast.Identifiers{
 														"aux",
 													},
@@ -153345,7 +153447,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p12545,
+														Ctx: p12541,
 														FreeVars: ast.Identifiers{
 															"aux",
 														},
@@ -153371,7 +153473,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12731,
+																	Ctx: p12727,
 																	FreeVars: nil,
 																},
 																OriginalString: "0",
@@ -153394,7 +153496,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12731,
+																	Ctx: p12727,
 																	FreeVars: nil,
 																},
 																OriginalString: "0",
@@ -153417,7 +153519,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12731,
+																	Ctx: p12727,
 																	FreeVars: nil,
 																},
 																Elements: nil,
@@ -153463,7 +153565,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p12316,
+								Ctx: p12313,
 								FreeVars: ast.Identifiers{
 									"arr",
 									"keyF",
@@ -153492,7 +153594,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12739,
+											Ctx: p12735,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"std",
@@ -153513,7 +153615,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12739,
+												Ctx: p12735,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -153585,7 +153687,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12748,
+															Ctx: p12744,
 															FreeVars: ast.Identifiers{
 																"arr",
 															},
@@ -153628,7 +153730,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p12316,
+									Ctx: p12313,
 									FreeVars: ast.Identifiers{
 										"arr",
 										"keyF",
@@ -153653,7 +153755,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p12316,
+										Ctx: p12313,
 										FreeVars: ast.Identifiers{
 											"arr",
 											"std",
@@ -153674,7 +153776,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12316,
+											Ctx: p12313,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"std",
@@ -153695,7 +153797,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12316,
+												Ctx: p12313,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -153767,7 +153869,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p12764,
+															Ctx: p12760,
 															FreeVars: ast.Identifiers{
 																"arr",
 															},
@@ -153801,7 +153903,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12316,
+											Ctx: p12313,
 											FreeVars: nil,
 										},
 										OriginalString: "30",
@@ -153823,7 +153925,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p12316,
+										Ctx: p12313,
 										FreeVars: ast.Identifiers{
 											"arr",
 											"keyF",
@@ -153852,7 +153954,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p12316,
+											Ctx: p12313,
 											FreeVars: ast.Identifiers{
 												"quickSort",
 											},
@@ -153878,7 +153980,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12774,
+														Ctx: p12770,
 														FreeVars: ast.Identifiers{
 															"arr",
 														},
@@ -153908,7 +154010,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12774,
+														Ctx: p12770,
 														FreeVars: ast.Identifiers{
 															"keyF",
 														},
@@ -153954,7 +154056,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p12316,
+										Ctx: p12313,
 										FreeVars: ast.Identifiers{
 											"arr",
 											"keyF",
@@ -153983,7 +154085,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12785,
+													Ctx: p12781,
 													FreeVars: ast.Identifiers{
 														"l",
 														"std",
@@ -154004,7 +154106,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12785,
+														Ctx: p12781,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -154076,7 +154178,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12794,
+																	Ctx: p12790,
 																	FreeVars: ast.Identifiers{
 																		"l",
 																	},
@@ -154096,7 +154198,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12794,
+																		Ctx: p12790,
 																		FreeVars: ast.Identifiers{
 																			"l",
 																		},
@@ -154120,7 +154222,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12794,
+																		Ctx: p12790,
 																		FreeVars: nil,
 																	},
 																	OriginalString: "2",
@@ -154162,7 +154264,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p12316,
+											Ctx: p12313,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"keyF",
@@ -154285,7 +154387,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12812,
+																		Ctx: p12808,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																		},
@@ -154332,7 +154434,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12812,
+																		Ctx: p12808,
 																		FreeVars: ast.Identifiers{
 																			"mid",
 																		},
@@ -154487,7 +154589,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12827,
+																		Ctx: p12823,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																		},
@@ -154512,7 +154614,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12827,
+																		Ctx: p12823,
 																		FreeVars: ast.Identifiers{
 																			"mid",
 																		},
@@ -154592,7 +154694,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12316,
+												Ctx: p12313,
 												FreeVars: ast.Identifiers{
 													"keyF",
 													"left",
@@ -154623,7 +154725,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p12316,
+													Ctx: p12313,
 													FreeVars: ast.Identifiers{
 														"merge",
 													},
@@ -154649,7 +154751,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p12840,
+																Ctx: p12836,
 																FreeVars: ast.Identifiers{
 																	"keyF",
 																	"left",
@@ -154671,7 +154773,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12840,
+																	Ctx: p12836,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																	},
@@ -154743,7 +154845,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12849,
+																				Ctx: p12845,
 																				FreeVars: ast.Identifiers{
 																					"left",
 																				},
@@ -154773,7 +154875,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12849,
+																				Ctx: p12845,
 																				FreeVars: ast.Identifiers{
 																					"keyF",
 																				},
@@ -154807,7 +154909,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p12840,
+																Ctx: p12836,
 																FreeVars: ast.Identifiers{
 																	"keyF",
 																	"right",
@@ -154829,7 +154931,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12840,
+																	Ctx: p12836,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																	},
@@ -154901,7 +155003,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12863,
+																				Ctx: p12859,
 																				FreeVars: ast.Identifiers{
 																					"right",
 																				},
@@ -154931,7 +155033,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12863,
+																				Ctx: p12859,
 																				FreeVars: ast.Identifiers{
 																					"keyF",
 																				},
@@ -155012,43 +155114,41 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: ast.Fodder{},
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
 					},
-					Optional: []ast.NamedParameter{
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "keyF",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.Var{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(1190),
-											Column: int(18),
-										},
-										End: ast.Location{
-											Line: int(1190),
-											Column: int(20),
-										},
-										File: p1,
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "keyF",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.Var{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(1190),
+										Column: int(18),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p12874,
-									FreeVars: ast.Identifiers{
-										"id",
+									End: ast.Location{
+										Line: int(1190),
+										Column: int(20),
 									},
+									File: p1,
+								},
+								Fodder: ast.Fodder{},
+								Ctx: p12869,
+								FreeVars: ast.Identifiers{
+									"id",
 								},
-								Id: "id",
 							},
-							CommaFodder: ast.Fodder{},
+							Id: "id",
 						},
+						CommaFodder: ast.Fodder{},
 					},
 				},
 				TrailingComma: false,
@@ -155075,7 +155175,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p12874,
+						Ctx: p12869,
 						FreeVars: ast.Identifiers{
 							"arr",
 							"keyF",
@@ -155102,27 +155202,28 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: nil,
-									Ctx: p12881,
+									Ctx: p12876,
 									FreeVars: ast.Identifiers{
 										"keyF",
 										"std",
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "a",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "b",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "a",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "b",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -155148,7 +155249,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p12886,
+										Ctx: p12881,
 										FreeVars: ast.Identifiers{
 											"a",
 											"b",
@@ -155171,7 +155272,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12886,
+											Ctx: p12881,
 											FreeVars: ast.Identifiers{
 												"a",
 												"std",
@@ -155192,7 +155293,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12886,
+												Ctx: p12881,
 												FreeVars: ast.Identifiers{
 													"a",
 													"std",
@@ -155213,7 +155314,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12886,
+													Ctx: p12881,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -155285,7 +155386,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p12899,
+																Ctx: p12894,
 																FreeVars: ast.Identifiers{
 																	"a",
 																},
@@ -155319,7 +155420,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12886,
+												Ctx: p12881,
 												FreeVars: nil,
 											},
 											OriginalString: "0",
@@ -155348,7 +155449,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p12886,
+											Ctx: p12881,
 											FreeVars: ast.Identifiers{
 												"b",
 											},
@@ -155370,7 +155471,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12907,
+														Ctx: p12902,
 														FreeVars: ast.Identifiers{
 															"b",
 														},
@@ -155406,7 +155507,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12886,
+											Ctx: p12881,
 											FreeVars: ast.Identifiers{
 												"a",
 												"b",
@@ -155429,7 +155530,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12886,
+												Ctx: p12881,
 												FreeVars: ast.Identifiers{
 													"a",
 													"b",
@@ -155452,7 +155553,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12886,
+													Ctx: p12881,
 													FreeVars: ast.Identifiers{
 														"a",
 														"keyF",
@@ -155474,7 +155575,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12886,
+														Ctx: p12881,
 														FreeVars: ast.Identifiers{
 															"keyF",
 														},
@@ -155500,7 +155601,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12920,
+																	Ctx: p12915,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																		"std",
@@ -155521,7 +155622,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12920,
+																		Ctx: p12915,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																		},
@@ -155544,7 +155645,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p12920,
+																		Ctx: p12915,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																			"std",
@@ -155565,7 +155666,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12920,
+																			Ctx: p12915,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"std",
@@ -155586,7 +155687,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p12920,
+																				Ctx: p12915,
 																				FreeVars: ast.Identifiers{
 																					"std",
 																				},
@@ -155658,7 +155759,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p12935,
+																							Ctx: p12930,
 																							FreeVars: ast.Identifiers{
 																								"a",
 																							},
@@ -155692,7 +155793,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p12920,
+																			Ctx: p12915,
 																			FreeVars: nil,
 																		},
 																		OriginalString: "1",
@@ -155728,7 +155829,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12886,
+													Ctx: p12881,
 													FreeVars: ast.Identifiers{
 														"b",
 														"keyF",
@@ -155749,7 +155850,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p12886,
+														Ctx: p12881,
 														FreeVars: ast.Identifiers{
 															"keyF",
 														},
@@ -155775,7 +155876,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p12944,
+																	Ctx: p12939,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -155816,7 +155917,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p12886,
+												Ctx: p12881,
 												FreeVars: ast.Identifiers{
 													"a",
 												},
@@ -155846,7 +155947,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p12886,
+												Ctx: p12881,
 												FreeVars: ast.Identifiers{
 													"a",
 													"b",
@@ -155874,7 +155975,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p12886,
+													Ctx: p12881,
 													FreeVars: ast.Identifiers{
 														"a",
 													},
@@ -155898,7 +155999,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p12886,
+													Ctx: p12881,
 													FreeVars: ast.Identifiers{
 														"b",
 													},
@@ -155920,7 +156021,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p12959,
+																Ctx: p12954,
 																FreeVars: ast.Identifiers{
 																	"b",
 																},
@@ -155956,7 +156057,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p12874,
+							Ctx: p12869,
 							FreeVars: ast.Identifiers{
 								"arr",
 								"f",
@@ -155978,7 +156079,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p12874,
+								Ctx: p12869,
 								FreeVars: ast.Identifiers{
 									"std",
 								},
@@ -156057,7 +156158,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12971,
+											Ctx: p12966,
 											FreeVars: ast.Identifiers{
 												"f",
 											},
@@ -156082,7 +156183,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12971,
+											Ctx: p12966,
 											FreeVars: ast.Identifiers{
 												"arr",
 											},
@@ -156107,7 +156208,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12971,
+											Ctx: p12966,
 											FreeVars: nil,
 										},
 										Elements: nil,
@@ -156174,43 +156275,41 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: ast.Fodder{},
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
 					},
-					Optional: []ast.NamedParameter{
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "keyF",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.Var{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(1200),
-											Column: int(17),
-										},
-										End: ast.Location{
-											Line: int(1200),
-											Column: int(19),
-										},
-										File: p1,
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "keyF",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.Var{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(1200),
+										Column: int(17),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p12982,
-									FreeVars: ast.Identifiers{
-										"id",
+									End: ast.Location{
+										Line: int(1200),
+										Column: int(19),
 									},
+									File: p1,
+								},
+								Fodder: ast.Fodder{},
+								Ctx: p12976,
+								FreeVars: ast.Identifiers{
+									"id",
 								},
-								Id: "id",
 							},
-							CommaFodder: ast.Fodder{},
+							Id: "id",
 						},
+						CommaFodder: ast.Fodder{},
 					},
 				},
 				TrailingComma: false,
@@ -156230,7 +156329,7 @@ var _StdAst = &ast.DesugaredObject{
 							File: p1,
 						},
 						Fodder: ast.Fodder{},
-						Ctx: p12982,
+						Ctx: p12976,
 						FreeVars: ast.Identifiers{
 							"arr",
 							"keyF",
@@ -156252,7 +156351,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p12982,
+							Ctx: p12976,
 							FreeVars: ast.Identifiers{
 								"std",
 							},
@@ -156331,7 +156430,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p12994,
+										Ctx: p12988,
 										FreeVars: ast.Identifiers{
 											"arr",
 											"keyF",
@@ -156353,7 +156452,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p12994,
+											Ctx: p12988,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -156425,7 +156524,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13003,
+														Ctx: p12997,
 														FreeVars: ast.Identifiers{
 															"arr",
 														},
@@ -156450,7 +156549,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13003,
+														Ctx: p12997,
 														FreeVars: ast.Identifiers{
 															"keyF",
 														},
@@ -156485,7 +156584,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p12994,
+										Ctx: p12988,
 										FreeVars: ast.Identifiers{
 											"keyF",
 										},
@@ -156551,48 +156650,48 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "x",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: ast.Fodder{},
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "x",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
 					},
-					Optional: []ast.NamedParameter{
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "keyF",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.Var{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(1203),
-											Column: int(26),
-										},
-										End: ast.Location{
-											Line: int(1203),
-											Column: int(28),
-										},
-										File: p1,
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "keyF",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.Var{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(1203),
+										Column: int(26),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p13015,
-									FreeVars: ast.Identifiers{
-										"id",
+									End: ast.Location{
+										Line: int(1203),
+										Column: int(28),
 									},
+									File: p1,
+								},
+								Fodder: ast.Fodder{},
+								Ctx: p13008,
+								FreeVars: ast.Identifiers{
+									"id",
 								},
-								Id: "id",
 							},
-							CommaFodder: ast.Fodder{},
+							Id: "id",
 						},
+						CommaFodder: ast.Fodder{},
 					},
 				},
 				TrailingComma: false,
@@ -156612,7 +156711,7 @@ var _StdAst = &ast.DesugaredObject{
 							File: p1,
 						},
 						Fodder: ast.Fodder{},
-						Ctx: p13015,
+						Ctx: p13008,
 						FreeVars: ast.Identifiers{
 							"arr",
 							"keyF",
@@ -156635,7 +156734,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p13015,
+							Ctx: p13008,
 							FreeVars: ast.Identifiers{
 								"arr",
 								"keyF",
@@ -156658,7 +156757,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p13015,
+								Ctx: p13008,
 								FreeVars: ast.Identifiers{
 									"std",
 								},
@@ -156745,7 +156844,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13030,
+											Ctx: p13023,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"keyF",
@@ -156768,7 +156867,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13030,
+												Ctx: p13023,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -156840,7 +156939,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13039,
+															Ctx: p13032,
 															FreeVars: ast.Identifiers{
 																"x",
 															},
@@ -156862,7 +156961,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13043,
+																		Ctx: p13036,
 																		FreeVars: ast.Identifiers{
 																			"x",
 																		},
@@ -156893,7 +156992,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13039,
+															Ctx: p13032,
 															FreeVars: ast.Identifiers{
 																"arr",
 															},
@@ -156918,7 +157017,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13039,
+															Ctx: p13032,
 															FreeVars: ast.Identifiers{
 																"keyF",
 															},
@@ -156962,7 +157061,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p13015,
+							Ctx: p13008,
 							FreeVars: nil,
 						},
 						OriginalString: "0",
@@ -157017,48 +157116,48 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: ast.Fodder{},
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
 					},
-					Optional: []ast.NamedParameter{
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "keyF",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.Var{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(1207),
-											Column: int(23),
-										},
-										End: ast.Location{
-											Line: int(1207),
-											Column: int(25),
-										},
-										File: p1,
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "keyF",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.Var{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(1207),
+										Column: int(23),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p13056,
-									FreeVars: ast.Identifiers{
-										"id",
+									End: ast.Location{
+										Line: int(1207),
+										Column: int(25),
 									},
+									File: p1,
+								},
+								Fodder: ast.Fodder{},
+								Ctx: p13048,
+								FreeVars: ast.Identifiers{
+									"id",
 								},
-								Id: "id",
 							},
-							CommaFodder: ast.Fodder{},
+							Id: "id",
 						},
+						CommaFodder: ast.Fodder{},
 					},
 				},
 				TrailingComma: false,
@@ -157093,7 +157192,7 @@ var _StdAst = &ast.DesugaredObject{
 								},
 							},
 						},
-						Ctx: p13056,
+						Ctx: p13048,
 						FreeVars: ast.Identifiers{
 							"a",
 							"b",
@@ -157121,7 +157220,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: nil,
-									Ctx: p13064,
+									Ctx: p13056,
 									FreeVars: ast.Identifiers{
 										"aux",
 										"keyF",
@@ -157129,35 +157228,42 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "a",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "b",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "i",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "j",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "acc",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "a",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "b",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "i",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "j",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "acc",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -157183,7 +157289,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p13069,
+										Ctx: p13061,
 										FreeVars: ast.Identifiers{
 											"a",
 											"acc",
@@ -157210,7 +157316,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13069,
+											Ctx: p13061,
 											FreeVars: ast.Identifiers{
 												"a",
 												"i",
@@ -157232,7 +157338,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13069,
+												Ctx: p13061,
 												FreeVars: ast.Identifiers{
 													"i",
 												},
@@ -157256,7 +157362,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13069,
+												Ctx: p13061,
 												FreeVars: ast.Identifiers{
 													"a",
 													"std",
@@ -157277,7 +157383,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13069,
+													Ctx: p13061,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -157349,7 +157455,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13084,
+																Ctx: p13076,
 																FreeVars: ast.Identifiers{
 																	"a",
 																},
@@ -157383,7 +157489,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13069,
+											Ctx: p13061,
 											FreeVars: ast.Identifiers{
 												"acc",
 												"b",
@@ -157413,7 +157519,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p13069,
+												Ctx: p13061,
 												FreeVars: ast.Identifiers{
 													"acc",
 												},
@@ -157531,7 +157637,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13069,
+																Ctx: p13061,
 																FreeVars: ast.Identifiers{
 																	"b",
 																},
@@ -157556,7 +157662,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13069,
+																Ctx: p13061,
 																FreeVars: ast.Identifiers{
 																	"j",
 																},
@@ -157641,7 +157747,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13069,
+											Ctx: p13061,
 											FreeVars: ast.Identifiers{
 												"a",
 												"acc",
@@ -157668,7 +157774,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13069,
+												Ctx: p13061,
 												FreeVars: ast.Identifiers{
 													"b",
 													"j",
@@ -157690,7 +157796,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13069,
+													Ctx: p13061,
 													FreeVars: ast.Identifiers{
 														"j",
 													},
@@ -157714,7 +157820,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13069,
+													Ctx: p13061,
 													FreeVars: ast.Identifiers{
 														"b",
 														"std",
@@ -157735,7 +157841,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13069,
+														Ctx: p13061,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -157807,7 +157913,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13121,
+																	Ctx: p13113,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -157841,7 +157947,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13069,
+												Ctx: p13061,
 												FreeVars: ast.Identifiers{
 													"a",
 													"acc",
@@ -157871,7 +157977,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p13069,
+													Ctx: p13061,
 													FreeVars: ast.Identifiers{
 														"acc",
 													},
@@ -157989,7 +158095,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13069,
+																	Ctx: p13061,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																	},
@@ -158014,7 +158120,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13069,
+																	Ctx: p13061,
 																	FreeVars: ast.Identifiers{
 																		"i",
 																	},
@@ -158106,7 +158212,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p13069,
+												Ctx: p13061,
 												FreeVars: ast.Identifiers{
 													"a",
 													"acc",
@@ -158137,7 +158243,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13148,
+															Ctx: p13140,
 															FreeVars: ast.Identifiers{
 																"a",
 																"i",
@@ -158159,7 +158265,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13148,
+																Ctx: p13140,
 																FreeVars: ast.Identifiers{
 																	"keyF",
 																},
@@ -158185,7 +158291,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13154,
+																			Ctx: p13146,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"i",
@@ -158206,7 +158312,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13154,
+																				Ctx: p13146,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																				},
@@ -158229,7 +158335,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13154,
+																				Ctx: p13146,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -158275,7 +158381,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p13069,
+													Ctx: p13061,
 													FreeVars: ast.Identifiers{
 														"a",
 														"acc",
@@ -158307,7 +158413,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13165,
+																Ctx: p13157,
 																FreeVars: ast.Identifiers{
 																	"b",
 																	"j",
@@ -158329,7 +158435,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13165,
+																	Ctx: p13157,
 																	FreeVars: ast.Identifiers{
 																		"keyF",
 																	},
@@ -158355,7 +158461,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13171,
+																				Ctx: p13163,
 																				FreeVars: ast.Identifiers{
 																					"b",
 																					"j",
@@ -158376,7 +158482,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13171,
+																					Ctx: p13163,
 																					FreeVars: ast.Identifiers{
 																						"b",
 																					},
@@ -158399,7 +158505,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13171,
+																					Ctx: p13163,
 																					FreeVars: ast.Identifiers{
 																						"j",
 																					},
@@ -158445,7 +158551,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p13069,
+														Ctx: p13061,
 														FreeVars: ast.Identifiers{
 															"a",
 															"acc",
@@ -158472,7 +158578,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13069,
+															Ctx: p13061,
 															FreeVars: ast.Identifiers{
 																"ak",
 																"bk",
@@ -158493,7 +158599,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13069,
+																Ctx: p13061,
 																FreeVars: ast.Identifiers{
 																	"ak",
 																},
@@ -158517,7 +158623,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13069,
+																Ctx: p13061,
 																FreeVars: ast.Identifiers{
 																	"bk",
 																},
@@ -158541,7 +158647,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13069,
+															Ctx: p13061,
 															FreeVars: ast.Identifiers{
 																"a",
 																"acc",
@@ -158573,7 +158679,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p13069,
+																Ctx: p13061,
 																FreeVars: ast.Identifiers{
 																	"aux",
 																},
@@ -158599,7 +158705,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13193,
+																			Ctx: p13185,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																			},
@@ -158624,7 +158730,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13193,
+																			Ctx: p13185,
 																			FreeVars: ast.Identifiers{
 																				"b",
 																			},
@@ -158649,7 +158755,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13193,
+																			Ctx: p13185,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																			},
@@ -158669,7 +158775,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13193,
+																				Ctx: p13185,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -158693,7 +158799,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13193,
+																				Ctx: p13185,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "1",
@@ -158717,7 +158823,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13193,
+																			Ctx: p13185,
 																			FreeVars: ast.Identifiers{
 																				"j",
 																			},
@@ -158737,7 +158843,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13193,
+																				Ctx: p13185,
 																				FreeVars: ast.Identifiers{
 																					"j",
 																				},
@@ -158761,7 +158867,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13193,
+																				Ctx: p13185,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "1",
@@ -158785,7 +158891,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13193,
+																			Ctx: p13185,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"acc",
@@ -158807,7 +158913,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13193,
+																				Ctx: p13185,
 																				FreeVars: ast.Identifiers{
 																					"acc",
 																				},
@@ -158831,7 +158937,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13193,
+																				Ctx: p13185,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																					"i",
@@ -158854,7 +158960,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p13215,
+																							Ctx: p13207,
 																							FreeVars: ast.Identifiers{
 																								"a",
 																								"i",
@@ -158875,7 +158981,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p13215,
+																								Ctx: p13207,
 																								FreeVars: ast.Identifiers{
 																									"a",
 																								},
@@ -158898,7 +159004,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p13215,
+																								Ctx: p13207,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -158948,7 +159054,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13069,
+															Ctx: p13061,
 															FreeVars: ast.Identifiers{
 																"a",
 																"acc",
@@ -158975,7 +159081,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13069,
+																Ctx: p13061,
 																FreeVars: ast.Identifiers{
 																	"ak",
 																	"bk",
@@ -158996,7 +159102,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13069,
+																	Ctx: p13061,
 																	FreeVars: ast.Identifiers{
 																		"ak",
 																	},
@@ -159020,7 +159126,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13069,
+																	Ctx: p13061,
 																	FreeVars: ast.Identifiers{
 																		"bk",
 																	},
@@ -159044,7 +159150,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13069,
+																Ctx: p13061,
 																FreeVars: ast.Identifiers{
 																	"a",
 																	"acc",
@@ -159076,7 +159182,7 @@ var _StdAst = &ast.DesugaredObject{
 																			Comment: []string{},
 																		},
 																	},
-																	Ctx: p13069,
+																	Ctx: p13061,
 																	FreeVars: ast.Identifiers{
 																		"aux",
 																	},
@@ -159102,7 +159208,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13237,
+																				Ctx: p13229,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																				},
@@ -159127,7 +159233,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13237,
+																				Ctx: p13229,
 																				FreeVars: ast.Identifiers{
 																					"b",
 																				},
@@ -159152,7 +159258,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13237,
+																				Ctx: p13229,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -159172,7 +159278,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13237,
+																					Ctx: p13229,
 																					FreeVars: ast.Identifiers{
 																						"i",
 																					},
@@ -159196,7 +159302,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13237,
+																					Ctx: p13229,
 																					FreeVars: nil,
 																				},
 																				OriginalString: "1",
@@ -159220,7 +159326,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13237,
+																				Ctx: p13229,
 																				FreeVars: ast.Identifiers{
 																					"j",
 																				},
@@ -159245,7 +159351,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13237,
+																				Ctx: p13229,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																					"acc",
@@ -159267,7 +159373,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13237,
+																					Ctx: p13229,
 																					FreeVars: ast.Identifiers{
 																						"acc",
 																					},
@@ -159291,7 +159397,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13237,
+																					Ctx: p13229,
 																					FreeVars: ast.Identifiers{
 																						"a",
 																						"i",
@@ -159314,7 +159420,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p13256,
+																								Ctx: p13248,
 																								FreeVars: ast.Identifiers{
 																									"a",
 																									"i",
@@ -159335,7 +159441,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p13256,
+																									Ctx: p13248,
 																									FreeVars: ast.Identifiers{
 																										"a",
 																									},
@@ -159358,7 +159464,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p13256,
+																									Ctx: p13248,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -159408,7 +159514,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13069,
+																Ctx: p13061,
 																FreeVars: ast.Identifiers{
 																	"a",
 																	"acc",
@@ -159440,7 +159546,7 @@ var _StdAst = &ast.DesugaredObject{
 																			Comment: []string{},
 																		},
 																	},
-																	Ctx: p13069,
+																	Ctx: p13061,
 																	FreeVars: ast.Identifiers{
 																		"aux",
 																	},
@@ -159466,7 +159572,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13270,
+																				Ctx: p13262,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																				},
@@ -159491,7 +159597,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13270,
+																				Ctx: p13262,
 																				FreeVars: ast.Identifiers{
 																					"b",
 																				},
@@ -159516,7 +159622,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13270,
+																				Ctx: p13262,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -159541,7 +159647,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13270,
+																				Ctx: p13262,
 																				FreeVars: ast.Identifiers{
 																					"j",
 																				},
@@ -159561,7 +159667,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13270,
+																					Ctx: p13262,
 																					FreeVars: ast.Identifiers{
 																						"j",
 																					},
@@ -159585,7 +159691,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13270,
+																					Ctx: p13262,
 																					FreeVars: nil,
 																				},
 																				OriginalString: "1",
@@ -159609,7 +159715,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13270,
+																				Ctx: p13262,
 																				FreeVars: ast.Identifiers{
 																					"acc",
 																					"b",
@@ -159631,7 +159737,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13270,
+																					Ctx: p13262,
 																					FreeVars: ast.Identifiers{
 																						"acc",
 																					},
@@ -159655,7 +159761,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13270,
+																					Ctx: p13262,
 																					FreeVars: ast.Identifiers{
 																						"b",
 																						"j",
@@ -159678,7 +159784,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p13289,
+																								Ctx: p13281,
 																								FreeVars: ast.Identifiers{
 																									"b",
 																									"j",
@@ -159699,7 +159805,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p13289,
+																									Ctx: p13281,
 																									FreeVars: ast.Identifiers{
 																										"b",
 																									},
@@ -159722,7 +159828,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p13289,
+																									Ctx: p13281,
 																									FreeVars: ast.Identifiers{
 																										"j",
 																									},
@@ -159775,7 +159881,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p13056,
+							Ctx: p13048,
 							FreeVars: ast.Identifiers{
 								"a",
 								"aux",
@@ -159804,7 +159910,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p13056,
+								Ctx: p13048,
 								FreeVars: ast.Identifiers{
 									"aux",
 								},
@@ -159830,7 +159936,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13302,
+											Ctx: p13294,
 											FreeVars: ast.Identifiers{
 												"a",
 											},
@@ -159855,7 +159961,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13302,
+											Ctx: p13294,
 											FreeVars: ast.Identifiers{
 												"b",
 											},
@@ -159880,7 +159986,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13302,
+											Ctx: p13294,
 											FreeVars: nil,
 										},
 										OriginalString: "0",
@@ -159903,7 +160009,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13302,
+											Ctx: p13294,
 											FreeVars: nil,
 										},
 										OriginalString: "0",
@@ -159926,7 +160032,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13302,
+											Ctx: p13294,
 											FreeVars: nil,
 										},
 										Elements: nil,
@@ -159993,48 +160099,48 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: ast.Fodder{},
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
 					},
-					Optional: []ast.NamedParameter{
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "keyF",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.Var{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(1225),
-											Column: int(23),
-										},
-										End: ast.Location{
-											Line: int(1225),
-											Column: int(25),
-										},
-										File: p1,
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "keyF",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.Var{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(1225),
+										Column: int(23),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p13315,
-									FreeVars: ast.Identifiers{
-										"id",
+									End: ast.Location{
+										Line: int(1225),
+										Column: int(25),
 									},
+									File: p1,
+								},
+								Fodder: ast.Fodder{},
+								Ctx: p13306,
+								FreeVars: ast.Identifiers{
+									"id",
 								},
-								Id: "id",
 							},
-							CommaFodder: ast.Fodder{},
+							Id: "id",
 						},
+						CommaFodder: ast.Fodder{},
 					},
 				},
 				TrailingComma: false,
@@ -160061,7 +160167,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p13315,
+						Ctx: p13306,
 						FreeVars: ast.Identifiers{
 							"a",
 							"b",
@@ -160089,7 +160195,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: nil,
-									Ctx: p13322,
+									Ctx: p13313,
 									FreeVars: ast.Identifiers{
 										"aux",
 										"keyF",
@@ -160097,35 +160203,42 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "a",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "b",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "i",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "j",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "acc",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "a",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "b",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "i",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "j",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "acc",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -160151,7 +160264,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p13327,
+										Ctx: p13318,
 										FreeVars: ast.Identifiers{
 											"a",
 											"acc",
@@ -160178,7 +160291,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13327,
+											Ctx: p13318,
 											FreeVars: ast.Identifiers{
 												"a",
 												"b",
@@ -160202,7 +160315,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13327,
+												Ctx: p13318,
 												FreeVars: ast.Identifiers{
 													"a",
 													"i",
@@ -160224,7 +160337,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"i",
 													},
@@ -160248,7 +160361,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"a",
 														"std",
@@ -160269,7 +160382,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13327,
+														Ctx: p13318,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -160341,7 +160454,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13344,
+																	Ctx: p13335,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																	},
@@ -160376,7 +160489,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13327,
+												Ctx: p13318,
 												FreeVars: ast.Identifiers{
 													"b",
 													"j",
@@ -160398,7 +160511,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"j",
 													},
@@ -160422,7 +160535,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"b",
 														"std",
@@ -160443,7 +160556,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13327,
+														Ctx: p13318,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -160515,7 +160628,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13359,
+																	Ctx: p13350,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -160557,7 +160670,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p13327,
+											Ctx: p13318,
 											FreeVars: ast.Identifiers{
 												"acc",
 											},
@@ -160594,7 +160707,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p13327,
+											Ctx: p13318,
 											FreeVars: ast.Identifiers{
 												"a",
 												"acc",
@@ -160620,7 +160733,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13327,
+												Ctx: p13318,
 												FreeVars: ast.Identifiers{
 													"a",
 													"b",
@@ -160644,7 +160757,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"a",
 														"i",
@@ -160666,7 +160779,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13327,
+														Ctx: p13318,
 														FreeVars: ast.Identifiers{
 															"keyF",
 														},
@@ -160692,7 +160805,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13376,
+																	Ctx: p13367,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																		"i",
@@ -160713,7 +160826,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13376,
+																		Ctx: p13367,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																		},
@@ -160736,7 +160849,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13376,
+																		Ctx: p13367,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																		},
@@ -160773,7 +160886,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"b",
 														"j",
@@ -160795,7 +160908,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13327,
+														Ctx: p13318,
 														FreeVars: ast.Identifiers{
 															"keyF",
 														},
@@ -160821,7 +160934,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13388,
+																	Ctx: p13379,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																		"j",
@@ -160842,7 +160955,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13388,
+																		Ctx: p13379,
 																		FreeVars: ast.Identifiers{
 																			"b",
 																		},
@@ -160865,7 +160978,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13388,
+																		Ctx: p13379,
 																		FreeVars: ast.Identifiers{
 																			"j",
 																		},
@@ -160902,7 +161015,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13327,
+												Ctx: p13318,
 												FreeVars: ast.Identifiers{
 													"a",
 													"acc",
@@ -160934,7 +161047,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"aux",
 													},
@@ -160960,7 +161073,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13401,
+																Ctx: p13392,
 																FreeVars: ast.Identifiers{
 																	"a",
 																},
@@ -160985,7 +161098,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13401,
+																Ctx: p13392,
 																FreeVars: ast.Identifiers{
 																	"b",
 																},
@@ -161010,7 +161123,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13401,
+																Ctx: p13392,
 																FreeVars: ast.Identifiers{
 																	"i",
 																},
@@ -161030,7 +161143,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13401,
+																	Ctx: p13392,
 																	FreeVars: ast.Identifiers{
 																		"i",
 																	},
@@ -161054,7 +161167,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13401,
+																	Ctx: p13392,
 																	FreeVars: nil,
 																},
 																OriginalString: "1",
@@ -161078,7 +161191,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13401,
+																Ctx: p13392,
 																FreeVars: ast.Identifiers{
 																	"j",
 																},
@@ -161098,7 +161211,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13401,
+																	Ctx: p13392,
 																	FreeVars: ast.Identifiers{
 																		"j",
 																	},
@@ -161122,7 +161235,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13401,
+																	Ctx: p13392,
 																	FreeVars: nil,
 																},
 																OriginalString: "1",
@@ -161146,7 +161259,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13401,
+																Ctx: p13392,
 																FreeVars: ast.Identifiers{
 																	"a",
 																	"acc",
@@ -161168,7 +161281,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13401,
+																	Ctx: p13392,
 																	FreeVars: ast.Identifiers{
 																		"acc",
 																	},
@@ -161192,7 +161305,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13401,
+																	Ctx: p13392,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																		"i",
@@ -161215,7 +161328,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13423,
+																				Ctx: p13414,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																					"i",
@@ -161236,7 +161349,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13423,
+																					Ctx: p13414,
 																					FreeVars: ast.Identifiers{
 																						"a",
 																					},
@@ -161259,7 +161372,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13423,
+																					Ctx: p13414,
 																					FreeVars: ast.Identifiers{
 																						"i",
 																					},
@@ -161309,7 +161422,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13327,
+												Ctx: p13318,
 												FreeVars: ast.Identifiers{
 													"a",
 													"acc",
@@ -161335,7 +161448,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"a",
 														"b",
@@ -161359,7 +161472,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13327,
+														Ctx: p13318,
 														FreeVars: ast.Identifiers{
 															"a",
 															"i",
@@ -161381,7 +161494,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13327,
+															Ctx: p13318,
 															FreeVars: ast.Identifiers{
 																"keyF",
 															},
@@ -161407,7 +161520,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13440,
+																		Ctx: p13431,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																			"i",
@@ -161428,7 +161541,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13440,
+																			Ctx: p13431,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																			},
@@ -161451,7 +161564,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13440,
+																			Ctx: p13431,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																			},
@@ -161488,7 +161601,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13327,
+														Ctx: p13318,
 														FreeVars: ast.Identifiers{
 															"b",
 															"j",
@@ -161510,7 +161623,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13327,
+															Ctx: p13318,
 															FreeVars: ast.Identifiers{
 																"keyF",
 															},
@@ -161536,7 +161649,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13452,
+																		Ctx: p13443,
 																		FreeVars: ast.Identifiers{
 																			"b",
 																			"j",
@@ -161557,7 +161670,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13452,
+																			Ctx: p13443,
 																			FreeVars: ast.Identifiers{
 																				"b",
 																			},
@@ -161580,7 +161693,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13452,
+																			Ctx: p13443,
 																			FreeVars: ast.Identifiers{
 																				"j",
 																			},
@@ -161617,7 +161730,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"a",
 														"acc",
@@ -161649,7 +161762,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p13327,
+														Ctx: p13318,
 														FreeVars: ast.Identifiers{
 															"aux",
 														},
@@ -161675,7 +161788,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13465,
+																	Ctx: p13456,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																	},
@@ -161700,7 +161813,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13465,
+																	Ctx: p13456,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -161725,7 +161838,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13465,
+																	Ctx: p13456,
 																	FreeVars: ast.Identifiers{
 																		"i",
 																	},
@@ -161745,7 +161858,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13465,
+																		Ctx: p13456,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																		},
@@ -161769,7 +161882,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13465,
+																		Ctx: p13456,
 																		FreeVars: nil,
 																	},
 																	OriginalString: "1",
@@ -161793,7 +161906,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13465,
+																	Ctx: p13456,
 																	FreeVars: ast.Identifiers{
 																		"j",
 																	},
@@ -161818,7 +161931,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13465,
+																	Ctx: p13456,
 																	FreeVars: ast.Identifiers{
 																		"acc",
 																	},
@@ -161858,7 +161971,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13327,
+													Ctx: p13318,
 													FreeVars: ast.Identifiers{
 														"a",
 														"acc",
@@ -161890,7 +162003,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p13327,
+														Ctx: p13318,
 														FreeVars: ast.Identifiers{
 															"aux",
 														},
@@ -161916,7 +162029,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13486,
+																	Ctx: p13477,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																	},
@@ -161941,7 +162054,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13486,
+																	Ctx: p13477,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -161966,7 +162079,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13486,
+																	Ctx: p13477,
 																	FreeVars: ast.Identifiers{
 																		"i",
 																	},
@@ -161991,7 +162104,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13486,
+																	Ctx: p13477,
 																	FreeVars: ast.Identifiers{
 																		"j",
 																	},
@@ -162011,7 +162124,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13486,
+																		Ctx: p13477,
 																		FreeVars: ast.Identifiers{
 																			"j",
 																		},
@@ -162035,7 +162148,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13486,
+																		Ctx: p13477,
 																		FreeVars: nil,
 																	},
 																	OriginalString: "1",
@@ -162059,7 +162172,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13486,
+																	Ctx: p13477,
 																	FreeVars: ast.Identifiers{
 																		"acc",
 																	},
@@ -162099,7 +162212,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p13315,
+							Ctx: p13306,
 							FreeVars: ast.Identifiers{
 								"a",
 								"aux",
@@ -162128,7 +162241,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p13315,
+								Ctx: p13306,
 								FreeVars: ast.Identifiers{
 									"aux",
 								},
@@ -162154,7 +162267,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13506,
+											Ctx: p13497,
 											FreeVars: ast.Identifiers{
 												"a",
 											},
@@ -162179,7 +162292,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13506,
+											Ctx: p13497,
 											FreeVars: ast.Identifiers{
 												"b",
 											},
@@ -162204,7 +162317,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13506,
+											Ctx: p13497,
 											FreeVars: nil,
 										},
 										OriginalString: "0",
@@ -162227,7 +162340,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13506,
+											Ctx: p13497,
 											FreeVars: nil,
 										},
 										OriginalString: "0",
@@ -162250,7 +162363,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13506,
+											Ctx: p13497,
 											FreeVars: nil,
 										},
 										Elements: nil,
@@ -162317,48 +162430,48 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: ast.Fodder{},
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
 					},
-					Optional: []ast.NamedParameter{
-						ast.NamedParameter{
-							NameFodder: ast.Fodder{},
-							Name: "keyF",
-							EqFodder: ast.Fodder{},
-							DefaultArg: &ast.Var{
-								NodeBase: ast.NodeBase{
-									LocRange: ast.LocationRange{
-										FileName: "<std>",
-										Begin: ast.Location{
-											Line: int(1238),
-											Column: int(22),
-										},
-										End: ast.Location{
-											Line: int(1238),
-											Column: int(24),
-										},
-										File: p1,
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "keyF",
+						EqFodder: ast.Fodder{},
+						DefaultArg: &ast.Var{
+							NodeBase: ast.NodeBase{
+								LocRange: ast.LocationRange{
+									FileName: "<std>",
+									Begin: ast.Location{
+										Line: int(1238),
+										Column: int(22),
 									},
-									Fodder: ast.Fodder{},
-									Ctx: p13519,
-									FreeVars: ast.Identifiers{
-										"id",
+									End: ast.Location{
+										Line: int(1238),
+										Column: int(24),
 									},
+									File: p1,
+								},
+								Fodder: ast.Fodder{},
+								Ctx: p13509,
+								FreeVars: ast.Identifiers{
+									"id",
 								},
-								Id: "id",
 							},
-							CommaFodder: ast.Fodder{},
+							Id: "id",
 						},
+						CommaFodder: ast.Fodder{},
 					},
 				},
 				TrailingComma: false,
@@ -162385,7 +162498,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p13519,
+						Ctx: p13509,
 						FreeVars: ast.Identifiers{
 							"a",
 							"b",
@@ -162413,7 +162526,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: nil,
-									Ctx: p13526,
+									Ctx: p13516,
 									FreeVars: ast.Identifiers{
 										"aux",
 										"keyF",
@@ -162421,35 +162534,42 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "a",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "b",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "i",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "j",
-											CommaFodder: ast.Fodder{},
-										},
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "acc",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "a",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "b",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "i",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "j",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: ast.Fodder{},
+									},
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "acc",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -162475,7 +162595,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p13531,
+										Ctx: p13521,
 										FreeVars: ast.Identifiers{
 											"a",
 											"acc",
@@ -162502,7 +162622,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13531,
+											Ctx: p13521,
 											FreeVars: ast.Identifiers{
 												"a",
 												"i",
@@ -162524,7 +162644,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13531,
+												Ctx: p13521,
 												FreeVars: ast.Identifiers{
 													"i",
 												},
@@ -162548,7 +162668,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13531,
+												Ctx: p13521,
 												FreeVars: ast.Identifiers{
 													"a",
 													"std",
@@ -162569,7 +162689,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13531,
+													Ctx: p13521,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -162641,7 +162761,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13546,
+																Ctx: p13536,
 																FreeVars: ast.Identifiers{
 																	"a",
 																},
@@ -162682,7 +162802,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p13531,
+											Ctx: p13521,
 											FreeVars: ast.Identifiers{
 												"acc",
 											},
@@ -162712,7 +162832,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13531,
+											Ctx: p13521,
 											FreeVars: ast.Identifiers{
 												"a",
 												"acc",
@@ -162739,7 +162859,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13531,
+												Ctx: p13521,
 												FreeVars: ast.Identifiers{
 													"b",
 													"j",
@@ -162761,7 +162881,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13531,
+													Ctx: p13521,
 													FreeVars: ast.Identifiers{
 														"j",
 													},
@@ -162785,7 +162905,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13531,
+													Ctx: p13521,
 													FreeVars: ast.Identifiers{
 														"b",
 														"std",
@@ -162806,7 +162926,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13531,
+														Ctx: p13521,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -162878,7 +162998,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13567,
+																	Ctx: p13557,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -162912,7 +163032,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13531,
+												Ctx: p13521,
 												FreeVars: ast.Identifiers{
 													"a",
 													"acc",
@@ -162942,7 +163062,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p13531,
+													Ctx: p13521,
 													FreeVars: ast.Identifiers{
 														"acc",
 													},
@@ -163060,7 +163180,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13531,
+																	Ctx: p13521,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																	},
@@ -163085,7 +163205,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13531,
+																	Ctx: p13521,
 																	FreeVars: ast.Identifiers{
 																		"i",
 																	},
@@ -163177,7 +163297,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p13531,
+												Ctx: p13521,
 												FreeVars: ast.Identifiers{
 													"a",
 													"acc",
@@ -163203,7 +163323,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13531,
+													Ctx: p13521,
 													FreeVars: ast.Identifiers{
 														"a",
 														"b",
@@ -163227,7 +163347,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13531,
+														Ctx: p13521,
 														FreeVars: ast.Identifiers{
 															"a",
 															"i",
@@ -163249,7 +163369,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13531,
+															Ctx: p13521,
 															FreeVars: ast.Identifiers{
 																"keyF",
 															},
@@ -163275,7 +163395,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13600,
+																		Ctx: p13590,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																			"i",
@@ -163296,7 +163416,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13600,
+																			Ctx: p13590,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																			},
@@ -163319,7 +163439,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13600,
+																			Ctx: p13590,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																			},
@@ -163356,7 +163476,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13531,
+														Ctx: p13521,
 														FreeVars: ast.Identifiers{
 															"b",
 															"j",
@@ -163378,7 +163498,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13531,
+															Ctx: p13521,
 															FreeVars: ast.Identifiers{
 																"keyF",
 															},
@@ -163404,7 +163524,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13612,
+																		Ctx: p13602,
 																		FreeVars: ast.Identifiers{
 																			"b",
 																			"j",
@@ -163425,7 +163545,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13612,
+																			Ctx: p13602,
 																			FreeVars: ast.Identifiers{
 																				"b",
 																			},
@@ -163448,7 +163568,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13612,
+																			Ctx: p13602,
 																			FreeVars: ast.Identifiers{
 																				"j",
 																			},
@@ -163485,7 +163605,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13531,
+													Ctx: p13521,
 													FreeVars: ast.Identifiers{
 														"a",
 														"acc",
@@ -163517,7 +163637,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p13531,
+														Ctx: p13521,
 														FreeVars: ast.Identifiers{
 															"aux",
 														},
@@ -163543,7 +163663,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13625,
+																	Ctx: p13615,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																	},
@@ -163568,7 +163688,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13625,
+																	Ctx: p13615,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -163593,7 +163713,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13625,
+																	Ctx: p13615,
 																	FreeVars: ast.Identifiers{
 																		"i",
 																	},
@@ -163613,7 +163733,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13625,
+																		Ctx: p13615,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																		},
@@ -163637,7 +163757,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13625,
+																		Ctx: p13615,
 																		FreeVars: nil,
 																	},
 																	OriginalString: "1",
@@ -163661,7 +163781,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13625,
+																	Ctx: p13615,
 																	FreeVars: ast.Identifiers{
 																		"j",
 																	},
@@ -163681,7 +163801,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13625,
+																		Ctx: p13615,
 																		FreeVars: ast.Identifiers{
 																			"j",
 																		},
@@ -163705,7 +163825,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13625,
+																		Ctx: p13615,
 																		FreeVars: nil,
 																	},
 																	OriginalString: "1",
@@ -163729,7 +163849,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13625,
+																	Ctx: p13615,
 																	FreeVars: ast.Identifiers{
 																		"acc",
 																	},
@@ -163769,7 +163889,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13531,
+													Ctx: p13521,
 													FreeVars: ast.Identifiers{
 														"a",
 														"acc",
@@ -163795,7 +163915,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13531,
+														Ctx: p13521,
 														FreeVars: ast.Identifiers{
 															"a",
 															"b",
@@ -163819,7 +163939,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13531,
+															Ctx: p13521,
 															FreeVars: ast.Identifiers{
 																"a",
 																"i",
@@ -163841,7 +163961,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13531,
+																Ctx: p13521,
 																FreeVars: ast.Identifiers{
 																	"keyF",
 																},
@@ -163867,7 +163987,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13652,
+																			Ctx: p13642,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"i",
@@ -163888,7 +164008,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13652,
+																				Ctx: p13642,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																				},
@@ -163911,7 +164031,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13652,
+																				Ctx: p13642,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -163948,7 +164068,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13531,
+															Ctx: p13521,
 															FreeVars: ast.Identifiers{
 																"b",
 																"j",
@@ -163970,7 +164090,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13531,
+																Ctx: p13521,
 																FreeVars: ast.Identifiers{
 																	"keyF",
 																},
@@ -163996,7 +164116,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13664,
+																			Ctx: p13654,
 																			FreeVars: ast.Identifiers{
 																				"b",
 																				"j",
@@ -164017,7 +164137,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13664,
+																				Ctx: p13654,
 																				FreeVars: ast.Identifiers{
 																					"b",
 																				},
@@ -164040,7 +164160,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13664,
+																				Ctx: p13654,
 																				FreeVars: ast.Identifiers{
 																					"j",
 																				},
@@ -164077,7 +164197,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13531,
+														Ctx: p13521,
 														FreeVars: ast.Identifiers{
 															"a",
 															"acc",
@@ -164109,7 +164229,7 @@ var _StdAst = &ast.DesugaredObject{
 																	Comment: []string{},
 																},
 															},
-															Ctx: p13531,
+															Ctx: p13521,
 															FreeVars: ast.Identifiers{
 																"aux",
 															},
@@ -164135,7 +164255,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13677,
+																		Ctx: p13667,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																		},
@@ -164160,7 +164280,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13677,
+																		Ctx: p13667,
 																		FreeVars: ast.Identifiers{
 																			"b",
 																		},
@@ -164185,7 +164305,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13677,
+																		Ctx: p13667,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																		},
@@ -164205,7 +164325,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13677,
+																			Ctx: p13667,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																			},
@@ -164229,7 +164349,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13677,
+																			Ctx: p13667,
 																			FreeVars: nil,
 																		},
 																		OriginalString: "1",
@@ -164253,7 +164373,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13677,
+																		Ctx: p13667,
 																		FreeVars: ast.Identifiers{
 																			"j",
 																		},
@@ -164278,7 +164398,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13677,
+																		Ctx: p13667,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																			"acc",
@@ -164300,7 +164420,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13677,
+																			Ctx: p13667,
 																			FreeVars: ast.Identifiers{
 																				"acc",
 																			},
@@ -164324,7 +164444,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13677,
+																			Ctx: p13667,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"i",
@@ -164347,7 +164467,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p13696,
+																						Ctx: p13686,
 																						FreeVars: ast.Identifiers{
 																							"a",
 																							"i",
@@ -164368,7 +164488,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p13696,
+																							Ctx: p13686,
 																							FreeVars: ast.Identifiers{
 																								"a",
 																							},
@@ -164391,7 +164511,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p13696,
+																							Ctx: p13686,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																							},
@@ -164441,7 +164561,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13531,
+														Ctx: p13521,
 														FreeVars: ast.Identifiers{
 															"a",
 															"acc",
@@ -164473,7 +164593,7 @@ var _StdAst = &ast.DesugaredObject{
 																	Comment: []string{},
 																},
 															},
-															Ctx: p13531,
+															Ctx: p13521,
 															FreeVars: ast.Identifiers{
 																"aux",
 															},
@@ -164499,7 +164619,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13710,
+																		Ctx: p13700,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																		},
@@ -164524,7 +164644,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13710,
+																		Ctx: p13700,
 																		FreeVars: ast.Identifiers{
 																			"b",
 																		},
@@ -164549,7 +164669,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13710,
+																		Ctx: p13700,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																		},
@@ -164574,7 +164694,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13710,
+																		Ctx: p13700,
 																		FreeVars: ast.Identifiers{
 																			"j",
 																		},
@@ -164594,7 +164714,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13710,
+																			Ctx: p13700,
 																			FreeVars: ast.Identifiers{
 																				"j",
 																			},
@@ -164618,7 +164738,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13710,
+																			Ctx: p13700,
 																			FreeVars: nil,
 																		},
 																		OriginalString: "1",
@@ -164642,7 +164762,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13710,
+																		Ctx: p13700,
 																		FreeVars: ast.Identifiers{
 																			"acc",
 																		},
@@ -164683,7 +164803,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p13519,
+							Ctx: p13509,
 							FreeVars: ast.Identifiers{
 								"a",
 								"aux",
@@ -164712,7 +164832,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p13519,
+								Ctx: p13509,
 								FreeVars: ast.Identifiers{
 									"aux",
 								},
@@ -164738,7 +164858,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13730,
+											Ctx: p13720,
 											FreeVars: ast.Identifiers{
 												"a",
 											},
@@ -164763,7 +164883,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13730,
+											Ctx: p13720,
 											FreeVars: ast.Identifiers{
 												"b",
 											},
@@ -164788,7 +164908,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13730,
+											Ctx: p13720,
 											FreeVars: nil,
 										},
 										OriginalString: "0",
@@ -164811,7 +164931,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13730,
+											Ctx: p13720,
 											FreeVars: nil,
 										},
 										OriginalString: "0",
@@ -164834,7 +164954,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13730,
+											Ctx: p13720,
 											FreeVars: nil,
 										},
 										Elements: nil,
@@ -164900,20 +165020,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "target",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "patch",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "target",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "patch",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -164939,7 +165060,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p13743,
+						Ctx: p13733,
 						FreeVars: ast.Identifiers{
 							"patch",
 							"std",
@@ -164961,7 +165082,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p13743,
+							Ctx: p13733,
 							FreeVars: ast.Identifiers{
 								"patch",
 								"std",
@@ -164982,7 +165103,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p13743,
+								Ctx: p13733,
 								FreeVars: ast.Identifiers{
 									"std",
 								},
@@ -165054,7 +165175,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13754,
+											Ctx: p13744,
 											FreeVars: ast.Identifiers{
 												"patch",
 											},
@@ -165094,7 +165215,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p13743,
+							Ctx: p13733,
 							FreeVars: ast.Identifiers{
 								"patch",
 								"std",
@@ -165128,7 +165249,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p13762,
+										Ctx: p13752,
 										FreeVars: ast.Identifiers{
 											"std",
 											"target",
@@ -165149,7 +165270,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13762,
+											Ctx: p13752,
 											FreeVars: ast.Identifiers{
 												"std",
 												"target",
@@ -165170,7 +165291,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13762,
+												Ctx: p13752,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -165242,7 +165363,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p13773,
+															Ctx: p13763,
 															FreeVars: ast.Identifiers{
 																"target",
 															},
@@ -165275,7 +165396,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13762,
+											Ctx: p13752,
 											FreeVars: ast.Identifiers{
 												"target",
 											},
@@ -165298,7 +165419,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p13762,
+											Ctx: p13752,
 											FreeVars: nil,
 										},
 										Asserts: ast.Nodes{},
@@ -165332,7 +165453,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p13743,
+								Ctx: p13733,
 								FreeVars: ast.Identifiers{
 									"patch",
 									"std",
@@ -165366,7 +165487,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p13784,
+											Ctx: p13774,
 											FreeVars: ast.Identifiers{
 												"std",
 												"target_object",
@@ -165387,7 +165508,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13784,
+												Ctx: p13774,
 												FreeVars: ast.Identifiers{
 													"std",
 													"target_object",
@@ -165408,7 +165529,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13784,
+													Ctx: p13774,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -165480,7 +165601,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13795,
+																Ctx: p13785,
 																FreeVars: ast.Identifiers{
 																	"target_object",
 																},
@@ -165513,7 +165634,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13784,
+												Ctx: p13774,
 												FreeVars: ast.Identifiers{
 													"std",
 													"target_object",
@@ -165534,7 +165655,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13784,
+													Ctx: p13774,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -165606,7 +165727,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13806,
+																Ctx: p13796,
 																FreeVars: ast.Identifiers{
 																	"target_object",
 																},
@@ -165639,7 +165760,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p13784,
+												Ctx: p13774,
 												FreeVars: nil,
 											},
 											Elements: nil,
@@ -165673,7 +165794,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p13743,
+									Ctx: p13733,
 									FreeVars: ast.Identifiers{
 										"patch",
 										"std",
@@ -165800,15 +165921,14 @@ var _StdAst = &ast.DesugaredObject{
 																},
 															},
 															ParenLeftFodder: nil,
-															Parameters: ast.Parameters{
-																Required: []ast.CommaSeparatedID{
-																	ast.CommaSeparatedID{
-																		NameFodder: nil,
-																		Name: "k",
-																		CommaFodder: nil,
-																	},
+															Parameters: []ast.Parameter{
+																ast.Parameter{
+																	NameFodder: nil,
+																	Name: "k",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: nil,
 																},
-																Optional: nil,
 															},
 															TrailingComma: false,
 															ParenRightFodder: nil,
@@ -165848,7 +165968,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13827,
+																		Ctx: p13817,
 																		FreeVars: ast.Identifiers{
 																			"k",
 																			"patch",
@@ -165869,7 +165989,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13827,
+																			Ctx: p13817,
 																			FreeVars: ast.Identifiers{
 																				"k",
 																				"patch",
@@ -165890,7 +166010,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13827,
+																				Ctx: p13817,
 																				FreeVars: ast.Identifiers{
 																					"patch",
 																				},
@@ -165913,7 +166033,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13827,
+																				Ctx: p13817,
 																				FreeVars: ast.Identifiers{
 																					"k",
 																				},
@@ -165940,7 +166060,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13827,
+																			Ctx: p13817,
 																			FreeVars: nil,
 																		},
 																	},
@@ -165983,7 +166103,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13840,
+																					Ctx: p13830,
 																					FreeVars: ast.Identifiers{
 																						"k",
 																					},
@@ -166039,7 +166159,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p13827,
+																Ctx: p13817,
 																FreeVars: ast.Identifiers{
 																	"patch",
 																	"std",
@@ -166060,7 +166180,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13827,
+																	Ctx: p13817,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																	},
@@ -166132,7 +166252,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13852,
+																				Ctx: p13842,
 																				FreeVars: ast.Identifiers{
 																					"patch",
 																				},
@@ -166185,7 +166305,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p13743,
+										Ctx: p13733,
 										FreeVars: ast.Identifiers{
 											"null_fields",
 											"patch",
@@ -166214,7 +166334,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p13859,
+													Ctx: p13849,
 													FreeVars: ast.Identifiers{
 														"patch",
 														"std",
@@ -166236,7 +166356,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p13859,
+														Ctx: p13849,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -166308,7 +166428,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13868,
+																	Ctx: p13858,
 																	FreeVars: ast.Identifiers{
 																		"target_fields",
 																	},
@@ -166333,7 +166453,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p13868,
+																	Ctx: p13858,
 																	FreeVars: ast.Identifiers{
 																		"patch",
 																		"std",
@@ -166354,7 +166474,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p13868,
+																		Ctx: p13858,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -166426,7 +166546,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p13879,
+																					Ctx: p13869,
 																					FreeVars: ast.Identifiers{
 																						"patch",
 																					},
@@ -166672,15 +166792,14 @@ var _StdAst = &ast.DesugaredObject{
 																			},
 																		},
 																		ParenLeftFodder: nil,
-																		Parameters: ast.Parameters{
-																			Required: []ast.CommaSeparatedID{
-																				ast.CommaSeparatedID{
-																					NameFodder: nil,
-																					Name: "k",
-																					CommaFodder: nil,
-																				},
+																		Parameters: []ast.Parameter{
+																			ast.Parameter{
+																				NameFodder: nil,
+																				Name: "k",
+																				EqFodder: nil,
+																				DefaultArg: nil,
+																				CommaFodder: nil,
 																			},
-																			Optional: nil,
 																		},
 																		TrailingComma: false,
 																		ParenRightFodder: nil,
@@ -166731,7 +166850,7 @@ var _StdAst = &ast.DesugaredObject{
 																									Comment: []string{},
 																								},
 																							},
-																							Ctx: p13743,
+																							Ctx: p13733,
 																							FreeVars: ast.Identifiers{
 																								"k",
 																								"patch",
@@ -166758,7 +166877,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p13743,
+																										Ctx: p13733,
 																										FreeVars: ast.Identifiers{
 																											"k",
 																										},
@@ -166787,7 +166906,7 @@ var _StdAst = &ast.DesugaredObject{
 																												Comment: []string{},
 																											},
 																										},
-																										Ctx: p13911,
+																										Ctx: p13901,
 																										FreeVars: ast.Identifiers{
 																											"k",
 																											"patch",
@@ -166810,7 +166929,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p13911,
+																											Ctx: p13901,
 																											FreeVars: ast.Identifiers{
 																												"k",
 																												"patch",
@@ -166833,7 +166952,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p13911,
+																												Ctx: p13901,
 																												FreeVars: ast.Identifiers{
 																													"k",
 																													"patch",
@@ -166855,7 +166974,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p13911,
+																													Ctx: p13901,
 																													FreeVars: ast.Identifiers{
 																														"std",
 																													},
@@ -166927,7 +167046,7 @@ var _StdAst = &ast.DesugaredObject{
 																																	File: p1,
 																																},
 																																Fodder: ast.Fodder{},
-																																Ctx: p13924,
+																																Ctx: p13914,
 																																FreeVars: ast.Identifiers{
 																																	"patch",
 																																},
@@ -166952,7 +167071,7 @@ var _StdAst = &ast.DesugaredObject{
 																																	File: p1,
 																																},
 																																Fodder: ast.Fodder{},
-																																Ctx: p13924,
+																																Ctx: p13914,
 																																FreeVars: ast.Identifiers{
 																																	"k",
 																																},
@@ -166986,7 +167105,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p13911,
+																											Ctx: p13901,
 																											FreeVars: ast.Identifiers{
 																												"k",
 																												"target_object",
@@ -167014,7 +167133,7 @@ var _StdAst = &ast.DesugaredObject{
 																														Comment: []string{},
 																													},
 																												},
-																												Ctx: p13911,
+																												Ctx: p13901,
 																												FreeVars: ast.Identifiers{
 																													"target_object",
 																												},
@@ -167037,7 +167156,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p13911,
+																												Ctx: p13901,
 																												FreeVars: ast.Identifiers{
 																													"k",
 																												},
@@ -167070,7 +167189,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p13911,
+																											Ctx: p13901,
 																											FreeVars: ast.Identifiers{
 																												"k",
 																												"patch",
@@ -167093,7 +167212,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p13911,
+																												Ctx: p13901,
 																												FreeVars: ast.Identifiers{
 																													"k",
 																													"std",
@@ -167116,7 +167235,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p13911,
+																													Ctx: p13901,
 																													FreeVars: ast.Identifiers{
 																														"k",
 																														"std",
@@ -167138,7 +167257,7 @@ var _StdAst = &ast.DesugaredObject{
 																															File: p1,
 																														},
 																														Fodder: ast.Fodder{},
-																														Ctx: p13911,
+																														Ctx: p13901,
 																														FreeVars: ast.Identifiers{
 																															"std",
 																														},
@@ -167210,7 +167329,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p13949,
+																																	Ctx: p13939,
 																																	FreeVars: ast.Identifiers{
 																																		"target_object",
 																																	},
@@ -167235,7 +167354,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p13949,
+																																	Ctx: p13939,
 																																	FreeVars: ast.Identifiers{
 																																		"k",
 																																	},
@@ -167269,7 +167388,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p13911,
+																												Ctx: p13901,
 																												FreeVars: ast.Identifiers{
 																													"k",
 																													"patch",
@@ -167291,7 +167410,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p13911,
+																													Ctx: p13901,
 																													FreeVars: ast.Identifiers{
 																														"std",
 																													},
@@ -167370,7 +167489,7 @@ var _StdAst = &ast.DesugaredObject{
 																																	File: p1,
 																																},
 																																Fodder: ast.Fodder{},
-																																Ctx: p13963,
+																																Ctx: p13953,
 																																FreeVars: nil,
 																															},
 																														},
@@ -167392,7 +167511,7 @@ var _StdAst = &ast.DesugaredObject{
 																																	File: p1,
 																																},
 																																Fodder: ast.Fodder{},
-																																Ctx: p13963,
+																																Ctx: p13953,
 																																FreeVars: ast.Identifiers{
 																																	"k",
 																																	"patch",
@@ -167413,7 +167532,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p13963,
+																																	Ctx: p13953,
 																																	FreeVars: ast.Identifiers{
 																																		"patch",
 																																	},
@@ -167436,7 +167555,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p13963,
+																																	Ctx: p13953,
 																																	FreeVars: ast.Identifiers{
 																																		"k",
 																																	},
@@ -167479,7 +167598,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p13911,
+																												Ctx: p13901,
 																												FreeVars: ast.Identifiers{
 																													"k",
 																													"patch",
@@ -167502,7 +167621,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p13911,
+																													Ctx: p13901,
 																													FreeVars: ast.Identifiers{
 																														"std",
 																													},
@@ -167581,7 +167700,7 @@ var _StdAst = &ast.DesugaredObject{
 																																	File: p1,
 																																},
 																																Fodder: ast.Fodder{},
-																																Ctx: p13981,
+																																Ctx: p13971,
 																																FreeVars: ast.Identifiers{
 																																	"k",
 																																	"target_object",
@@ -167602,7 +167721,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p13981,
+																																	Ctx: p13971,
 																																	FreeVars: ast.Identifiers{
 																																		"target_object",
 																																	},
@@ -167625,7 +167744,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p13981,
+																																	Ctx: p13971,
 																																	FreeVars: ast.Identifiers{
 																																		"k",
 																																	},
@@ -167653,7 +167772,7 @@ var _StdAst = &ast.DesugaredObject{
 																																	File: p1,
 																																},
 																																Fodder: ast.Fodder{},
-																																Ctx: p13981,
+																																Ctx: p13971,
 																																FreeVars: ast.Identifiers{
 																																	"k",
 																																	"patch",
@@ -167674,7 +167793,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p13981,
+																																	Ctx: p13971,
 																																	FreeVars: ast.Identifiers{
 																																		"patch",
 																																	},
@@ -167697,7 +167816,7 @@ var _StdAst = &ast.DesugaredObject{
 																																		File: p1,
 																																	},
 																																	Fodder: ast.Fodder{},
-																																	Ctx: p13981,
+																																	Ctx: p13971,
 																																	FreeVars: ast.Identifiers{
 																																		"k",
 																																	},
@@ -167749,7 +167868,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p13743,
+																			Ctx: p13733,
 																			FreeVars: ast.Identifiers{
 																				"both_fields",
 																				"null_fields",
@@ -167771,7 +167890,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p13743,
+																				Ctx: p13733,
 																				FreeVars: ast.Identifiers{
 																					"std",
 																				},
@@ -167843,7 +167962,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14002,
+																							Ctx: p13992,
 																							FreeVars: ast.Identifiers{
 																								"both_fields",
 																							},
@@ -167868,7 +167987,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14002,
+																							Ctx: p13992,
 																							FreeVars: ast.Identifiers{
 																								"null_fields",
 																							},
@@ -167939,7 +168058,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p13743,
+							Ctx: p13733,
 							FreeVars: ast.Identifiers{
 								"patch",
 							},
@@ -167995,15 +168114,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "o",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "o",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -168022,7 +168140,7 @@ var _StdAst = &ast.DesugaredObject{
 							File: p1,
 						},
 						Fodder: ast.Fodder{},
-						Ctx: p14015,
+						Ctx: p14005,
 						FreeVars: ast.Identifiers{
 							"o",
 							"std",
@@ -168043,7 +168161,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p14015,
+							Ctx: p14005,
 							FreeVars: ast.Identifiers{
 								"std",
 							},
@@ -168122,7 +168240,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14025,
+										Ctx: p14015,
 										FreeVars: ast.Identifiers{
 											"o",
 										},
@@ -168147,7 +168265,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14025,
+										Ctx: p14015,
 										FreeVars: nil,
 									},
 									Value: false,
@@ -168210,15 +168328,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "o",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "o",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -168237,7 +168354,7 @@ var _StdAst = &ast.DesugaredObject{
 							File: p1,
 						},
 						Fodder: ast.Fodder{},
-						Ctx: p14033,
+						Ctx: p14023,
 						FreeVars: ast.Identifiers{
 							"o",
 							"std",
@@ -168258,7 +168375,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p14033,
+							Ctx: p14023,
 							FreeVars: ast.Identifiers{
 								"std",
 							},
@@ -168337,7 +168454,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14043,
+										Ctx: p14033,
 										FreeVars: ast.Identifiers{
 											"o",
 										},
@@ -168362,7 +168479,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14043,
+										Ctx: p14033,
 										FreeVars: nil,
 									},
 									Value: true,
@@ -168425,20 +168542,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "o",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "f",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "o",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "f",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -168457,7 +168575,7 @@ var _StdAst = &ast.DesugaredObject{
 							File: p1,
 						},
 						Fodder: ast.Fodder{},
-						Ctx: p14051,
+						Ctx: p14041,
 						FreeVars: ast.Identifiers{
 							"f",
 							"o",
@@ -168479,7 +168597,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p14051,
+							Ctx: p14041,
 							FreeVars: ast.Identifiers{
 								"std",
 							},
@@ -168558,7 +168676,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14061,
+										Ctx: p14051,
 										FreeVars: ast.Identifiers{
 											"o",
 										},
@@ -168583,7 +168701,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14061,
+										Ctx: p14051,
 										FreeVars: ast.Identifiers{
 											"f",
 										},
@@ -168608,7 +168726,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14061,
+										Ctx: p14051,
 										FreeVars: nil,
 									},
 									Value: false,
@@ -168671,20 +168789,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "o",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "f",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "o",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "f",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -168703,7 +168822,7 @@ var _StdAst = &ast.DesugaredObject{
 							File: p1,
 						},
 						Fodder: ast.Fodder{},
-						Ctx: p14071,
+						Ctx: p14061,
 						FreeVars: ast.Identifiers{
 							"f",
 							"o",
@@ -168725,7 +168844,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p14071,
+							Ctx: p14061,
 							FreeVars: ast.Identifiers{
 								"std",
 							},
@@ -168804,7 +168923,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14081,
+										Ctx: p14071,
 										FreeVars: ast.Identifiers{
 											"o",
 										},
@@ -168829,7 +168948,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14081,
+										Ctx: p14071,
 										FreeVars: ast.Identifiers{
 											"f",
 										},
@@ -168854,7 +168973,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14081,
+										Ctx: p14071,
 										FreeVars: nil,
 									},
 									Value: true,
@@ -168917,20 +169036,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "b",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "b",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -168956,7 +169076,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p14092,
+						Ctx: p14082,
 						FreeVars: ast.Identifiers{
 							"a",
 							"b",
@@ -168983,7 +169103,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14096,
+									Ctx: p14086,
 									FreeVars: ast.Identifiers{
 										"a",
 										"std",
@@ -169004,7 +169124,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14096,
+										Ctx: p14086,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -169076,7 +169196,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14105,
+													Ctx: p14095,
 													FreeVars: ast.Identifiers{
 														"a",
 													},
@@ -169119,7 +169239,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p14092,
+							Ctx: p14082,
 							FreeVars: ast.Identifiers{
 								"a",
 								"b",
@@ -169147,7 +169267,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14112,
+										Ctx: p14102,
 										FreeVars: ast.Identifiers{
 											"b",
 											"std",
@@ -169168,7 +169288,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14112,
+											Ctx: p14102,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -169240,7 +169360,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14121,
+														Ctx: p14111,
 														FreeVars: ast.Identifiers{
 															"b",
 														},
@@ -169283,7 +169403,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p14092,
+								Ctx: p14082,
 								FreeVars: ast.Identifiers{
 									"a",
 									"b",
@@ -169307,7 +169427,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14092,
+									Ctx: p14082,
 									FreeVars: ast.Identifiers{
 										"std",
 										"ta",
@@ -169330,7 +169450,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14092,
+										Ctx: p14082,
 										FreeVars: ast.Identifiers{
 											"std",
 											"ta",
@@ -169352,7 +169472,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14092,
+											Ctx: p14082,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -169424,7 +169544,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14137,
+														Ctx: p14127,
 														FreeVars: ast.Identifiers{
 															"ta",
 														},
@@ -169449,7 +169569,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14137,
+														Ctx: p14127,
 														FreeVars: ast.Identifiers{
 															"tb",
 														},
@@ -169490,7 +169610,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p14092,
+									Ctx: p14082,
 									FreeVars: nil,
 								},
 								Value: false,
@@ -169525,7 +169645,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p14092,
+									Ctx: p14082,
 									FreeVars: ast.Identifiers{
 										"a",
 										"b",
@@ -169548,7 +169668,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14092,
+										Ctx: p14082,
 										FreeVars: ast.Identifiers{
 											"std",
 											"ta",
@@ -169569,7 +169689,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14092,
+											Ctx: p14082,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -169641,7 +169761,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14156,
+														Ctx: p14146,
 														FreeVars: ast.Identifiers{
 															"ta",
 														},
@@ -169666,7 +169786,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14156,
+														Ctx: p14146,
 														FreeVars: nil,
 													},
 													Value: "array",
@@ -169706,7 +169826,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p14092,
+										Ctx: p14082,
 										FreeVars: ast.Identifiers{
 											"a",
 											"b",
@@ -169733,7 +169853,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14164,
+													Ctx: p14154,
 													FreeVars: ast.Identifiers{
 														"a",
 														"std",
@@ -169754,7 +169874,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14164,
+														Ctx: p14154,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -169826,7 +169946,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14173,
+																	Ctx: p14163,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																	},
@@ -169869,7 +169989,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p14092,
+											Ctx: p14082,
 											FreeVars: ast.Identifiers{
 												"a",
 												"b",
@@ -169892,7 +170012,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14092,
+												Ctx: p14082,
 												FreeVars: ast.Identifiers{
 													"b",
 													"la",
@@ -169915,7 +170035,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14092,
+													Ctx: p14082,
 													FreeVars: ast.Identifiers{
 														"b",
 														"la",
@@ -169937,7 +170057,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14092,
+														Ctx: p14082,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -170009,7 +170129,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14189,
+																	Ctx: p14179,
 																	FreeVars: ast.Identifiers{
 																		"la",
 																	},
@@ -170034,7 +170154,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14189,
+																	Ctx: p14179,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																		"std",
@@ -170055,7 +170175,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14189,
+																		Ctx: p14179,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -170127,7 +170247,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p14200,
+																					Ctx: p14190,
 																					FreeVars: ast.Identifiers{
 																						"b",
 																					},
@@ -170178,7 +170298,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p14092,
+												Ctx: p14082,
 												FreeVars: nil,
 											},
 											Value: false,
@@ -170213,7 +170333,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p14092,
+												Ctx: p14082,
 												FreeVars: ast.Identifiers{
 													"a",
 													"b",
@@ -170240,32 +170360,35 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: nil,
-															Ctx: p14210,
+															Ctx: p14200,
 															FreeVars: ast.Identifiers{
 																"aux",
 																"la",
 															},
 														},
 														ParenLeftFodder: ast.Fodder{},
-														Parameters: ast.Parameters{
-															Required: []ast.CommaSeparatedID{
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "a",
-																	CommaFodder: ast.Fodder{},
-																},
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "b",
-																	CommaFodder: ast.Fodder{},
-																},
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "i",
-																	CommaFodder: nil,
-																},
+														Parameters: []ast.Parameter{
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "a",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: ast.Fodder{},
+															},
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "b",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: ast.Fodder{},
+															},
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "i",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: nil,
 															},
-															Optional: nil,
 														},
 														TrailingComma: false,
 														ParenRightFodder: ast.Fodder{},
@@ -170291,7 +170414,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p14215,
+																Ctx: p14205,
 																FreeVars: ast.Identifiers{
 																	"a",
 																	"aux",
@@ -170315,7 +170438,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14215,
+																	Ctx: p14205,
 																	FreeVars: ast.Identifiers{
 																		"i",
 																		"la",
@@ -170336,7 +170459,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14215,
+																		Ctx: p14205,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																		},
@@ -170360,7 +170483,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14215,
+																		Ctx: p14205,
 																		FreeVars: ast.Identifiers{
 																			"la",
 																		},
@@ -170391,7 +170514,7 @@ var _StdAst = &ast.DesugaredObject{
 																			Comment: []string{},
 																		},
 																	},
-																	Ctx: p14215,
+																	Ctx: p14205,
 																	FreeVars: nil,
 																},
 																Value: true,
@@ -170419,7 +170542,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14215,
+																	Ctx: p14205,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																		"aux",
@@ -170442,7 +170565,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14215,
+																		Ctx: p14205,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																			"b",
@@ -170464,7 +170587,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14215,
+																			Ctx: p14205,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"i",
@@ -170485,7 +170608,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14215,
+																				Ctx: p14205,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																				},
@@ -170508,7 +170631,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14215,
+																				Ctx: p14205,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -170535,7 +170658,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14215,
+																			Ctx: p14205,
 																			FreeVars: ast.Identifiers{
 																				"b",
 																				"i",
@@ -170556,7 +170679,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14215,
+																				Ctx: p14205,
 																				FreeVars: ast.Identifiers{
 																					"b",
 																				},
@@ -170579,7 +170702,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14215,
+																				Ctx: p14205,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -170613,7 +170736,7 @@ var _StdAst = &ast.DesugaredObject{
 																				Comment: []string{},
 																			},
 																		},
-																		Ctx: p14215,
+																		Ctx: p14205,
 																		FreeVars: nil,
 																	},
 																	Value: false,
@@ -170641,7 +170764,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14215,
+																		Ctx: p14205,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																			"aux",
@@ -170671,7 +170794,7 @@ var _StdAst = &ast.DesugaredObject{
 																					Comment: []string{},
 																				},
 																			},
-																			Ctx: p14215,
+																			Ctx: p14205,
 																			FreeVars: ast.Identifiers{
 																				"aux",
 																			},
@@ -170697,7 +170820,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p14252,
+																						Ctx: p14242,
 																						FreeVars: ast.Identifiers{
 																							"a",
 																						},
@@ -170722,7 +170845,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p14252,
+																						Ctx: p14242,
 																						FreeVars: ast.Identifiers{
 																							"b",
 																						},
@@ -170747,7 +170870,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p14252,
+																						Ctx: p14242,
 																						FreeVars: ast.Identifiers{
 																							"i",
 																						},
@@ -170767,7 +170890,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14252,
+																							Ctx: p14242,
 																							FreeVars: ast.Identifiers{
 																								"i",
 																							},
@@ -170791,7 +170914,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14252,
+																							Ctx: p14242,
 																							FreeVars: nil,
 																						},
 																						OriginalString: "1",
@@ -170829,7 +170952,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14092,
+													Ctx: p14082,
 													FreeVars: ast.Identifiers{
 														"a",
 														"aux",
@@ -170858,7 +170981,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p14092,
+														Ctx: p14082,
 														FreeVars: ast.Identifiers{
 															"aux",
 														},
@@ -170884,7 +171007,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14268,
+																	Ctx: p14258,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																	},
@@ -170909,7 +171032,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14268,
+																	Ctx: p14258,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -170934,7 +171057,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14268,
+																	Ctx: p14258,
 																	FreeVars: nil,
 																},
 																OriginalString: "0",
@@ -170975,7 +171098,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14092,
+										Ctx: p14082,
 										FreeVars: ast.Identifiers{
 											"a",
 											"b",
@@ -170998,7 +171121,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14092,
+											Ctx: p14082,
 											FreeVars: ast.Identifiers{
 												"std",
 												"ta",
@@ -171019,7 +171142,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14092,
+												Ctx: p14082,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -171091,7 +171214,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14285,
+															Ctx: p14275,
 															FreeVars: ast.Identifiers{
 																"ta",
 															},
@@ -171116,7 +171239,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14285,
+															Ctx: p14275,
 															FreeVars: nil,
 														},
 														Value: "object",
@@ -171156,7 +171279,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p14092,
+											Ctx: p14082,
 											FreeVars: ast.Identifiers{
 												"a",
 												"b",
@@ -171183,7 +171306,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14293,
+														Ctx: p14283,
 														FreeVars: ast.Identifiers{
 															"a",
 															"std",
@@ -171204,7 +171327,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14293,
+															Ctx: p14283,
 															FreeVars: ast.Identifiers{
 																"std",
 															},
@@ -171276,7 +171399,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14302,
+																		Ctx: p14292,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																		},
@@ -171319,7 +171442,7 @@ var _StdAst = &ast.DesugaredObject{
 														Comment: []string{},
 													},
 												},
-												Ctx: p14092,
+												Ctx: p14082,
 												FreeVars: ast.Identifiers{
 													"a",
 													"b",
@@ -171347,7 +171470,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14309,
+															Ctx: p14299,
 															FreeVars: ast.Identifiers{
 																"fields",
 																"std",
@@ -171368,7 +171491,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p14309,
+																Ctx: p14299,
 																FreeVars: ast.Identifiers{
 																	"std",
 																},
@@ -171440,7 +171563,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14318,
+																			Ctx: p14308,
 																			FreeVars: ast.Identifiers{
 																				"fields",
 																			},
@@ -171483,7 +171606,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p14092,
+													Ctx: p14082,
 													FreeVars: ast.Identifiers{
 														"a",
 														"b",
@@ -171507,7 +171630,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14092,
+														Ctx: p14082,
 														FreeVars: ast.Identifiers{
 															"b",
 															"fields",
@@ -171529,7 +171652,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14092,
+															Ctx: p14082,
 															FreeVars: ast.Identifiers{
 																"fields",
 															},
@@ -171553,7 +171676,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14092,
+															Ctx: p14082,
 															FreeVars: ast.Identifiers{
 																"b",
 																"std",
@@ -171574,7 +171697,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p14092,
+																Ctx: p14082,
 																FreeVars: ast.Identifiers{
 																	"std",
 																},
@@ -171646,7 +171769,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14336,
+																			Ctx: p14326,
 																			FreeVars: ast.Identifiers{
 																				"b",
 																			},
@@ -171687,7 +171810,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p14092,
+														Ctx: p14082,
 														FreeVars: nil,
 													},
 													Value: false,
@@ -171722,7 +171845,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p14092,
+														Ctx: p14082,
 														FreeVars: ast.Identifiers{
 															"a",
 															"b",
@@ -171750,7 +171873,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: nil,
-																	Ctx: p14346,
+																	Ctx: p14336,
 																	FreeVars: ast.Identifiers{
 																		"aux",
 																		"fields",
@@ -171758,25 +171881,28 @@ var _StdAst = &ast.DesugaredObject{
 																	},
 																},
 																ParenLeftFodder: ast.Fodder{},
-																Parameters: ast.Parameters{
-																	Required: []ast.CommaSeparatedID{
-																		ast.CommaSeparatedID{
-																			NameFodder: ast.Fodder{},
-																			Name: "a",
-																			CommaFodder: ast.Fodder{},
-																		},
-																		ast.CommaSeparatedID{
-																			NameFodder: ast.Fodder{},
-																			Name: "b",
-																			CommaFodder: ast.Fodder{},
-																		},
-																		ast.CommaSeparatedID{
-																			NameFodder: ast.Fodder{},
-																			Name: "i",
-																			CommaFodder: nil,
-																		},
+																Parameters: []ast.Parameter{
+																	ast.Parameter{
+																		NameFodder: ast.Fodder{},
+																		Name: "a",
+																		EqFodder: nil,
+																		DefaultArg: nil,
+																		CommaFodder: ast.Fodder{},
+																	},
+																	ast.Parameter{
+																		NameFodder: ast.Fodder{},
+																		Name: "b",
+																		EqFodder: nil,
+																		DefaultArg: nil,
+																		CommaFodder: ast.Fodder{},
+																	},
+																	ast.Parameter{
+																		NameFodder: ast.Fodder{},
+																		Name: "i",
+																		EqFodder: nil,
+																		DefaultArg: nil,
+																		CommaFodder: nil,
 																	},
-																	Optional: nil,
 																},
 																TrailingComma: false,
 																ParenRightFodder: ast.Fodder{},
@@ -171802,7 +171928,7 @@ var _StdAst = &ast.DesugaredObject{
 																				Comment: []string{},
 																			},
 																		},
-																		Ctx: p14351,
+																		Ctx: p14341,
 																		FreeVars: ast.Identifiers{
 																			"a",
 																			"aux",
@@ -171827,7 +171953,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14351,
+																			Ctx: p14341,
 																			FreeVars: ast.Identifiers{
 																				"i",
 																				"lfields",
@@ -171848,7 +171974,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14351,
+																				Ctx: p14341,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -171872,7 +171998,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14351,
+																				Ctx: p14341,
 																				FreeVars: ast.Identifiers{
 																					"lfields",
 																				},
@@ -171903,7 +172029,7 @@ var _StdAst = &ast.DesugaredObject{
 																					Comment: []string{},
 																				},
 																			},
-																			Ctx: p14351,
+																			Ctx: p14341,
 																			FreeVars: nil,
 																		},
 																		Value: true,
@@ -171931,7 +172057,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14351,
+																			Ctx: p14341,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"aux",
@@ -171955,7 +172081,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14351,
+																				Ctx: p14341,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																					"b",
@@ -171983,7 +172109,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14368,
+																							Ctx: p14358,
 																							FreeVars: ast.Identifiers{
 																								"fields",
 																								"i",
@@ -172004,7 +172130,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p14368,
+																								Ctx: p14358,
 																								FreeVars: ast.Identifiers{
 																									"fields",
 																								},
@@ -172027,7 +172153,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p14368,
+																								Ctx: p14358,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -172056,7 +172182,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p14351,
+																					Ctx: p14341,
 																					FreeVars: ast.Identifiers{
 																						"a",
 																						"b",
@@ -172078,7 +172204,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p14351,
+																						Ctx: p14341,
 																						FreeVars: ast.Identifiers{
 																							"a",
 																							"f",
@@ -172099,7 +172225,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14351,
+																							Ctx: p14341,
 																							FreeVars: ast.Identifiers{
 																								"a",
 																							},
@@ -172122,7 +172248,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14351,
+																							Ctx: p14341,
 																							FreeVars: ast.Identifiers{
 																								"f",
 																							},
@@ -172149,7 +172275,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p14351,
+																						Ctx: p14341,
 																						FreeVars: ast.Identifiers{
 																							"b",
 																							"f",
@@ -172170,7 +172296,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14351,
+																							Ctx: p14341,
 																							FreeVars: ast.Identifiers{
 																								"b",
 																							},
@@ -172193,7 +172319,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14351,
+																							Ctx: p14341,
 																							FreeVars: ast.Identifiers{
 																								"f",
 																							},
@@ -172228,7 +172354,7 @@ var _StdAst = &ast.DesugaredObject{
 																						Comment: []string{},
 																					},
 																				},
-																				Ctx: p14351,
+																				Ctx: p14341,
 																				FreeVars: nil,
 																			},
 																			Value: false,
@@ -172256,7 +172382,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14351,
+																				Ctx: p14341,
 																				FreeVars: ast.Identifiers{
 																					"a",
 																					"aux",
@@ -172286,7 +172412,7 @@ var _StdAst = &ast.DesugaredObject{
 																							Comment: []string{},
 																						},
 																					},
-																					Ctx: p14351,
+																					Ctx: p14341,
 																					FreeVars: ast.Identifiers{
 																						"aux",
 																					},
@@ -172312,7 +172438,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p14398,
+																								Ctx: p14388,
 																								FreeVars: ast.Identifiers{
 																									"a",
 																								},
@@ -172337,7 +172463,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p14398,
+																								Ctx: p14388,
 																								FreeVars: ast.Identifiers{
 																									"b",
 																								},
@@ -172362,7 +172488,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p14398,
+																								Ctx: p14388,
 																								FreeVars: ast.Identifiers{
 																									"i",
 																								},
@@ -172382,7 +172508,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p14398,
+																									Ctx: p14388,
 																									FreeVars: ast.Identifiers{
 																										"i",
 																									},
@@ -172406,7 +172532,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p14398,
+																									Ctx: p14388,
 																									FreeVars: nil,
 																								},
 																								OriginalString: "1",
@@ -172444,7 +172570,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14092,
+															Ctx: p14082,
 															FreeVars: ast.Identifiers{
 																"a",
 																"aux",
@@ -172473,7 +172599,7 @@ var _StdAst = &ast.DesugaredObject{
 																		Comment: []string{},
 																	},
 																},
-																Ctx: p14092,
+																Ctx: p14082,
 																FreeVars: ast.Identifiers{
 																	"aux",
 																},
@@ -172499,7 +172625,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14414,
+																			Ctx: p14404,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																			},
@@ -172524,7 +172650,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14414,
+																			Ctx: p14404,
 																			FreeVars: ast.Identifiers{
 																				"b",
 																			},
@@ -172549,7 +172675,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14414,
+																			Ctx: p14404,
 																			FreeVars: nil,
 																		},
 																		OriginalString: "0",
@@ -172591,7 +172717,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14092,
+											Ctx: p14082,
 											FreeVars: ast.Identifiers{
 												"a",
 												"b",
@@ -172613,7 +172739,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14092,
+												Ctx: p14082,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -172692,7 +172818,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14430,
+															Ctx: p14420,
 															FreeVars: ast.Identifiers{
 																"a",
 															},
@@ -172717,7 +172843,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14430,
+															Ctx: p14420,
 															FreeVars: ast.Identifiers{
 																"b",
 															},
@@ -172787,20 +172913,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "f",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "r",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "f",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "r",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -172826,7 +172953,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p14440,
+						Ctx: p14430,
 						FreeVars: ast.Identifiers{
 							"f",
 							"r",
@@ -172853,7 +172980,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14444,
+									Ctx: p14434,
 									FreeVars: ast.Identifiers{
 										"f",
 										"std",
@@ -172874,7 +173001,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14444,
+										Ctx: p14434,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -172946,7 +173073,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14453,
+													Ctx: p14443,
 													FreeVars: ast.Identifiers{
 														"f",
 													},
@@ -172971,7 +173098,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14453,
+													Ctx: p14443,
 													FreeVars: nil,
 												},
 												Value: "/",
@@ -173007,7 +173134,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p14440,
+							Ctx: p14430,
 							FreeVars: ast.Identifiers{
 								"arr",
 								"r",
@@ -173029,7 +173156,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p14440,
+								Ctx: p14430,
 								FreeVars: ast.Identifiers{
 									"std",
 								},
@@ -173108,7 +173235,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14466,
+											Ctx: p14456,
 											FreeVars: nil,
 										},
 										Value: "/",
@@ -173133,7 +173260,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14466,
+											Ctx: p14456,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"r",
@@ -173155,7 +173282,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14466,
+												Ctx: p14456,
 												FreeVars: ast.Identifiers{
 													"arr",
 													"std",
@@ -173176,7 +173303,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14466,
+													Ctx: p14456,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -173248,7 +173375,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p14478,
+																Ctx: p14468,
 																FreeVars: ast.Identifiers{
 																	"arr",
 																	"std",
@@ -173269,7 +173396,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14478,
+																	Ctx: p14468,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																		"std",
@@ -173290,7 +173417,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14478,
+																		Ctx: p14468,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -173362,7 +173489,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p14489,
+																					Ctx: p14479,
 																					FreeVars: ast.Identifiers{
 																						"arr",
 																					},
@@ -173396,7 +173523,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14478,
+																	Ctx: p14468,
 																	FreeVars: nil,
 																},
 																OriginalString: "1",
@@ -173420,21 +173547,20 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p14478,
+																Ctx: p14468,
 																FreeVars: ast.Identifiers{
 																	"arr",
 																},
 															},
 															ParenLeftFodder: ast.Fodder{},
-															Parameters: ast.Parameters{
-																Required: []ast.CommaSeparatedID{
-																	ast.CommaSeparatedID{
-																		NameFodder: ast.Fodder{},
-																		Name: "i",
-																		CommaFodder: nil,
-																	},
+															Parameters: []ast.Parameter{
+																ast.Parameter{
+																	NameFodder: ast.Fodder{},
+																	Name: "i",
+																	EqFodder: nil,
+																	DefaultArg: nil,
+																	CommaFodder: nil,
 																},
-																Optional: nil,
 															},
 															TrailingComma: false,
 															ParenRightFodder: ast.Fodder{},
@@ -173453,7 +173579,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14496,
+																	Ctx: p14486,
 																	FreeVars: ast.Identifiers{
 																		"arr",
 																		"i",
@@ -173474,7 +173600,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14496,
+																		Ctx: p14486,
 																		FreeVars: ast.Identifiers{
 																			"arr",
 																		},
@@ -173497,7 +173623,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14496,
+																		Ctx: p14486,
 																		FreeVars: ast.Identifiers{
 																			"i",
 																		},
@@ -173535,7 +173661,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14466,
+												Ctx: p14456,
 												FreeVars: ast.Identifiers{
 													"r",
 												},
@@ -173557,7 +173683,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14506,
+															Ctx: p14496,
 															FreeVars: ast.Identifiers{
 																"r",
 															},
@@ -173631,15 +173757,14 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "a",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "a",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -173665,7 +173790,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p14514,
+						Ctx: p14504,
 						FreeVars: ast.Identifiers{
 							"$",
 							"a",
@@ -173692,21 +173817,20 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: nil,
-									Ctx: p14518,
+									Ctx: p14508,
 									FreeVars: ast.Identifiers{
 										"std",
 									},
 								},
 								ParenLeftFodder: ast.Fodder{},
-								Parameters: ast.Parameters{
-									Required: []ast.CommaSeparatedID{
-										ast.CommaSeparatedID{
-											NameFodder: ast.Fodder{},
-											Name: "b",
-											CommaFodder: nil,
-										},
+								Parameters: []ast.Parameter{
+									ast.Parameter{
+										NameFodder: ast.Fodder{},
+										Name: "b",
+										EqFodder: nil,
+										DefaultArg: nil,
+										CommaFodder: nil,
 									},
-									Optional: nil,
 								},
 								TrailingComma: false,
 								ParenRightFodder: ast.Fodder{},
@@ -173732,7 +173856,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p14523,
+										Ctx: p14513,
 										FreeVars: ast.Identifiers{
 											"b",
 											"std",
@@ -173753,7 +173877,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14523,
+											Ctx: p14513,
 											FreeVars: ast.Identifiers{
 												"b",
 											},
@@ -173773,7 +173897,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14523,
+												Ctx: p14513,
 												FreeVars: ast.Identifiers{
 													"b",
 												},
@@ -173797,7 +173921,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14523,
+												Ctx: p14513,
 												FreeVars: nil,
 											},
 										},
@@ -173825,7 +173949,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p14523,
+											Ctx: p14513,
 											FreeVars: nil,
 										},
 										Value: false,
@@ -173853,7 +173977,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14523,
+											Ctx: p14513,
 											FreeVars: ast.Identifiers{
 												"b",
 												"std",
@@ -173874,7 +173998,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14523,
+												Ctx: p14513,
 												FreeVars: ast.Identifiers{
 													"b",
 													"std",
@@ -173895,7 +174019,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14523,
+													Ctx: p14513,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -173967,7 +174091,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p14544,
+																Ctx: p14534,
 																FreeVars: ast.Identifiers{
 																	"b",
 																},
@@ -174000,7 +174124,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14523,
+												Ctx: p14513,
 												FreeVars: ast.Identifiers{
 													"b",
 													"std",
@@ -174021,7 +174145,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14523,
+													Ctx: p14513,
 													FreeVars: ast.Identifiers{
 														"b",
 														"std",
@@ -174042,7 +174166,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14523,
+														Ctx: p14513,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -174121,7 +174245,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14558,
+																	Ctx: p14548,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -174155,7 +174279,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14523,
+													Ctx: p14513,
 													FreeVars: nil,
 												},
 												OriginalString: "0",
@@ -174184,7 +174308,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14523,
+												Ctx: p14513,
 												FreeVars: ast.Identifiers{
 													"b",
 													"std",
@@ -174205,7 +174329,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14523,
+													Ctx: p14513,
 													FreeVars: ast.Identifiers{
 														"b",
 														"std",
@@ -174226,7 +174350,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14523,
+														Ctx: p14513,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -174298,7 +174422,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14573,
+																	Ctx: p14563,
 																	FreeVars: ast.Identifiers{
 																		"b",
 																	},
@@ -174331,7 +174455,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14523,
+													Ctx: p14513,
 													FreeVars: ast.Identifiers{
 														"b",
 														"std",
@@ -174352,7 +174476,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14523,
+														Ctx: p14513,
 														FreeVars: ast.Identifiers{
 															"b",
 															"std",
@@ -174373,7 +174497,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14523,
+															Ctx: p14513,
 															FreeVars: ast.Identifiers{
 																"std",
 															},
@@ -174452,7 +174576,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14587,
+																		Ctx: p14577,
 																		FreeVars: ast.Identifiers{
 																			"b",
 																		},
@@ -174486,7 +174610,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14523,
+														Ctx: p14513,
 														FreeVars: nil,
 													},
 													OriginalString: "0",
@@ -174522,7 +174646,7 @@ var _StdAst = &ast.DesugaredObject{
 															Comment: []string{},
 														},
 													},
-													Ctx: p14523,
+													Ctx: p14513,
 													FreeVars: nil,
 												},
 												Value: true,
@@ -174557,7 +174681,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p14514,
+							Ctx: p14504,
 							FreeVars: ast.Identifiers{
 								"$",
 								"a",
@@ -174580,7 +174704,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p14514,
+								Ctx: p14504,
 								FreeVars: ast.Identifiers{
 									"a",
 									"std",
@@ -174601,7 +174725,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14514,
+									Ctx: p14504,
 									FreeVars: ast.Identifiers{
 										"std",
 									},
@@ -174673,7 +174797,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14605,
+												Ctx: p14595,
 												FreeVars: ast.Identifiers{
 													"a",
 												},
@@ -174809,15 +174933,14 @@ var _StdAst = &ast.DesugaredObject{
 												},
 											},
 											ParenLeftFodder: nil,
-											Parameters: ast.Parameters{
-												Required: []ast.CommaSeparatedID{
-													ast.CommaSeparatedID{
-														NameFodder: nil,
-														Name: "x",
-														CommaFodder: nil,
-													},
+											Parameters: []ast.Parameter{
+												ast.Parameter{
+													NameFodder: nil,
+													Name: "x",
+													EqFodder: nil,
+													DefaultArg: nil,
+													CommaFodder: nil,
 												},
-												Optional: nil,
 											},
 											TrailingComma: false,
 											ParenRightFodder: nil,
@@ -174859,7 +174982,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14514,
+														Ctx: p14504,
 														FreeVars: ast.Identifiers{
 															"$",
 															"isContent",
@@ -174881,7 +175004,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14514,
+															Ctx: p14504,
 															FreeVars: ast.Identifiers{
 																"isContent",
 															},
@@ -174907,7 +175030,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14626,
+																		Ctx: p14616,
 																		FreeVars: ast.Identifiers{
 																			"$",
 																			"x",
@@ -174928,7 +175051,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14626,
+																			Ctx: p14616,
 																			FreeVars: ast.Identifiers{
 																				"$",
 																			},
@@ -175000,7 +175123,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p14635,
+																						Ctx: p14625,
 																						FreeVars: ast.Identifiers{
 																							"x",
 																						},
@@ -175066,7 +175189,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14641,
+																	Ctx: p14631,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																		"x",
@@ -175087,7 +175210,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14641,
+																		Ctx: p14631,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -175159,7 +175282,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p14650,
+																					Ctx: p14640,
 																					FreeVars: ast.Identifiers{
 																						"x",
 																					},
@@ -175225,7 +175348,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14514,
+												Ctx: p14504,
 												FreeVars: ast.Identifiers{
 													"a",
 												},
@@ -175265,7 +175388,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p14514,
+								Ctx: p14504,
 								FreeVars: ast.Identifiers{
 									"$",
 									"a",
@@ -175288,7 +175411,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14514,
+									Ctx: p14504,
 									FreeVars: ast.Identifiers{
 										"a",
 										"std",
@@ -175309,7 +175432,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14514,
+										Ctx: p14504,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -175381,7 +175504,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14667,
+													Ctx: p14657,
 													FreeVars: ast.Identifiers{
 														"a",
 													},
@@ -175613,15 +175736,14 @@ var _StdAst = &ast.DesugaredObject{
 																	},
 																},
 																ParenLeftFodder: nil,
-																Parameters: ast.Parameters{
-																	Required: []ast.CommaSeparatedID{
-																		ast.CommaSeparatedID{
-																			NameFodder: nil,
-																			Name: "x",
-																			CommaFodder: nil,
-																		},
+																Parameters: []ast.Parameter{
+																	ast.Parameter{
+																		NameFodder: nil,
+																		Name: "x",
+																		EqFodder: nil,
+																		DefaultArg: nil,
+																		CommaFodder: nil,
 																	},
-																	Optional: nil,
 																},
 																TrailingComma: false,
 																ParenRightFodder: nil,
@@ -175664,7 +175786,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14514,
+																			Ctx: p14504,
 																			FreeVars: ast.Identifiers{
 																				"a",
 																				"isContent",
@@ -175687,7 +175809,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14514,
+																				Ctx: p14504,
 																				FreeVars: ast.Identifiers{
 																					"isContent",
 																				},
@@ -175713,7 +175835,7 @@ var _StdAst = &ast.DesugaredObject{
 																								File: p1,
 																							},
 																							Fodder: ast.Fodder{},
-																							Ctx: p14696,
+																							Ctx: p14686,
 																							FreeVars: ast.Identifiers{
 																								"a",
 																								"std",
@@ -175735,7 +175857,7 @@ var _StdAst = &ast.DesugaredObject{
 																									File: p1,
 																								},
 																								Fodder: ast.Fodder{},
-																								Ctx: p14696,
+																								Ctx: p14686,
 																								FreeVars: ast.Identifiers{
 																									"std",
 																								},
@@ -175807,7 +175929,7 @@ var _StdAst = &ast.DesugaredObject{
 																												File: p1,
 																											},
 																											Fodder: ast.Fodder{},
-																											Ctx: p14705,
+																											Ctx: p14695,
 																											FreeVars: ast.Identifiers{
 																												"a",
 																												"x",
@@ -175828,7 +175950,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p14705,
+																												Ctx: p14695,
 																												FreeVars: ast.Identifiers{
 																													"a",
 																												},
@@ -175851,7 +175973,7 @@ var _StdAst = &ast.DesugaredObject{
 																													File: p1,
 																												},
 																												Fodder: ast.Fodder{},
-																												Ctx: p14705,
+																												Ctx: p14695,
 																												FreeVars: ast.Identifiers{
 																													"x",
 																												},
@@ -175921,7 +176043,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p14514,
+																						Ctx: p14504,
 																						FreeVars: ast.Identifiers{
 																							"$",
 																							"a",
@@ -175947,7 +176069,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p14514,
+																									Ctx: p14504,
 																									FreeVars: ast.Identifiers{
 																										"x",
 																									},
@@ -175969,7 +176091,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p14720,
+																									Ctx: p14710,
 																									FreeVars: ast.Identifiers{
 																										"$",
 																										"a",
@@ -175991,7 +176113,7 @@ var _StdAst = &ast.DesugaredObject{
 																											File: p1,
 																										},
 																										Fodder: ast.Fodder{},
-																										Ctx: p14720,
+																										Ctx: p14710,
 																										FreeVars: ast.Identifiers{
 																											"$",
 																										},
@@ -176063,7 +176185,7 @@ var _StdAst = &ast.DesugaredObject{
 																														File: p1,
 																													},
 																													Fodder: ast.Fodder{},
-																													Ctx: p14729,
+																													Ctx: p14719,
 																													FreeVars: ast.Identifiers{
 																														"a",
 																														"x",
@@ -176084,7 +176206,7 @@ var _StdAst = &ast.DesugaredObject{
 																															File: p1,
 																														},
 																														Fodder: ast.Fodder{},
-																														Ctx: p14729,
+																														Ctx: p14719,
 																														FreeVars: ast.Identifiers{
 																															"a",
 																														},
@@ -176107,7 +176229,7 @@ var _StdAst = &ast.DesugaredObject{
 																															File: p1,
 																														},
 																														Fodder: ast.Fodder{},
-																														Ctx: p14729,
+																														Ctx: p14719,
 																														FreeVars: ast.Identifiers{
 																															"x",
 																														},
@@ -176181,7 +176303,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14514,
+																	Ctx: p14504,
 																	FreeVars: ast.Identifiers{
 																		"a",
 																		"std",
@@ -176202,7 +176324,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p14514,
+																		Ctx: p14504,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -176274,7 +176396,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p14745,
+																					Ctx: p14735,
 																					FreeVars: ast.Identifiers{
 																						"a",
 																					},
@@ -176334,7 +176456,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p14514,
+									Ctx: p14504,
 									FreeVars: ast.Identifiers{
 										"a",
 									},
@@ -176392,20 +176514,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "pat",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "pat",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -176431,7 +176554,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p14756,
+						Ctx: p14746,
 						FreeVars: ast.Identifiers{
 							"pat",
 							"std",
@@ -176453,7 +176576,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p14756,
+							Ctx: p14746,
 							FreeVars: ast.Identifiers{
 								"pat",
 								"std",
@@ -176475,7 +176598,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p14756,
+								Ctx: p14746,
 								FreeVars: ast.Identifiers{
 									"pat",
 									"std",
@@ -176496,7 +176619,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14756,
+									Ctx: p14746,
 									FreeVars: ast.Identifiers{
 										"std",
 									},
@@ -176568,7 +176691,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14769,
+												Ctx: p14759,
 												FreeVars: ast.Identifiers{
 													"pat",
 												},
@@ -176609,7 +176732,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p14756,
+							Ctx: p14746,
 							FreeVars: ast.Identifiers{
 								"pat",
 								"std",
@@ -176630,7 +176753,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p14756,
+								Ctx: p14746,
 								FreeVars: ast.Identifiers{
 									"pat",
 									"std",
@@ -176651,7 +176774,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14756,
+									Ctx: p14746,
 									FreeVars: nil,
 								},
 								Value: "findSubstr first parameter should be a string, got ",
@@ -176675,7 +176798,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14756,
+									Ctx: p14746,
 									FreeVars: ast.Identifiers{
 										"pat",
 										"std",
@@ -176696,7 +176819,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14756,
+										Ctx: p14746,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -176768,7 +176891,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14786,
+													Ctx: p14776,
 													FreeVars: ast.Identifiers{
 														"pat",
 													},
@@ -176810,7 +176933,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p14756,
+							Ctx: p14746,
 							FreeVars: ast.Identifiers{
 								"pat",
 								"std",
@@ -176832,7 +176955,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p14756,
+								Ctx: p14746,
 								FreeVars: ast.Identifiers{
 									"std",
 									"str",
@@ -176854,7 +176977,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14756,
+									Ctx: p14746,
 									FreeVars: ast.Identifiers{
 										"std",
 										"str",
@@ -176875,7 +176998,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14756,
+										Ctx: p14746,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -176947,7 +177070,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14802,
+													Ctx: p14792,
 													FreeVars: ast.Identifiers{
 														"str",
 													},
@@ -176988,7 +177111,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p14756,
+								Ctx: p14746,
 								FreeVars: ast.Identifiers{
 									"std",
 									"str",
@@ -177009,7 +177132,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14756,
+									Ctx: p14746,
 									FreeVars: ast.Identifiers{
 										"std",
 										"str",
@@ -177030,7 +177153,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14756,
+										Ctx: p14746,
 										FreeVars: nil,
 									},
 									Value: "findSubstr second parameter should be a string, got ",
@@ -177054,7 +177177,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14756,
+										Ctx: p14746,
 										FreeVars: ast.Identifiers{
 											"std",
 											"str",
@@ -177075,7 +177198,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14756,
+											Ctx: p14746,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -177147,7 +177270,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14819,
+														Ctx: p14809,
 														FreeVars: ast.Identifiers{
 															"str",
 														},
@@ -177196,7 +177319,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p14756,
+								Ctx: p14746,
 								FreeVars: ast.Identifiers{
 									"pat",
 									"std",
@@ -177223,7 +177346,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14827,
+											Ctx: p14817,
 											FreeVars: ast.Identifiers{
 												"pat",
 												"std",
@@ -177244,7 +177367,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14827,
+												Ctx: p14817,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -177316,7 +177439,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14836,
+															Ctx: p14826,
 															FreeVars: ast.Identifiers{
 																"pat",
 															},
@@ -177359,7 +177482,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p14756,
+									Ctx: p14746,
 									FreeVars: ast.Identifiers{
 										"pat",
 										"pat_len",
@@ -177387,7 +177510,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14843,
+												Ctx: p14833,
 												FreeVars: ast.Identifiers{
 													"std",
 													"str",
@@ -177408,7 +177531,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14843,
+													Ctx: p14833,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -177480,7 +177603,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p14852,
+																Ctx: p14842,
 																FreeVars: ast.Identifiers{
 																	"str",
 																},
@@ -177523,7 +177646,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p14756,
+										Ctx: p14746,
 										FreeVars: ast.Identifiers{
 											"pat",
 											"pat_len",
@@ -177547,7 +177670,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14756,
+											Ctx: p14746,
 											FreeVars: ast.Identifiers{
 												"pat_len",
 												"str_len",
@@ -177568,7 +177691,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14756,
+												Ctx: p14746,
 												FreeVars: ast.Identifiers{
 													"pat_len",
 													"str_len",
@@ -177589,7 +177712,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14756,
+													Ctx: p14746,
 													FreeVars: ast.Identifiers{
 														"pat_len",
 													},
@@ -177609,7 +177732,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14756,
+														Ctx: p14746,
 														FreeVars: ast.Identifiers{
 															"pat_len",
 														},
@@ -177633,7 +177756,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14756,
+														Ctx: p14746,
 														FreeVars: nil,
 													},
 													OriginalString: "0",
@@ -177656,7 +177779,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14756,
+													Ctx: p14746,
 													FreeVars: ast.Identifiers{
 														"str_len",
 													},
@@ -177676,7 +177799,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14756,
+														Ctx: p14746,
 														FreeVars: ast.Identifiers{
 															"str_len",
 														},
@@ -177700,7 +177823,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14756,
+														Ctx: p14746,
 														FreeVars: nil,
 													},
 													OriginalString: "0",
@@ -177724,7 +177847,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14756,
+												Ctx: p14746,
 												FreeVars: ast.Identifiers{
 													"pat_len",
 													"str_len",
@@ -177745,7 +177868,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14756,
+													Ctx: p14746,
 													FreeVars: ast.Identifiers{
 														"pat_len",
 													},
@@ -177769,7 +177892,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14756,
+													Ctx: p14746,
 													FreeVars: ast.Identifiers{
 														"str_len",
 													},
@@ -177801,7 +177924,7 @@ var _StdAst = &ast.DesugaredObject{
 													Comment: []string{},
 												},
 											},
-											Ctx: p14756,
+											Ctx: p14746,
 											FreeVars: nil,
 										},
 										Elements: nil,
@@ -177831,7 +177954,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14756,
+											Ctx: p14746,
 											FreeVars: ast.Identifiers{
 												"pat",
 												"pat_len",
@@ -177855,7 +177978,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14756,
+												Ctx: p14746,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -177934,7 +178057,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14890,
+															Ctx: p14880,
 															FreeVars: ast.Identifiers{
 																"pat",
 																"pat_len",
@@ -177943,15 +178066,14 @@ var _StdAst = &ast.DesugaredObject{
 															},
 														},
 														ParenLeftFodder: ast.Fodder{},
-														Parameters: ast.Parameters{
-															Required: []ast.CommaSeparatedID{
-																ast.CommaSeparatedID{
-																	NameFodder: ast.Fodder{},
-																	Name: "i",
-																	CommaFodder: nil,
-																},
+														Parameters: []ast.Parameter{
+															ast.Parameter{
+																NameFodder: ast.Fodder{},
+																Name: "i",
+																EqFodder: nil,
+																DefaultArg: nil,
+																CommaFodder: nil,
 															},
-															Optional: nil,
 														},
 														TrailingComma: false,
 														ParenRightFodder: ast.Fodder{},
@@ -177970,7 +178092,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p14894,
+																Ctx: p14884,
 																FreeVars: ast.Identifiers{
 																	"i",
 																	"pat",
@@ -178089,7 +178211,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p14894,
+																					Ctx: p14884,
 																					FreeVars: ast.Identifiers{
 																						"str",
 																					},
@@ -178114,7 +178236,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p14894,
+																					Ctx: p14884,
 																					FreeVars: ast.Identifiers{
 																						"i",
 																					},
@@ -178139,7 +178261,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p14894,
+																					Ctx: p14884,
 																					FreeVars: ast.Identifiers{
 																						"i",
 																						"pat_len",
@@ -178160,7 +178282,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p14894,
+																						Ctx: p14884,
 																						FreeVars: ast.Identifiers{
 																							"i",
 																						},
@@ -178184,7 +178306,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p14894,
+																						Ctx: p14884,
 																						FreeVars: ast.Identifiers{
 																							"pat_len",
 																						},
@@ -178241,7 +178363,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p14894,
+																	Ctx: p14884,
 																	FreeVars: ast.Identifiers{
 																		"pat",
 																	},
@@ -178268,7 +178390,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p14890,
+															Ctx: p14880,
 															FreeVars: ast.Identifiers{
 																"pat_len",
 																"std",
@@ -178290,7 +178412,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p14890,
+																Ctx: p14880,
 																FreeVars: ast.Identifiers{
 																	"std",
 																},
@@ -178362,7 +178484,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14926,
+																			Ctx: p14916,
 																			FreeVars: nil,
 																		},
 																		OriginalString: "0",
@@ -178385,7 +178507,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p14926,
+																			Ctx: p14916,
 																			FreeVars: ast.Identifiers{
 																				"pat_len",
 																				"str_len",
@@ -178406,7 +178528,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14926,
+																				Ctx: p14916,
 																				FreeVars: ast.Identifiers{
 																					"str_len",
 																				},
@@ -178430,7 +178552,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p14926,
+																				Ctx: p14916,
 																				FreeVars: ast.Identifiers{
 																					"pat_len",
 																				},
@@ -178511,20 +178633,21 @@ var _StdAst = &ast.DesugaredObject{
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "value",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "arr",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "value",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "arr",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: nil,
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -178550,7 +178673,7 @@ var _StdAst = &ast.DesugaredObject{
 								Comment: []string{},
 							},
 						},
-						Ctx: p14939,
+						Ctx: p14929,
 						FreeVars: ast.Identifiers{
 							"arr",
 							"std",
@@ -178572,7 +178695,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p14939,
+							Ctx: p14929,
 							FreeVars: ast.Identifiers{
 								"arr",
 								"std",
@@ -178594,7 +178717,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p14939,
+								Ctx: p14929,
 								FreeVars: ast.Identifiers{
 									"arr",
 									"std",
@@ -178615,7 +178738,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14939,
+									Ctx: p14929,
 									FreeVars: ast.Identifiers{
 										"std",
 									},
@@ -178687,7 +178810,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14952,
+												Ctx: p14942,
 												FreeVars: ast.Identifiers{
 													"arr",
 												},
@@ -178728,7 +178851,7 @@ var _StdAst = &ast.DesugaredObject{
 									Comment: []string{},
 								},
 							},
-							Ctx: p14939,
+							Ctx: p14929,
 							FreeVars: ast.Identifiers{
 								"arr",
 								"std",
@@ -178749,7 +178872,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p14939,
+								Ctx: p14929,
 								FreeVars: ast.Identifiers{
 									"arr",
 									"std",
@@ -178770,7 +178893,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14939,
+									Ctx: p14929,
 									FreeVars: nil,
 								},
 								Value: "find second parameter should be an array, got ",
@@ -178794,7 +178917,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p14939,
+									Ctx: p14929,
 									FreeVars: ast.Identifiers{
 										"arr",
 										"std",
@@ -178815,7 +178938,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p14939,
+										Ctx: p14929,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -178887,7 +179010,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14969,
+													Ctx: p14959,
 													FreeVars: ast.Identifiers{
 														"arr",
 													},
@@ -178929,7 +179052,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p14939,
+							Ctx: p14929,
 							FreeVars: ast.Identifiers{
 								"arr",
 								"std",
@@ -178951,7 +179074,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p14939,
+								Ctx: p14929,
 								FreeVars: ast.Identifiers{
 									"std",
 								},
@@ -179030,22 +179153,21 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14982,
+											Ctx: p14972,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"value",
 											},
 										},
 										ParenLeftFodder: ast.Fodder{},
-										Parameters: ast.Parameters{
-											Required: []ast.CommaSeparatedID{
-												ast.CommaSeparatedID{
-													NameFodder: ast.Fodder{},
-													Name: "i",
-													CommaFodder: nil,
-												},
+										Parameters: []ast.Parameter{
+											ast.Parameter{
+												NameFodder: ast.Fodder{},
+												Name: "i",
+												EqFodder: nil,
+												DefaultArg: nil,
+												CommaFodder: nil,
 											},
-											Optional: nil,
 										},
 										TrailingComma: false,
 										ParenRightFodder: ast.Fodder{},
@@ -179064,7 +179186,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14986,
+												Ctx: p14976,
 												FreeVars: ast.Identifiers{
 													"arr",
 													"i",
@@ -179086,7 +179208,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14986,
+													Ctx: p14976,
 													FreeVars: ast.Identifiers{
 														"arr",
 														"i",
@@ -179107,7 +179229,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14986,
+														Ctx: p14976,
 														FreeVars: ast.Identifiers{
 															"arr",
 														},
@@ -179130,7 +179252,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p14986,
+														Ctx: p14976,
 														FreeVars: ast.Identifiers{
 															"i",
 														},
@@ -179157,7 +179279,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p14986,
+													Ctx: p14976,
 													FreeVars: ast.Identifiers{
 														"value",
 													},
@@ -179184,7 +179306,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p14982,
+											Ctx: p14972,
 											FreeVars: ast.Identifiers{
 												"arr",
 												"std",
@@ -179205,7 +179327,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p14982,
+												Ctx: p14972,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -179277,7 +179399,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p15005,
+															Ctx: p14995,
 															FreeVars: nil,
 														},
 														OriginalString: "0",
@@ -179300,7 +179422,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p15005,
+															Ctx: p14995,
 															FreeVars: ast.Identifiers{
 																"arr",
 																"std",
@@ -179321,7 +179443,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p15005,
+																Ctx: p14995,
 																FreeVars: ast.Identifiers{
 																	"arr",
 																	"std",
@@ -179342,7 +179464,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p15005,
+																	Ctx: p14995,
 																	FreeVars: ast.Identifiers{
 																		"std",
 																	},
@@ -179414,7 +179536,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15017,
+																				Ctx: p15007,
 																				FreeVars: ast.Identifiers{
 																					"arr",
 																				},
@@ -179448,7 +179570,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p15005,
+																Ctx: p14995,
 																FreeVars: nil,
 															},
 															OriginalString: "1",
@@ -179499,7 +179621,7 @@ var _StdAst = &ast.DesugaredObject{
 						File: p1,
 					},
 					Fodder: ast.Fodder{},
-					Ctx: p15022,
+					Ctx: p15012,
 					FreeVars: nil,
 				},
 			},
@@ -179525,19 +179647,18 @@ var _StdAst = &ast.DesugaredObject{
 						File: p1,
 					},
 					Fodder: ast.Fodder{},
-					Ctx: p15024,
+					Ctx: p15014,
 					FreeVars: nil,
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "x",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "x",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: []ast.NamedParameter{},
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -179556,7 +179677,7 @@ var _StdAst = &ast.DesugaredObject{
 							File: p1,
 						},
 						Fodder: ast.Fodder{},
-						Ctx: p15027,
+						Ctx: p15017,
 						FreeVars: ast.Identifiers{
 							"x",
 						},
@@ -179586,26 +179707,27 @@ var _StdAst = &ast.DesugaredObject{
 						File: nil,
 					},
 					Fodder: nil,
-					Ctx: p15030,
+					Ctx: p15020,
 					FreeVars: ast.Identifiers{
 						"std",
 					},
 				},
 				ParenLeftFodder: ast.Fodder{},
-				Parameters: ast.Parameters{
-					Required: []ast.CommaSeparatedID{
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "str",
-							CommaFodder: ast.Fodder{},
-						},
-						ast.CommaSeparatedID{
-							NameFodder: ast.Fodder{},
-							Name: "base",
-							CommaFodder: nil,
-						},
+				Parameters: []ast.Parameter{
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "str",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: ast.Fodder{},
+					},
+					ast.Parameter{
+						NameFodder: ast.Fodder{},
+						Name: "base",
+						EqFodder: nil,
+						DefaultArg: nil,
+						CommaFodder: nil,
 					},
-					Optional: []ast.NamedParameter{},
 				},
 				TrailingComma: false,
 				ParenRightFodder: ast.Fodder{},
@@ -179646,7 +179768,7 @@ var _StdAst = &ast.DesugaredObject{
 								File: p1,
 							},
 							Fodder: ast.Fodder{},
-							Ctx: p15036,
+							Ctx: p15026,
 							FreeVars: ast.Identifiers{
 								"base",
 							},
@@ -179666,7 +179788,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p15039,
+								Ctx: p15029,
 								FreeVars: ast.Identifiers{
 									"base",
 								},
@@ -179686,7 +179808,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p15042,
+									Ctx: p15032,
 									FreeVars: ast.Identifiers{
 										"base",
 									},
@@ -179710,7 +179832,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p15045,
+									Ctx: p15035,
 									FreeVars: nil,
 								},
 								OriginalString: "0",
@@ -179733,7 +179855,7 @@ var _StdAst = &ast.DesugaredObject{
 									File: p1,
 								},
 								Fodder: ast.Fodder{},
-								Ctx: p15047,
+								Ctx: p15037,
 								FreeVars: ast.Identifiers{
 									"base",
 								},
@@ -179753,7 +179875,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p15050,
+									Ctx: p15040,
 									FreeVars: ast.Identifiers{
 										"base",
 									},
@@ -179777,7 +179899,7 @@ var _StdAst = &ast.DesugaredObject{
 										File: p1,
 									},
 									Fodder: ast.Fodder{},
-									Ctx: p15053,
+									Ctx: p15043,
 									FreeVars: nil,
 								},
 								OriginalString: "16",
@@ -179815,7 +179937,7 @@ var _StdAst = &ast.DesugaredObject{
 									},
 								},
 							},
-							Ctx: p15057,
+							Ctx: p15047,
 							FreeVars: ast.Identifiers{
 								"base",
 								"std",
@@ -179842,7 +179964,7 @@ var _StdAst = &ast.DesugaredObject{
 											File: p1,
 										},
 										Fodder: ast.Fodder{},
-										Ctx: p15061,
+										Ctx: p15051,
 										FreeVars: ast.Identifiers{
 											"std",
 										},
@@ -179862,7 +179984,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p15064,
+											Ctx: p15054,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -179934,7 +180056,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p15071,
+														Ctx: p15061,
 														FreeVars: nil,
 													},
 													Value: "0",
@@ -179977,7 +180099,7 @@ var _StdAst = &ast.DesugaredObject{
 										Comment: []string{},
 									},
 								},
-								Ctx: p15074,
+								Ctx: p15064,
 								FreeVars: ast.Identifiers{
 									"base",
 									"std",
@@ -180005,7 +180127,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p15078,
+											Ctx: p15068,
 											FreeVars: ast.Identifiers{
 												"std",
 											},
@@ -180025,7 +180147,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p15081,
+												Ctx: p15071,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -180097,7 +180219,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p15088,
+															Ctx: p15078,
 															FreeVars: nil,
 														},
 														Value: "A",
@@ -180140,7 +180262,7 @@ var _StdAst = &ast.DesugaredObject{
 											Comment: []string{},
 										},
 									},
-									Ctx: p15091,
+									Ctx: p15081,
 									FreeVars: ast.Identifiers{
 										"base",
 										"std",
@@ -180169,7 +180291,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p15095,
+												Ctx: p15085,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -180189,7 +180311,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p15098,
+													Ctx: p15088,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -180261,7 +180383,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p15105,
+																Ctx: p15095,
 																FreeVars: nil,
 															},
 															Value: "a",
@@ -180304,7 +180426,7 @@ var _StdAst = &ast.DesugaredObject{
 												Comment: []string{},
 											},
 										},
-										Ctx: p15108,
+										Ctx: p15098,
 										FreeVars: ast.Identifiers{
 											"base",
 											"lower_a_code",
@@ -180334,7 +180456,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: nil,
-													Ctx: p15112,
+													Ctx: p15102,
 													FreeVars: ast.Identifiers{
 														"base",
 														"lower_a_code",
@@ -180345,20 +180467,21 @@ var _StdAst = &ast.DesugaredObject{
 													},
 												},
 												ParenLeftFodder: ast.Fodder{},
-												Parameters: ast.Parameters{
-													Required: []ast.CommaSeparatedID{
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "aggregate",
-															CommaFodder: ast.Fodder{},
-														},
-														ast.CommaSeparatedID{
-															NameFodder: ast.Fodder{},
-															Name: "char",
-															CommaFodder: nil,
-														},
+												Parameters: []ast.Parameter{
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "aggregate",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: ast.Fodder{},
+													},
+													ast.Parameter{
+														NameFodder: ast.Fodder{},
+														Name: "char",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: nil,
 													},
-													Optional: []ast.NamedParameter{},
 												},
 												TrailingComma: false,
 												ParenRightFodder: ast.Fodder{},
@@ -180384,7 +180507,7 @@ var _StdAst = &ast.DesugaredObject{
 																Comment: []string{},
 															},
 														},
-														Ctx: p15117,
+														Ctx: p15107,
 														FreeVars: ast.Identifiers{
 															"aggregate",
 															"base",
@@ -180416,7 +180539,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p15121,
+																	Ctx: p15111,
 																	FreeVars: ast.Identifiers{
 																		"char",
 																		"std",
@@ -180437,7 +180560,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p15124,
+																		Ctx: p15114,
 																		FreeVars: ast.Identifiers{
 																			"std",
 																		},
@@ -180509,7 +180632,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p15131,
+																					Ctx: p15121,
 																					FreeVars: ast.Identifiers{
 																						"char",
 																					},
@@ -180552,7 +180675,7 @@ var _StdAst = &ast.DesugaredObject{
 																	Comment: []string{},
 																},
 															},
-															Ctx: p15135,
+															Ctx: p15125,
 															FreeVars: ast.Identifiers{
 																"aggregate",
 																"base",
@@ -180584,7 +180707,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p15139,
+																		Ctx: p15129,
 																		FreeVars: ast.Identifiers{
 																			"code",
 																			"lower_a_code",
@@ -180607,7 +180730,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p15142,
+																			Ctx: p15132,
 																			FreeVars: ast.Identifiers{
 																				"code",
 																				"lower_a_code",
@@ -180628,7 +180751,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15145,
+																				Ctx: p15135,
 																				FreeVars: ast.Identifiers{
 																					"code",
 																				},
@@ -180652,7 +180775,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15148,
+																				Ctx: p15138,
 																				FreeVars: ast.Identifiers{
 																					"lower_a_code",
 																				},
@@ -180676,7 +180799,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p15151,
+																			Ctx: p15141,
 																			FreeVars: ast.Identifiers{
 																				"code",
 																				"lower_a_code",
@@ -180697,7 +180820,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15154,
+																				Ctx: p15144,
 																				FreeVars: ast.Identifiers{
 																					"code",
 																					"lower_a_code",
@@ -180725,7 +180848,7 @@ var _StdAst = &ast.DesugaredObject{
 																							Comment: []string{},
 																						},
 																					},
-																					Ctx: p15158,
+																					Ctx: p15148,
 																					FreeVars: ast.Identifiers{
 																						"code",
 																					},
@@ -180749,7 +180872,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p15161,
+																					Ctx: p15151,
 																					FreeVars: ast.Identifiers{
 																						"lower_a_code",
 																					},
@@ -180774,7 +180897,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15164,
+																				Ctx: p15154,
 																				FreeVars: nil,
 																			},
 																			OriginalString: "10",
@@ -180803,7 +180926,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p15167,
+																			Ctx: p15157,
 																			FreeVars: ast.Identifiers{
 																				"code",
 																				"upper_a_code",
@@ -180825,7 +180948,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15170,
+																				Ctx: p15160,
 																				FreeVars: ast.Identifiers{
 																					"code",
 																					"upper_a_code",
@@ -180846,7 +180969,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p15173,
+																					Ctx: p15163,
 																					FreeVars: ast.Identifiers{
 																						"code",
 																					},
@@ -180870,7 +180993,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p15176,
+																					Ctx: p15166,
 																					FreeVars: ast.Identifiers{
 																						"upper_a_code",
 																					},
@@ -180894,7 +181017,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15179,
+																				Ctx: p15169,
 																				FreeVars: ast.Identifiers{
 																					"code",
 																					"upper_a_code",
@@ -180915,7 +181038,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p15182,
+																					Ctx: p15172,
 																					FreeVars: ast.Identifiers{
 																						"code",
 																						"upper_a_code",
@@ -180943,7 +181066,7 @@ var _StdAst = &ast.DesugaredObject{
 																								Comment: []string{},
 																							},
 																						},
-																						Ctx: p15186,
+																						Ctx: p15176,
 																						FreeVars: ast.Identifiers{
 																							"code",
 																						},
@@ -180967,7 +181090,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p15189,
+																						Ctx: p15179,
 																						FreeVars: ast.Identifiers{
 																							"upper_a_code",
 																						},
@@ -180992,7 +181115,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p15192,
+																					Ctx: p15182,
 																					FreeVars: nil,
 																				},
 																				OriginalString: "10",
@@ -181021,7 +181144,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15195,
+																				Ctx: p15185,
 																				FreeVars: ast.Identifiers{
 																					"code",
 																					"zero_code",
@@ -181049,7 +181172,7 @@ var _StdAst = &ast.DesugaredObject{
 																							Comment: []string{},
 																						},
 																					},
-																					Ctx: p15199,
+																					Ctx: p15189,
 																					FreeVars: ast.Identifiers{
 																						"code",
 																					},
@@ -181073,7 +181196,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p15202,
+																					Ctx: p15192,
 																					FreeVars: ast.Identifiers{
 																						"zero_code",
 																					},
@@ -181126,7 +181249,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p15207,
+																	Ctx: p15197,
 																	FreeVars: ast.Identifiers{
 																		"base",
 																		"digit",
@@ -181147,7 +181270,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p15210,
+																		Ctx: p15200,
 																		FreeVars: ast.Identifiers{
 																			"digit",
 																		},
@@ -181167,7 +181290,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p15213,
+																			Ctx: p15203,
 																			FreeVars: ast.Identifiers{
 																				"digit",
 																			},
@@ -181191,7 +181314,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p15216,
+																			Ctx: p15206,
 																			FreeVars: nil,
 																		},
 																		OriginalString: "0",
@@ -181214,7 +181337,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p15218,
+																		Ctx: p15208,
 																		FreeVars: ast.Identifiers{
 																			"base",
 																			"digit",
@@ -181235,7 +181358,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p15221,
+																			Ctx: p15211,
 																			FreeVars: ast.Identifiers{
 																				"digit",
 																			},
@@ -181259,7 +181382,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p15224,
+																			Ctx: p15214,
 																			FreeVars: ast.Identifiers{
 																				"base",
 																			},
@@ -181284,7 +181407,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p15227,
+																	Ctx: p15217,
 																	FreeVars: ast.Identifiers{
 																		"aggregate",
 																		"base",
@@ -181306,7 +181429,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p15230,
+																		Ctx: p15220,
 																		FreeVars: ast.Identifiers{
 																			"aggregate",
 																			"base",
@@ -181334,7 +181457,7 @@ var _StdAst = &ast.DesugaredObject{
 																					Comment: []string{},
 																				},
 																			},
-																			Ctx: p15234,
+																			Ctx: p15224,
 																			FreeVars: ast.Identifiers{
 																				"base",
 																			},
@@ -181358,7 +181481,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p15237,
+																			Ctx: p15227,
 																			FreeVars: ast.Identifiers{
 																				"aggregate",
 																			},
@@ -181383,7 +181506,7 @@ var _StdAst = &ast.DesugaredObject{
 																			File: p1,
 																		},
 																		Fodder: ast.Fodder{},
-																		Ctx: p15240,
+																		Ctx: p15230,
 																		FreeVars: ast.Identifiers{
 																			"digit",
 																		},
@@ -181523,7 +181646,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p15253,
+																						Ctx: p15243,
 																						FreeVars: nil,
 																					},
 																					Value: "%s is not a base %d integer",
@@ -181548,7 +181671,7 @@ var _StdAst = &ast.DesugaredObject{
 																							File: p1,
 																						},
 																						Fodder: ast.Fodder{},
-																						Ctx: p15255,
+																						Ctx: p15245,
 																						FreeVars: ast.Identifiers{
 																							"base",
 																							"str",
@@ -181571,7 +181694,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p15259,
+																									Ctx: p15249,
 																									FreeVars: ast.Identifiers{
 																										"str",
 																									},
@@ -181596,7 +181719,7 @@ var _StdAst = &ast.DesugaredObject{
 																										File: p1,
 																									},
 																									Fodder: ast.Fodder{},
-																									Ctx: p15262,
+																									Ctx: p15252,
 																									FreeVars: ast.Identifiers{
 																										"base",
 																									},
@@ -181643,7 +181766,7 @@ var _StdAst = &ast.DesugaredObject{
 												File: p1,
 											},
 											Fodder: ast.Fodder{},
-											Ctx: p15265,
+											Ctx: p15255,
 											FreeVars: ast.Identifiers{
 												"addDigit",
 												"std",
@@ -181665,7 +181788,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p15268,
+												Ctx: p15258,
 												FreeVars: ast.Identifiers{
 													"std",
 												},
@@ -181744,7 +181867,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p15276,
+															Ctx: p15266,
 															FreeVars: ast.Identifiers{
 																"addDigit",
 															},
@@ -181769,7 +181892,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p15279,
+															Ctx: p15269,
 															FreeVars: ast.Identifiers{
 																"std",
 																"str",
@@ -181790,7 +181913,7 @@ var _StdAst = &ast.DesugaredObject{
 																	File: p1,
 																},
 																Fodder: ast.Fodder{},
-																Ctx: p15282,
+																Ctx: p15272,
 																FreeVars: ast.Identifiers{
 																	"std",
 																},
@@ -181862,7 +181985,7 @@ var _StdAst = &ast.DesugaredObject{
 																				File: p1,
 																			},
 																			Fodder: ast.Fodder{},
-																			Ctx: p15289,
+																			Ctx: p15279,
 																			FreeVars: ast.Identifiers{
 																				"str",
 																			},
@@ -181897,7 +182020,7 @@ var _StdAst = &ast.DesugaredObject{
 																File: p1,
 															},
 															Fodder: ast.Fodder{},
-															Ctx: p15292,
+															Ctx: p15282,
 															FreeVars: nil,
 														},
 														OriginalString: "0",
@@ -182046,7 +182169,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p15304,
+												Ctx: p15294,
 												FreeVars: nil,
 											},
 											Value: "integer base %d invalid",
@@ -182071,7 +182194,7 @@ var _StdAst = &ast.DesugaredObject{
 													File: p1,
 												},
 												Fodder: ast.Fodder{},
-												Ctx: p15306,
+												Ctx: p15296,
 												FreeVars: ast.Identifiers{
 													"base",
 												},
@@ -182113,7 +182236,7 @@ var _StdAst = &ast.DesugaredObject{
 						File: p1,
 					},
 					Fodder: ast.Fodder{},
-					Ctx: p15309,
+					Ctx: p15299,
 					FreeVars: nil,
 				},
 				Value: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
@@ -182334,15 +182457,14 @@ var _StdAst = &ast.DesugaredObject{
 													},
 												},
 												ParenLeftFodder: nil,
-												Parameters: ast.Parameters{
-													Required: []ast.CommaSeparatedID{
-														ast.CommaSeparatedID{
-															NameFodder: nil,
-															Name: "i",
-															CommaFodder: nil,
-														},
+												Parameters: []ast.Parameter{
+													ast.Parameter{
+														NameFodder: nil,
+														Name: "i",
+														EqFodder: nil,
+														DefaultArg: nil,
+														CommaFodder: nil,
 													},
-													Optional: nil,
 												},
 												TrailingComma: false,
 												ParenRightFodder: nil,
@@ -182384,7 +182506,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p15333,
+																	Ctx: p15323,
 																	FreeVars: ast.Identifiers{
 																		"base64_table",
 																		"i",
@@ -182409,7 +182531,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15337,
+																				Ctx: p15327,
 																				FreeVars: ast.Identifiers{
 																					"base64_table",
 																					"i",
@@ -182430,7 +182552,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p15340,
+																					Ctx: p15330,
 																					FreeVars: ast.Identifiers{
 																						"base64_table",
 																					},
@@ -182453,7 +182575,7 @@ var _StdAst = &ast.DesugaredObject{
 																						File: p1,
 																					},
 																					Fodder: ast.Fodder{},
-																					Ctx: p15343,
+																					Ctx: p15333,
 																					FreeVars: ast.Identifiers{
 																						"i",
 																					},
@@ -182478,7 +182600,7 @@ var _StdAst = &ast.DesugaredObject{
 																					File: p1,
 																				},
 																				Fodder: ast.Fodder{},
-																				Ctx: p15346,
+																				Ctx: p15336,
 																				FreeVars: ast.Identifiers{
 																					"i",
 																				},
@@ -182515,7 +182637,7 @@ var _StdAst = &ast.DesugaredObject{
 														File: p1,
 													},
 													Fodder: ast.Fodder{},
-													Ctx: p15349,
+													Ctx: p15339,
 													FreeVars: ast.Identifiers{
 														"std",
 													},
@@ -182535,7 +182657,7 @@ var _StdAst = &ast.DesugaredObject{
 															File: p1,
 														},
 														Fodder: ast.Fodder{},
-														Ctx: p15352,
+														Ctx: p15342,
 														FreeVars: ast.Identifiers{
 															"std",
 														},
@@ -182607,7 +182729,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p15359,
+																	Ctx: p15349,
 																	FreeVars: nil,
 																},
 																OriginalString: "0",
@@ -182630,7 +182752,7 @@ var _StdAst = &ast.DesugaredObject{
 																		File: p1,
 																	},
 																	Fodder: ast.Fodder{},
-																	Ctx: p15361,
+																	Ctx: p15351,
 																	FreeVars: nil,
 																},
 																OriginalString: "63",
diff --git a/builtins.go b/builtins.go
index f17c038..37a8d1e 100644
--- a/builtins.go
+++ b/builtins.go
@@ -182,7 +182,11 @@ func builtinLength(i *interpreter, trace traceElement, x value) (value, error) {
 	case valueString:
 		num = x.length()
 	case *valueFunction:
-		num = len(x.Parameters().required)
+		for _, param := range x.Parameters() {
+			if param.defaultArg == nil {
+				num++
+			}
+		}
 	default:
 		return nil, i.typeErrorGeneral(x, trace)
 	}
@@ -352,15 +356,15 @@ func builtinReverse(i *interpreter, trace traceElement, arrv value) (value, erro
 		return nil, err
 	}
 
-	lenArr := len(arr.elements)                    // lenx holds the original array length
-	reversed_array := make([]*cachedThunk, lenArr) // creates a slice that refer to a new array of length lenx
+	lenArr := len(arr.elements)                   // lenx holds the original array length
+	reversedArray := make([]*cachedThunk, lenArr) // creates a slice that refer to a new array of length lenx
 
 	for i := 0; i < lenArr; i++ {
 		j := lenArr - (i + 1) // j initially holds (lenx - 1) and decreases to 0 while i initially holds 0 and increase to (lenx - 1)
-		reversed_array[i] = arr.elements[j]
+		reversedArray[i] = arr.elements[j]
 	}
 
-	return makeValueArray(reversed_array), nil
+	return makeValueArray(reversedArray), nil
 }
 
 func builtinFilter(i *interpreter, trace traceElement, funcv, arrv value) (value, error) {
@@ -1197,25 +1201,24 @@ type builtin interface {
 	Name() ast.Identifier
 }
 
-func flattenArgs(args callArguments, params parameters, defaults []value) []*cachedThunk {
+func flattenArgs(args callArguments, params []namedParameter, defaults []value) []*cachedThunk {
 	positions := make(map[ast.Identifier]int)
-	for i := 0; i < len(params.required); i++ {
-		positions[params.required[i]] = i
-	}
-	for i := 0; i < len(params.optional); i++ {
-		positions[params.optional[i].name] = i + len(params.required)
+	for i, param := range params {
+		positions[param.name] = i
 	}
 
-	flatArgs := make([]*cachedThunk, len(params.required)+len(params.optional))
+	flatArgs := make([]*cachedThunk, len(params))
 
+	// Bind positional arguments
 	copy(flatArgs, args.positional)
+	// Bind named arguments
 	for _, arg := range args.named {
 		flatArgs[positions[arg.name]] = arg.pv
 	}
-	for i := 0; i < len(params.optional); i++ {
-		pos := len(params.required) + i
-		if flatArgs[pos] == nil {
-			flatArgs[pos] = readyThunk(defaults[i])
+	// Bind defaults for unsatisfied named parameters
+	for i := range params {
+		if flatArgs[i] == nil {
+			flatArgs[i] = readyThunk(defaults[i])
 		}
 	}
 	return flatArgs
@@ -1244,8 +1247,12 @@ func (b *unaryBuiltin) evalCall(args callArguments, i *interpreter, trace traceE
 	return b.function(i, builtinTrace, x)
 }
 
-func (b *unaryBuiltin) Parameters() parameters {
-	return parameters{required: b.parameters}
+func (b *unaryBuiltin) Parameters() []namedParameter {
+	ret := make([]namedParameter, len(b.parameters))
+	for i := range ret {
+		ret[i].name = b.parameters[i]
+	}
+	return ret
 }
 
 func (b *unaryBuiltin) Name() ast.Identifier {
@@ -1274,8 +1281,12 @@ func (b *binaryBuiltin) evalCall(args callArguments, i *interpreter, trace trace
 	return b.function(i, builtinTrace, x, y)
 }
 
-func (b *binaryBuiltin) Parameters() parameters {
-	return parameters{required: b.parameters}
+func (b *binaryBuiltin) Parameters() []namedParameter {
+	ret := make([]namedParameter, len(b.parameters))
+	for i := range ret {
+		ret[i].name = b.parameters[i]
+	}
+	return ret
 }
 
 func (b *binaryBuiltin) Name() ast.Identifier {
@@ -1308,8 +1319,12 @@ func (b *ternaryBuiltin) evalCall(args callArguments, i *interpreter, trace trac
 	return b.function(i, builtinTrace, x, y, z)
 }
 
-func (b *ternaryBuiltin) Parameters() parameters {
-	return parameters{required: b.parameters}
+func (b *ternaryBuiltin) Parameters() []namedParameter {
+	ret := make([]namedParameter, len(b.parameters))
+	for i := range ret {
+		ret[i].name = b.parameters[i]
+	}
+	return ret
 }
 
 func (b *ternaryBuiltin) Name() ast.Identifier {
@@ -1318,25 +1333,44 @@ func (b *ternaryBuiltin) Name() ast.Identifier {
 
 type generalBuiltinFunc func(*interpreter, traceElement, []value) (value, error)
 
-// generalBuiltin covers cases that other builtin structures do not,
-// in particular it can have any number of parameters. It can also
-// have optional parameters.
-type generalBuiltin struct {
-	name     ast.Identifier
-	required ast.Identifiers
-	optional ast.Identifiers
+type generalBuiltinParameter struct {
+	name ast.Identifier
 	// Note that the defaults are passed as values rather than AST nodes like in Parameters.
 	// This spares us unnecessary evaluation.
-	defaultValues []value
-	function      generalBuiltinFunc
+	defaultValue value
 }
 
-func (b *generalBuiltin) Parameters() parameters {
-	optional := make([]namedParameter, len(b.optional))
-	for i := range optional {
-		optional[i] = namedParameter{name: b.optional[i]}
+// generalBuiltin covers cases that other builtin structures do not,
+// in particular it can have any number of parameters. It can also
+// have optional parameters.  The optional ones have non-nil defaultValues
+// at the same index.
+type generalBuiltin struct {
+	name       ast.Identifier
+	parameters []generalBuiltinParameter
+	function   generalBuiltinFunc
+}
+
+func (b *generalBuiltin) Parameters() []namedParameter {
+	ret := make([]namedParameter, len(b.parameters))
+	for i := range ret {
+		ret[i].name = b.parameters[i].name
+		if b.parameters[i].defaultValue != nil {
+			// This is not actually used because the defaultValue is used instead.
+			// The only reason we don't leave it nil is because the checkArguments
+			// function uses the non-nil status to indicate that the parameter
+			// is optional.
+			ret[i].defaultArg = &ast.LiteralNull{}
+		}
 	}
-	return parameters{required: b.required, optional: optional}
+	return ret
+}
+
+func (b *generalBuiltin) defaultValues() []value {
+	ret := make([]value, len(b.parameters))
+	for i := range ret {
+		ret[i] = b.parameters[i].defaultValue
+	}
+	return ret
 }
 
 func (b *generalBuiltin) Name() ast.Identifier {
@@ -1344,7 +1378,7 @@ func (b *generalBuiltin) Name() ast.Identifier {
 }
 
 func (b *generalBuiltin) evalCall(args callArguments, i *interpreter, trace traceElement) (value, error) {
-	flatArgs := flattenArgs(args, b.Parameters(), b.defaultValues)
+	flatArgs := flattenArgs(args, b.Parameters(), b.defaultValues())
 	builtinTrace := getBuiltinTrace(trace, b.name)
 	values := make([]value, len(flatArgs))
 	for j := 0; j < len(values); j++ {
@@ -1445,7 +1479,7 @@ var funcBuiltins = buildBuiltinMap([]builtin{
 	&unaryBuiltin{name: "base64", function: builtinBase64, parameters: ast.Identifiers{"input"}},
 	&unaryBuiltin{name: "encodeUTF8", function: builtinEncodeUTF8, parameters: ast.Identifiers{"str"}},
 	&unaryBuiltin{name: "decodeUTF8", function: builtinDecodeUTF8, parameters: ast.Identifiers{"arr"}},
-	&generalBuiltin{name: "sort", function: builtinSort, required: ast.Identifiers{"arr"}, optional: ast.Identifiers{"keyF"}, defaultValues: []value{functionID}},
+	&generalBuiltin{name: "sort", function: builtinSort, parameters: []generalBuiltinParameter{{name: "arr"}, {name: "keyF", defaultValue: functionID}}},
 	&unaryBuiltin{name: "native", function: builtinNative, parameters: ast.Identifiers{"x"}},
 
 	// internal
diff --git a/internal/parser/context.go b/internal/parser/context.go
index 803b301..a1c0220 100644
--- a/internal/parser/context.go
+++ b/internal/parser/context.go
@@ -298,8 +298,10 @@ func specialChildren(node ast.Node) []ast.Node {
 		return nil
 	case *ast.Function:
 		children := []ast.Node{node.Body}
-		for _, child := range node.Parameters.Optional {
-			children = append(children, child.DefaultArg)
+		for _, child := range node.Parameters {
+			if child.DefaultArg != nil {
+				children = append(children, child.DefaultArg)
+			}
 		}
 		return children
 	case *ast.Import:
@@ -389,9 +391,11 @@ func addContext(node ast.Node, context *string, bind string) {
 	case *ast.Function:
 		funContext := functionContext(bind)
 		addContext(node.Body, funContext, anonymous)
-		for i := range node.Parameters.Optional {
-			// Default arguments have the same context as the function body.
-			addContext(node.Parameters.Optional[i].DefaultArg, funContext, anonymous)
+		for i := range node.Parameters {
+			if node.Parameters[i].DefaultArg != nil {
+				// Default arguments have the same context as the function body.
+				addContext(node.Parameters[i].DefaultArg, funContext, anonymous)
+			}
 		}
 	case *ast.Object:
 		// TODO(sbarzowski) include fieldname, maybe even chains
diff --git a/internal/parser/parser.go b/internal/parser/parser.go
index 3ec97e9..a38fb3d 100644
--- a/internal/parser/parser.go
+++ b/internal/parser/parser.go
@@ -210,25 +210,25 @@ func (p *parser) parseArguments(elementKind string) (*token, *ast.Arguments, boo
 }
 
 // TODO(sbarzowski) - this returned bool is weird
-func (p *parser) parseParameters(elementKind string) (*token, *ast.Parameters, bool, error) {
+func (p *parser) parseParameters(elementKind string) (*token, []ast.Parameter, bool, error) {
 	parenR, args, trailingComma, err := p.parseArguments(elementKind)
 	if err != nil {
 		return nil, nil, false, err
 	}
-	var params ast.Parameters
+	var params []ast.Parameter
 	for _, arg := range args.Positional {
 		idFodder, id, ok := astVarToIdentifier(arg.Expr)
 		if !ok {
 			return nil, nil, false, errors.MakeStaticError(fmt.Sprintf("Expected simple identifier but got a complex expression."), *arg.Expr.Loc())
 		}
-		params.Required = append(params.Required, ast.CommaSeparatedID{
+		params = append(params, ast.Parameter{
 			NameFodder:  idFodder,
 			Name:        *id,
 			CommaFodder: arg.CommaFodder,
 		})
 	}
 	for _, arg := range args.Named {
-		params.Optional = append(params.Optional, ast.NamedParameter{
+		params = append(params, ast.Parameter{
 			NameFodder:  arg.NameFodder,
 			Name:        arg.Name,
 			EqFodder:    arg.EqFodder,
@@ -236,7 +236,7 @@ func (p *parser) parseParameters(elementKind string) (*token, *ast.Parameters, b
 			CommaFodder: arg.CommaFodder,
 		})
 	}
-	return parenR, &params, trailingComma, nil
+	return parenR, params, trailingComma, nil
 }
 
 // TODO(sbarzowski) add location to all individual binds
@@ -260,7 +260,7 @@ func (p *parser) parseBind(binds *ast.LocalBinds) (*token, error) {
 		}
 		fun = &ast.Function{
 			ParenLeftFodder:  parenL.fodder,
-			Parameters:       *params,
+			Parameters:       params,
 			TrailingComma:    gotComma,
 			ParenRightFodder: parenR.fodder,
 			// Body gets filled in later.
@@ -423,7 +423,7 @@ func (p *parser) parseObjectRemainderField(literalFields *LiteralFieldSet, tok *
 	methComma := false
 	var parenL *token
 	var parenR *token
-	var params *ast.Parameters
+	var params []ast.Parameter
 	if p.peek().kind == tokenParenL {
 		parenL = p.pop()
 		var err error
@@ -460,7 +460,7 @@ func (p *parser) parseObjectRemainderField(literalFields *LiteralFieldSet, tok *
 	if isMethod {
 		method = &ast.Function{
 			ParenLeftFodder:  parenL.fodder,
-			Parameters:       *params,
+			Parameters:       params,
 			TrailingComma:    methComma,
 			ParenRightFodder: parenR.fodder,
 			Body:             body,
@@ -505,7 +505,7 @@ func (p *parser) parseObjectRemainderLocal(binds *ast.IdentifierSet, tok *token,
 	funcComma := false
 	var parenL *token
 	var parenR *token
-	var params *ast.Parameters
+	var params []ast.Parameter
 	if p.peek().kind == tokenParenL {
 		parenL = p.pop()
 		isMethod = true
@@ -528,7 +528,7 @@ func (p *parser) parseObjectRemainderLocal(binds *ast.IdentifierSet, tok *token,
 	if isMethod {
 		method = &ast.Function{
 			ParenLeftFodder:  parenL.fodder,
-			Parameters:       *params,
+			Parameters:       params,
 			ParenRightFodder: parenR.fodder,
 			TrailingComma:    funcComma,
 			Body:             body,
@@ -1050,7 +1050,7 @@ func (p *parser) parse(prec precedence) (ast.Node, error) {
 		return &ast.Function{
 			NodeBase:         ast.NewNodeBaseLoc(locFromTokenAST(begin, body), begin.fodder),
 			ParenLeftFodder:  next.fodder,
-			Parameters:       *params,
+			Parameters:       params,
 			TrailingComma:    gotComma,
 			ParenRightFodder: parenR.fodder,
 			Body:             body,
diff --git a/internal/program/desugarer.go b/internal/program/desugarer.go
index f79d4b9..761476a 100644
--- a/internal/program/desugarer.go
+++ b/internal/program/desugarer.go
@@ -192,10 +192,8 @@ func desugarFields(nodeBase ast.NodeBase, fields *ast.ObjectFields, objLevel int
 
 func simpleLambda(body ast.Node, paramName ast.Identifier) ast.Node {
 	return &ast.Function{
-		Body: body,
-		Parameters: ast.Parameters{
-			Required: []ast.CommaSeparatedID{{Name: paramName}},
-		},
+		Body:       body,
+		Parameters: []ast.Parameter{{Name: paramName}},
 	}
 }
 
@@ -431,11 +429,13 @@ func desugar(astPtr *ast.Node, objLevel int) (err error) {
 		}
 
 	case *ast.Function:
-		for i := range node.Parameters.Optional {
-			param := &node.Parameters.Optional[i]
-			err = desugar(&param.DefaultArg, objLevel)
-			if err != nil {
-				return
+		for i := range node.Parameters {
+			param := &node.Parameters[i]
+			if param.DefaultArg != nil {
+				err = desugar(&param.DefaultArg, objLevel)
+				if err != nil {
+					return
+				}
 			}
 		}
 		err = desugar(&node.Body, objLevel)
diff --git a/internal/program/static_analyzer.go b/internal/program/static_analyzer.go
index 53f004e..21c4216 100644
--- a/internal/program/static_analyzer.go
+++ b/internal/program/static_analyzer.go
@@ -76,21 +76,17 @@ func analyzeVisit(a ast.Node, inObject bool, vars ast.IdentifierSet) error {
 		visitNext(a.Expr, inObject, vars, s)
 	case *ast.Function:
 		newVars := vars.Clone()
-		for _, param := range a.Parameters.Required {
+		for _, param := range a.Parameters {
 			newVars.Add(param.Name)
 		}
-		for _, param := range a.Parameters.Optional {
-			newVars.Add(param.Name)
-		}
-		for _, param := range a.Parameters.Optional {
-			visitNext(param.DefaultArg, inObject, newVars, s)
+		for _, param := range a.Parameters {
+			if param.DefaultArg != nil {
+				visitNext(param.DefaultArg, inObject, newVars, s)
+			}
 		}
 		visitNext(a.Body, inObject, newVars, s)
 		// Parameters are free inside the body, but not visible here or outside
-		for _, param := range a.Parameters.Required {
-			s.freeVars.Remove(param.Name)
-		}
-		for _, param := range a.Parameters.Optional {
+		for _, param := range a.Parameters {
 			s.freeVars.Remove(param.Name)
 		}
 	case *ast.Import:
diff --git a/linter/find_variables.go b/linter/find_variables.go
index aa99545..dede6a8 100644
--- a/linter/find_variables.go
+++ b/linter/find_variables.go
@@ -27,14 +27,13 @@ func cloneScope(oldScope vScope) vScope {
 }
 
 func findVariablesInFunc(node *ast.Function, info *LintingInfo, scope vScope) {
-	for _, param := range node.Parameters.Required {
+	for _, param := range node.Parameters {
 		addVar(param.Name, node, info, scope, true)
 	}
-	for _, param := range node.Parameters.Optional {
-		addVar(param.Name, node, info, scope, true)
-	}
-	for _, param := range node.Parameters.Optional {
-		findVariables(param.DefaultArg, info, scope)
+	for _, param := range node.Parameters {
+		if param.DefaultArg != nil {
+			findVariables(param.DefaultArg, info, scope)
+		}
 	}
 	findVariables(node.Body, info, scope)
 }
diff --git a/thunks.go b/thunks.go
index ed0618e..4370d07 100644
--- a/thunks.go
+++ b/thunks.go
@@ -16,7 +16,9 @@ limitations under the License.
 
 package jsonnet
 
-import "github.com/google/go-jsonnet/ast"
+import (
+	"github.com/google/go-jsonnet/ast"
+)
 
 // readyValue
 // -------------------------------------
@@ -147,7 +149,7 @@ type closure struct {
 	// arguments should be added to it, before executing it
 	env      environment
 	function *ast.Function
-	params   parameters
+	params   []namedParameter
 }
 
 func forceThunks(i *interpreter, trace traceElement, args *bindingFrame) error {
@@ -164,13 +166,7 @@ func (closure *closure) evalCall(arguments callArguments, i *interpreter, trace
 	argThunks := make(bindingFrame)
 	parameters := closure.Parameters()
 	for i, arg := range arguments.positional {
-		var name ast.Identifier
-		if i < len(parameters.required) {
-			name = parameters.required[i]
-		} else {
-			name = parameters.optional[i-len(parameters.required)].name
-		}
-		argThunks[name] = arg
+		argThunks[parameters[i].name] = arg
 	}
 
 	for _, arg := range arguments.named {
@@ -179,8 +175,7 @@ func (closure *closure) evalCall(arguments callArguments, i *interpreter, trace
 
 	var calledEnvironment environment
 
-	for i := range parameters.optional {
-		param := &parameters.optional[i]
+	for _, param := range parameters {
 		if _, exists := argThunks[param.name]; !exists {
 			argThunks[param.name] = &cachedThunk{
 				// Default arguments are evaluated in the same environment as function body
@@ -204,27 +199,20 @@ func (closure *closure) evalCall(arguments callArguments, i *interpreter, trace
 	return i.EvalInCleanEnv(trace, &calledEnvironment, closure.function.Body, arguments.tailstrict)
 }
 
-func (closure *closure) Parameters() parameters {
+func (closure *closure) Parameters() []namedParameter {
 	return closure.params
 
 }
 
-func prepareClosureParameters(params ast.Parameters, env environment) parameters {
-	optionalParameters := make([]namedParameter, 0, len(params.Optional))
-	for _, named := range params.Optional {
-		optionalParameters = append(optionalParameters, namedParameter{
+func prepareClosureParameters(params []ast.Parameter, env environment) []namedParameter {
+	preparedParams := make([]namedParameter, 0, len(params))
+	for _, named := range params {
+		preparedParams = append(preparedParams, namedParameter{
 			name:       named.Name,
 			defaultArg: named.DefaultArg,
 		})
 	}
-	requiredParameters := make([]ast.Identifier, 0, len(params.Required))
-	for _, required := range params.Required {
-		requiredParameters = append(requiredParameters, required.Name)
-	}
-	return parameters{
-		required: requiredParameters,
-		optional: optionalParameters,
-	}
+	return preparedParams
 }
 
 func makeClosure(env environment, function *ast.Function) *closure {
@@ -265,8 +253,12 @@ func (native *NativeFunction) evalCall(arguments callArguments, i *interpreter,
 }
 
 // Parameters returns a NativeFunction's parameters.
-func (native *NativeFunction) Parameters() parameters {
-	return parameters{required: native.Params}
+func (native *NativeFunction) Parameters() []namedParameter {
+	ret := make([]namedParameter, len(native.Params))
+	for i := range ret {
+		ret[i].name = native.Params[i]
+	}
+	return ret
 }
 
 // -------------------------------------
diff --git a/value.go b/value.go
index faee5db..d35152a 100644
--- a/value.go
+++ b/value.go
@@ -348,7 +348,7 @@ type valueFunction struct {
 // TODO(sbarzowski) better name?
 type evalCallable interface {
 	evalCall(args callArguments, i *interpreter, trace traceElement) (value, error)
-	Parameters() parameters
+	Parameters() []namedParameter
 }
 
 func (f *valueFunction) call(i *interpreter, trace traceElement, args callArguments) (value, error) {
@@ -359,37 +359,30 @@ func (f *valueFunction) call(i *interpreter, trace traceElement, args callArgume
 	return f.ec.evalCall(args, i, trace)
 }
 
-func (f *valueFunction) Parameters() parameters {
+func (f *valueFunction) Parameters() []namedParameter {
 	return f.ec.Parameters()
 }
 
-func checkArguments(i *interpreter, trace traceElement, args callArguments, params parameters) error {
-	received := make(map[ast.Identifier]bool)
-	accepted := make(map[ast.Identifier]bool)
+func checkArguments(i *interpreter, trace traceElement, args callArguments, params []namedParameter) error {
 
 	numPassed := len(args.positional)
-	numExpected := len(params.required) + len(params.optional)
+	maxExpected := len(params)
 
-	if numPassed > numExpected {
-		return i.Error(fmt.Sprintf("function expected %v positional argument(s), but got %v", numExpected, numPassed), trace)
+	if numPassed > maxExpected {
+		return i.Error(fmt.Sprintf("function expected %v positional argument(s), but got %v", maxExpected, numPassed), trace)
 	}
 
-	for _, param := range params.required {
-		accepted[param] = true
-	}
-
-	for _, param := range params.optional {
+	// Parameter names the function will accept.
+	accepted := make(map[ast.Identifier]bool)
+	for _, param := range params {
 		accepted[param.name] = true
 	}
 
+	// Parameter names the call will bind.
+	received := make(map[ast.Identifier]bool)
 	for i := range args.positional {
-		if i < len(params.required) {
-			received[params.required[i]] = true
-		} else {
-			received[params.optional[i-len(params.required)].name] = true
-		}
+		received[params[i].name] = true
 	}
-
 	for _, arg := range args.named {
 		if _, present := received[arg.name]; present {
 			return i.Error(fmt.Sprintf("Argument %v already provided", arg.name), trace)
@@ -400,9 +393,9 @@ func checkArguments(i *interpreter, trace traceElement, args callArguments, para
 		received[arg.name] = true
 	}
 
-	for _, param := range params.required {
-		if _, present := received[param]; !present {
-			return i.Error(fmt.Sprintf("Missing argument: %v", param), trace)
+	for _, param := range params {
+		if _, present := received[param.name]; !present && param.defaultArg == nil {
+			return i.Error(fmt.Sprintf("Missing argument: %v", param.name), trace)
 		}
 	}