@flock/wirespec 0.7.3 → 0.7.4

package/kotlin/wirespec-core.js

@@ -63,6 +63,7 @@
   var getKClassFromExpression = kotlin_kotlin.$_$.c;
   var RuntimeException = kotlin_kotlin.$_$.aa;
   var RuntimeException_init_$Init$ = kotlin_kotlin.$_$.h1;
+  var NonEmptyList = kotlin_io_arrow_kt_arrow_core.$_$.e;
   var getStringHashCode = kotlin_kotlin.$_$.w6;
   var hashCode = kotlin_kotlin.$_$.x6;
   var equals = kotlin_kotlin.$_$.r6;
@@ -78,10 +79,9 @@
   var _Result___get_value__impl__bjfvqg = kotlin_kotlin.$_$.p1;
   var isObject = kotlin_kotlin.$_$.j7;
   var _Result___get_isFailure__impl__jpiriv = kotlin_kotlin.$_$.o1;
-  var emptyList = kotlin_kotlin.$_$.q4;
-  var lastOrNull = kotlin_kotlin.$_$.d5;
-  var removePrefix = kotlin_kotlin.$_$.v8;
+  var last = kotlin_kotlin.$_$.e5;
   var NoSuchElementException_init_$Create$ = kotlin_kotlin.$_$.g1;
+  var removePrefix = kotlin_kotlin.$_$.v8;
   var ensureNotNull = kotlin_kotlin.$_$.qa;
   var println = kotlin_kotlin.$_$.g6;
   //endregion
@@ -89,37 +89,37 @@
   setMetadataFor(Reported, 'Reported', classMeta, Enum);
   setMetadataFor(Wirespec, 'Wirespec', objectMeta);
   function withLogging(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Type', block);
+    return logger.zk('Emitting Definition: Type', block);
   }
   function withLogging_0(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Type Shape', block);
+    return logger.zk('Emitting Definition: Type Shape', block);
   }
   function withLogging_1(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Type Shape Field', block);
+    return logger.zk('Emitting Definition: Type Shape Field', block);
   }
   function withLogging_2(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Type Shape Field Key', block);
+    return logger.zk('Emitting Definition: Type Shape Field Key', block);
   }
   function withLogging_3(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Type Shape Field Value', block);
+    return logger.zk('Emitting Definition: Type Shape Field Value', block);
   }
   setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_4(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Endpoint', block);
+    return logger.zk('Emitting Definition: Endpoint', block);
   }
   setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
   function withLogging_5(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Refined', block);
+    return logger.zk('Emitting Definition: Refined', block);
   }
   function withLogging_6(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Refined Validator', block);
+    return logger.zk('Emitting Definition: Refined Validator', block);
   }
   setMetadataFor(RefinedTypeDefinitionEmitterLogger, 'RefinedTypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_7(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Endpoint', block);
+    return logger.zk('Emitting Definition: Endpoint', block);
   }
   function withLogging_8(_this__u8e3s4, logger, block) {
-    return logger.yk('Emitting Definition: Endpoint Segment', block);
+    return logger.zk('Emitting Definition: Endpoint Segment', block);
   }
   setMetadataFor(EndpointDefinitionEmitterLogger, 'EndpointDefinitionEmitterLogger', interfaceMeta);
   setMetadataFor(Emitter, 'Emitter', classMeta, VOID, [TypeDefinitionEmitterLogger, EnumDefinitionEmitterLogger, RefinedTypeDefinitionEmitterLogger, EndpointDefinitionEmitterLogger]);
@@ -135,7 +135,6 @@
   setMetadataFor(CompilerException, 'CompilerException', classMeta, WirespecException);
   setMetadataFor(ParserException, 'ParserException', classMeta, CompilerException);
   setMetadataFor(NullTokenException, 'NullTokenException', classMeta, ParserException);
-  setMetadataFor(StartingException, 'StartingException', classMeta, NullTokenException);
   setMetadataFor(NextException, 'NextException', classMeta, NullTokenException);
   setMetadataFor(WrongTokenException, 'WrongTokenException', classMeta, ParserException);
   setMetadataFor(Type, 'Type', classMeta, Enum);
@@ -198,7 +197,7 @@
   var Reported_EMITTED_instance;
   function Reported$report$lambda($logger, this$0) {
     return function (it) {
-      $logger.kh('********** ' + this$0.p4_1 + ' **********\n' + toString(it) + '\n########## ' + this$0.p4_1 + ' ##########');
+      $logger.lh('********** ' + this$0.p4_1 + ' **********\n' + toString(it) + '\n########## ' + this$0.p4_1 + ' ##########');
       return Unit_getInstance();
     };
   }
@@ -215,40 +214,40 @@
   function Reported(name, ordinal) {
     Enum.call(this, name, ordinal);
   }
-  protoOf(Reported).nh = function (logger) {
+  protoOf(Reported).oh = function (logger) {
     return Reported$report$lambda(logger, this);
   };
   function Reported$report$ref($boundThis) {
     var l = function (p0) {
-      return $boundThis.nh(p0);
+      return $boundThis.oh(p0);
     };
     l.callableName = 'report';
     return l;
   }
   function Reported$report$ref_0($boundThis) {
     var l = function (p0) {
-      return $boundThis.nh(p0);
+      return $boundThis.oh(p0);
     };
     l.callableName = 'report';
     return l;
   }
   function Reported$report$ref_1($boundThis) {
     var l = function (p0) {
-      return $boundThis.nh(p0);
+      return $boundThis.oh(p0);
     };
     l.callableName = 'report';
     return l;
   }
   function Reported$report$ref_2($boundThis) {
     var l = function (p0) {
-      return $boundThis.nh(p0);
+      return $boundThis.oh(p0);
     };
     l.callableName = 'report';
     return l;
   }
   function Reported$report$ref_3($boundThis) {
     var l = function (p0) {
-      return $boundThis.nh(p0);
+      return $boundThis.oh(p0);
     };
     l.callableName = 'report';
     return l;
@@ -285,7 +284,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.compile.<anonymous>.<anonymous>.<anonymous>' call
-      tmp$ret$2 = (new Parser($logger)).ph(tmp4_let);
+      tmp$ret$2 = (new Parser($logger)).qh(tmp4_let);
       tmp$ret$3 = tmp$ret$2;
       var tmp5_also = tmp$ret$3;
       var tmp6_also = Reported$report$ref_1(Reported_PARSED_getInstance())($logger);
@@ -335,7 +334,7 @@
         var tmp11__anonymous__tkubxh = tmp12_map.qg_1;
         var tmp$ret$10;
         // Inline function 'community.flock.wirespec.compiler.core.compile.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$10 = emitter.sh(tmp11__anonymous__tkubxh);
+        tmp$ret$10 = emitter.th(tmp11__anonymous__tkubxh);
         tmp$ret$11 = new Right(tmp$ret$10);
         tmp_0 = tmp$ret$11;
       } else {
@@ -378,10 +377,10 @@
   }
   function Wirespec() {
     Wirespec_instance = this;
-    this.th_1 = listOf([to(Regex_init_$Create$('^type'), WsTypeDef_getInstance()), to(Regex_init_$Create$('^enum'), WsEnumTypeDef_getInstance()), to(Regex_init_$Create$('^refined'), WsRefinedTypeDef_getInstance()), to(Regex_init_$Create$('^[^\\S\\r\\n]+'), WhiteSpaceExceptNewLine_getInstance()), to(Regex_init_$Create$('^[\\r\\n]'), NewLine_getInstance()), to(Regex_init_$Create$('^\\{'), LeftCurly_getInstance()), to(Regex_init_$Create$('^:'), Colon_getInstance()), to(Regex_init_$Create$('^,'), Comma_getInstance()), to(Regex_init_$Create$('^\\?'), QuestionMark_getInstance()), to(Regex_init_$Create$('^\\[\\]'), Brackets_getInstance()), to(Regex_init_$Create$('^String'), WsString_getInstance()), to(Regex_init_$Create$('^Integer'), WsInteger_getInstance()), to(Regex_init_$Create$('^Boolean'), WsBoolean_getInstance()), to(Regex_init_$Create$('^\\}'), RightCurly_getInstance()), to(Regex_init_$Create$('^[a-z][a-zA-Z]*'), CustomValue_getInstance()), to(Regex_init_$Create$('^[A-Z][a-zA-Z]*'), CustomType_getInstance()), to(Regex_init_$Create$('^/.*/g'), CustomRegex_getInstance()), to(Regex_init_$Create$('^.'), Invalid_getInstance())]);
+    this.uh_1 = listOf([to(Regex_init_$Create$('^type'), WsTypeDef_getInstance()), to(Regex_init_$Create$('^enum'), WsEnumTypeDef_getInstance()), to(Regex_init_$Create$('^refined'), WsRefinedTypeDef_getInstance()), to(Regex_init_$Create$('^[^\\S\\r\\n]+'), WhiteSpaceExceptNewLine_getInstance()), to(Regex_init_$Create$('^[\\r\\n]'), NewLine_getInstance()), to(Regex_init_$Create$('^\\{'), LeftCurly_getInstance()), to(Regex_init_$Create$('^:'), Colon_getInstance()), to(Regex_init_$Create$('^,'), Comma_getInstance()), to(Regex_init_$Create$('^\\?'), QuestionMark_getInstance()), to(Regex_init_$Create$('^\\[\\]'), Brackets_getInstance()), to(Regex_init_$Create$('^String'), WsString_getInstance()), to(Regex_init_$Create$('^Integer'), WsInteger_getInstance()), to(Regex_init_$Create$('^Boolean'), WsBoolean_getInstance()), to(Regex_init_$Create$('^\\}'), RightCurly_getInstance()), to(Regex_init_$Create$('^[a-z][a-zA-Z]*'), CustomValue_getInstance()), to(Regex_init_$Create$('^[A-Z][a-zA-Z]*'), CustomType_getInstance()), to(Regex_init_$Create$('^/.*/g'), CustomRegex_getInstance()), to(Regex_init_$Create$('^.'), Invalid_getInstance())]);
   }
-  protoOf(Wirespec).uh = function () {
-    return this.th_1;
+  protoOf(Wirespec).vh = function () {
+    return this.uh_1;
   };
   var Wirespec_instance;
   function Wirespec_getInstance() {
@@ -390,14 +389,14 @@
     return Wirespec_instance;
   }
   function emitPrimaryType(_this__u8e3s4, $this) {
-    return $this.vh(_this__u8e3s4, $this.qh_1, JavaEmitter$emitPrimaryType$lambda(_this__u8e3s4));
+    return $this.wh(_this__u8e3s4, $this.rh_1, JavaEmitter$emitPrimaryType$lambda(_this__u8e3s4));
   }
   function emit(_this__u8e3s4, $this, endpoint) {
     Companion_getInstance_2();
-    var tmp = emitContentType(_this__u8e3s4.wh_1, $this);
-    var tmp0_safe_receiver = _this__u8e3s4.wh_1;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1;
-    var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.ei(tmp1_safe_receiver);
+    var tmp = emitContentType(_this__u8e3s4.xh_1, $this);
+    var tmp0_safe_receiver = _this__u8e3s4.xh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zh_1;
+    var tmp2_elvis_lhs = tmp1_safe_receiver == null ? null : $this.fi(tmp1_safe_receiver);
     var tmp_0 = tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
     Companion_getInstance_2();
     Companion_getInstance_2();
@@ -409,33 +408,33 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp3_safe_receiver = _this__u8e3s4.wh_1;
-    var tmp4_safe_receiver = tmp3_safe_receiver == null ? null : tmp3_safe_receiver.yh_1;
-    var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : $this.ei(tmp4_safe_receiver);
+    var tmp3_safe_receiver = _this__u8e3s4.xh_1;
+    var tmp4_safe_receiver = tmp3_safe_receiver == null ? null : tmp3_safe_receiver.zh_1;
+    var tmp5_elvis_lhs = tmp4_safe_receiver == null ? null : $this.fi(tmp4_safe_receiver);
     var tmp_1 = tmp5_elvis_lhs == null ? 'Void' : tmp5_elvis_lhs;
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_2 = emitContentType(_this__u8e3s4.wh_1, $this);
-    var tmp_3 = emitRequestSignature(endpoint, $this, _this__u8e3s4.wh_1);
+    var tmp_2 = emitContentType(_this__u8e3s4.xh_1, $this);
+    var tmp_3 = emitRequestSignature(endpoint, $this, _this__u8e3s4.xh_1);
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_4 = emitPath(endpoint.hi_1, $this);
+    var tmp_4 = emitPath(endpoint.ii_1, $this);
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_5 = emitMap(endpoint.ii_1, $this);
+    var tmp_5 = emitMap(endpoint.ji_1, $this);
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_6 = emitMap(endpoint.ji_1, $this);
+    var tmp_6 = emitMap(endpoint.ki_1, $this);
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp6_safe_receiver = _this__u8e3s4.wh_1;
+    var tmp6_safe_receiver = _this__u8e3s4.xh_1;
     var tmp_7;
     if (tmp6_safe_receiver == null) {
       tmp_7 = null;
@@ -445,7 +444,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-      tmp$ret$0 = 'new WirespecShared.Content("' + tmp6_safe_receiver.xh_1 + '", body)';
+      tmp$ret$0 = 'new WirespecShared.Content("' + tmp6_safe_receiver.yh_1 + '", body)';
       tmp$ret$1 = tmp$ret$0;
       tmp_7 = tmp$ret$1;
     }
@@ -463,20 +462,20 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp8_safe_receiver = _this__u8e3s4.wh_1;
-    var tmp9_safe_receiver = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.yh_1;
-    var tmp10_elvis_lhs = tmp9_safe_receiver == null ? null : $this.ei(tmp9_safe_receiver);
+    var tmp8_safe_receiver = _this__u8e3s4.xh_1;
+    var tmp9_safe_receiver = tmp8_safe_receiver == null ? null : tmp8_safe_receiver.zh_1;
+    var tmp10_elvis_lhs = tmp9_safe_receiver == null ? null : $this.fi(tmp9_safe_receiver);
     var tmp_9 = tmp10_elvis_lhs == null ? 'Void' : tmp10_elvis_lhs;
     Companion_getInstance_2();
-    return trimMargin('\n        |' + '  ' + 'class Request' + tmp + ' implements Request<' + tmp_0 + '> {\n        |' + '  ' + '  ' + 'private final String path;\n        |' + '  ' + '  ' + 'private final WirespecShared.Method method;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> query;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> headers;\n        |' + '  ' + '  ' + 'private final WirespecShared.Content<' + tmp_1 + '> content;\n        |' + '  ' + '  ' + 'public Request' + tmp_2 + '(' + tmp_3 + ') {\n        |' + '  ' + '  ' + '  ' + 'this.path = ' + tmp_4 + ';\n        |' + '  ' + '  ' + '  ' + 'this.method = WirespecShared.Method.' + endpoint.gi_1.p4_1 + ';\n        |' + '  ' + '  ' + '  ' + 'this.query = ' + tmp_5 + ';\n        |' + '  ' + '  ' + '  ' + 'this.headers = ' + tmp_6 + ';\n        |' + '  ' + '  ' + '  ' + 'this.content = ' + tmp_8 + ';\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '@Override public String getPath() {return path;}\n        |' + '  ' + '  ' + '@Override public WirespecShared.Method getMethod() {return method;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getQuery() {return query;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getHeaders() {return headers;}\n        |' + '  ' + '  ' + '@Override public WirespecShared.Content<' + tmp_9 + '> getContent() {return content;}\n        |' + '  ' + '}\n    ');
+    return trimMargin('\n        |' + '  ' + 'class Request' + tmp + ' implements Request<' + tmp_0 + '> {\n        |' + '  ' + '  ' + 'private final String path;\n        |' + '  ' + '  ' + 'private final WirespecShared.Method method;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> query;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> headers;\n        |' + '  ' + '  ' + 'private final WirespecShared.Content<' + tmp_1 + '> content;\n        |' + '  ' + '  ' + 'public Request' + tmp_2 + '(' + tmp_3 + ') {\n        |' + '  ' + '  ' + '  ' + 'this.path = ' + tmp_4 + ';\n        |' + '  ' + '  ' + '  ' + 'this.method = WirespecShared.Method.' + endpoint.hi_1.p4_1 + ';\n        |' + '  ' + '  ' + '  ' + 'this.query = ' + tmp_5 + ';\n        |' + '  ' + '  ' + '  ' + 'this.headers = ' + tmp_6 + ';\n        |' + '  ' + '  ' + '  ' + 'this.content = ' + tmp_8 + ';\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '@Override public String getPath() {return path;}\n        |' + '  ' + '  ' + '@Override public WirespecShared.Method getMethod() {return method;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getQuery() {return query;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getHeaders() {return headers;}\n        |' + '  ' + '  ' + '@Override public WirespecShared.Content<' + tmp_9 + '> getContent() {return content;}\n        |' + '  ' + '}\n    ');
   }
   function emit_0(_this__u8e3s4, $this) {
     Companion_getInstance_2();
-    var tmp = Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
-    var tmp_0 = emitContentType(_this__u8e3s4.oi_1, $this);
+    var tmp = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
+    var tmp_0 = emitContentType(_this__u8e3s4.pi_1, $this);
     var tmp$ret$1;
     // Inline function 'kotlin.takeIf' call
-    var tmp0_takeIf = _this__u8e3s4.ni_1;
+    var tmp0_takeIf = _this__u8e3s4.oi_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp_1;
     var tmp$ret$0;
@@ -490,9 +489,9 @@
     tmp$ret$1 = tmp_1;
     var tmp0_safe_receiver = tmp$ret$1;
     var tmp_2 = orEmptyString(tmp0_safe_receiver == null ? null : groupStatus(tmp0_safe_receiver, $this), $this);
-    var tmp1_safe_receiver = _this__u8e3s4.oi_1;
-    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.yh_1;
-    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : $this.ei(tmp2_safe_receiver);
+    var tmp1_safe_receiver = _this__u8e3s4.pi_1;
+    var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.zh_1;
+    var tmp3_elvis_lhs = tmp2_safe_receiver == null ? null : $this.fi(tmp2_safe_receiver);
     var tmp_3 = tmp3_elvis_lhs == null ? 'Void' : tmp3_elvis_lhs;
     Companion_getInstance_2();
     Companion_getInstance_2();
@@ -500,17 +499,17 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp4_safe_receiver = _this__u8e3s4.oi_1;
-    var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.yh_1;
-    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : $this.ei(tmp5_safe_receiver);
+    var tmp4_safe_receiver = _this__u8e3s4.pi_1;
+    var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.zh_1;
+    var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : $this.fi(tmp5_safe_receiver);
     var tmp_4 = tmp6_elvis_lhs == null ? 'Void' : tmp6_elvis_lhs;
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp_5 = Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
-    var tmp_6 = emitContentType(_this__u8e3s4.oi_1, $this);
+    var tmp_5 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
+    var tmp_6 = emitContentType(_this__u8e3s4.pi_1, $this);
     var tmp$ret$3;
     // Inline function 'kotlin.takeIf' call
-    var tmp1_takeIf = _this__u8e3s4.ni_1;
+    var tmp1_takeIf = _this__u8e3s4.oi_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp_7;
     var tmp$ret$2;
@@ -537,7 +536,7 @@
       tmp_8 = tmp$ret$5;
     }
     var tmp_9 = orEmptyString(tmp_8, $this);
-    var tmp8_safe_receiver = _this__u8e3s4.oi_1;
+    var tmp8_safe_receiver = _this__u8e3s4.pi_1;
     var tmp_10;
     if (tmp8_safe_receiver == null) {
       tmp_10 = null;
@@ -547,7 +546,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$6;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-      tmp$ret$6 = ', ' + $this.ei(tmp8_safe_receiver.yh_1) + ' body';
+      tmp$ret$6 = ', ' + $this.fi(tmp8_safe_receiver.zh_1) + ' body';
       tmp$ret$7 = tmp$ret$6;
       tmp_10 = tmp$ret$7;
     }
@@ -558,7 +557,7 @@
     Companion_getInstance_2();
     var tmp$ret$9;
     // Inline function 'kotlin.takeIf' call
-    var tmp2_takeIf = _this__u8e3s4.ni_1;
+    var tmp2_takeIf = _this__u8e3s4.oi_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp_12;
     var tmp$ret$8;
@@ -578,7 +577,7 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp11_safe_receiver = _this__u8e3s4.oi_1;
+    var tmp11_safe_receiver = _this__u8e3s4.pi_1;
     var tmp_14;
     if (tmp11_safe_receiver == null) {
       tmp_14 = null;
@@ -588,7 +587,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$10;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-      tmp$ret$10 = 'new WirespecShared.Content("' + tmp11_safe_receiver.xh_1 + '", body)';
+      tmp$ret$10 = 'new WirespecShared.Content("' + tmp11_safe_receiver.yh_1 + '", body)';
       tmp$ret$11 = tmp$ret$10;
       tmp_14 = tmp$ret$11;
     }
@@ -602,9 +601,9 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    var tmp13_safe_receiver = _this__u8e3s4.oi_1;
-    var tmp14_safe_receiver = tmp13_safe_receiver == null ? null : tmp13_safe_receiver.yh_1;
-    var tmp15_elvis_lhs = tmp14_safe_receiver == null ? null : $this.ei(tmp14_safe_receiver);
+    var tmp13_safe_receiver = _this__u8e3s4.pi_1;
+    var tmp14_safe_receiver = tmp13_safe_receiver == null ? null : tmp13_safe_receiver.zh_1;
+    var tmp15_elvis_lhs = tmp14_safe_receiver == null ? null : $this.fi(tmp14_safe_receiver);
     var tmp_16 = tmp15_elvis_lhs == null ? 'Void' : tmp15_elvis_lhs;
     Companion_getInstance_2();
     return trimMargin('\n        |' + '  ' + 'class Response' + tmp + tmp_0 + ' implements Response' + tmp_2 + '<' + tmp_3 + '> {\n        |' + '  ' + '  ' + 'private final int status;\n        |' + '  ' + '  ' + 'private final java.util.Map<String, java.util.List<Object>> headers;\n        |' + '  ' + '  ' + 'private final WirespecShared.Content<' + tmp_4 + '> content;\n        |' + '  ' + '  ' + 'public Response' + tmp_5 + tmp_6 + '(' + tmp_9 + 'java.util.Map<String, java.util.List<Object>> headers' + tmp_11 + ') {\n        |' + '  ' + '  ' + '  ' + 'this.status = ' + tmp_13 + ';\n        |' + '  ' + '  ' + '  ' + 'this.headers = headers;\n        |' + '  ' + '  ' + '  ' + 'this.content = ' + tmp_15 + ';\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + '@Override public int getStatus() {return status;}\n        |' + '  ' + '  ' + '@Override public java.util.Map<String, java.util.List<Object>> getHeaders() {return headers;}\n        |' + '  ' + '  ' + '@Override public WirespecShared.Content<' + tmp_16 + '> getContent() {return content;}\n        |' + '  ' + '}\n        ');
@@ -620,8 +619,8 @@
       var e = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseMapper.<anonymous>' call
-      var tmp0_safe_receiver = e.oi_1;
-      tmp$ret$0 = to(e.ni_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.xh_1);
+      var tmp0_safe_receiver = e.pi_1;
+      tmp$ret$0 = to(e.oi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1);
       var key = tmp$ret$0;
       if (set.a(key)) {
         list.a(e);
@@ -636,7 +635,7 @@
     return trimMargin('\n        |' + '  ' + 'static <B> Response RESPONSE_MAPPER(WirespecShared.ContentMapper<B> contentMapper, int status, java.util.Map<String, java.util.List<Object>> headers, WirespecShared.Content<B> content) {\n        |' + tmp_0 + '\n        |' + '  ' + '  ' + 'throw new IllegalStateException("Unknown response type");\n        |' + '  ' + '}\n    ');
   }
   function emitResponseMapperCondition(_this__u8e3s4, $this) {
-    var tmp0_subject = _this__u8e3s4.oi_1;
+    var tmp0_subject = _this__u8e3s4.pi_1;
     var tmp;
     if (tmp0_subject == null) {
       Companion_getInstance_2();
@@ -644,7 +643,7 @@
       Companion_getInstance_2();
       var tmp$ret$1;
       // Inline function 'kotlin.takeIf' call
-      var tmp0_takeIf = _this__u8e3s4.ni_1;
+      var tmp0_takeIf = _this__u8e3s4.oi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_0;
       var tmp$ret$0;
@@ -666,15 +665,15 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseMapperCondition.<anonymous>' call
-        tmp$ret$2 = 'status == ' + _this__u8e3s4.ni_1 + ' && ';
+        tmp$ret$2 = 'status == ' + _this__u8e3s4.oi_1 + ' && ';
         tmp$ret$3 = tmp$ret$2;
         tmp_1 = tmp$ret$3;
       }
       var tmp_2 = orEmptyString(tmp_1, $this);
-      var tmp_3 = Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
+      var tmp_3 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
       var tmp$ret$5;
       // Inline function 'kotlin.takeIf' call
-      var tmp1_takeIf = _this__u8e3s4.ni_1;
+      var tmp1_takeIf = _this__u8e3s4.oi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_4;
       var tmp$ret$4;
@@ -707,7 +706,7 @@
       Companion_getInstance_2();
       var tmp$ret$9;
       // Inline function 'kotlin.takeIf' call
-      var tmp2_takeIf = _this__u8e3s4.ni_1;
+      var tmp2_takeIf = _this__u8e3s4.oi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_6;
       var tmp$ret$8;
@@ -729,7 +728,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$10;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitResponseMapperCondition.<anonymous>' call
-        tmp$ret$10 = 'status == ' + _this__u8e3s4.ni_1 + ' && ';
+        tmp$ret$10 = 'status == ' + _this__u8e3s4.oi_1 + ' && ';
         tmp$ret$11 = tmp$ret$10;
         tmp_7 = tmp$ret$11;
       }
@@ -738,18 +737,18 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_9 = $this.ei(_this__u8e3s4.oi_1.yh_1);
-      var tmp_10 = emitPrimaryType(_this__u8e3s4.oi_1.yh_1, $this);
-      var tmp_11 = _this__u8e3s4.oi_1.yh_1.ri();
+      var tmp_9 = $this.fi(_this__u8e3s4.pi_1.zh_1);
+      var tmp_10 = emitPrimaryType(_this__u8e3s4.pi_1.zh_1, $this);
+      var tmp_11 = _this__u8e3s4.pi_1.zh_1.si();
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_12 = Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
-      var tmp_13 = emitContentType(_this__u8e3s4.oi_1, $this);
+      var tmp_12 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
+      var tmp_13 = emitContentType(_this__u8e3s4.pi_1, $this);
       var tmp$ret$13;
       // Inline function 'kotlin.takeIf' call
-      var tmp3_takeIf = _this__u8e3s4.ni_1;
+      var tmp3_takeIf = _this__u8e3s4.oi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_14;
       var tmp$ret$12;
@@ -779,13 +778,13 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + 'if(' + tmp_8 + 'content.type().equals("' + _this__u8e3s4.oi_1.xh_1 + '")) {\n                    |' + '  ' + '  ' + '  ' + '  ' + 'WirespecShared.Content<' + tmp_9 + '> c = contentMapper.read(content, WirespecShared.getType(' + tmp_10 + '.class, ' + tmp_11 + '));\n                    |' + '  ' + '  ' + '  ' + '  ' + 'return new Response' + tmp_12 + tmp_13 + '(' + tmp_16 + 'headers, c.body());\n                    |' + '  ' + '  ' + '  ' + '}\n                    |\n                ');
+      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + 'if(' + tmp_8 + 'content.type().equals("' + _this__u8e3s4.pi_1.yh_1 + '")) {\n                    |' + '  ' + '  ' + '  ' + '  ' + 'WirespecShared.Content<' + tmp_9 + '> c = contentMapper.read(content, WirespecShared.getType(' + tmp_10 + '.class, ' + tmp_11 + '));\n                    |' + '  ' + '  ' + '  ' + '  ' + 'return new Response' + tmp_12 + tmp_13 + '(' + tmp_16 + 'headers, c.body());\n                    |' + '  ' + '  ' + '  ' + '}\n                    |\n                ');
     }
     return tmp;
   }
   function emitContentType(_this__u8e3s4, $this) {
     var tmp0_safe_receiver = _this__u8e3s4;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.xh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1;
     var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : split(tmp1_safe_receiver, ['/', '-']);
     var tmp;
     if (tmp2_safe_receiver == null) {
@@ -797,14 +796,14 @@
     return tmp3_elvis_lhs == null ? 'Void' : tmp3_elvis_lhs;
   }
   function emit_1(_this__u8e3s4, $this) {
-    return $this.si(_this__u8e3s4, $this.qh_1, JavaEmitter$emit$lambda_8(_this__u8e3s4));
+    return $this.ti(_this__u8e3s4, $this.rh_1, JavaEmitter$emit$lambda_8(_this__u8e3s4));
   }
   function emitRequestSignature(_this__u8e3s4, $this, content) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.map' call
     var tmp$ret$1;
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp1_filterIsInstance = _this__u8e3s4.hi_1;
+    var tmp1_filterIsInstance = _this__u8e3s4.ii_1;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var tmp0_filterIsInstanceTo = ArrayList_init_$Create$();
@@ -826,15 +825,15 @@
       var item = tmp0_iterator_0.e();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emitRequestSignature.<anonymous>' call
-      tmp$ret$2 = new Field(item.ti_1, item.ui_1, false);
+      tmp$ret$2 = new Field(item.ui_1, item.vi_1, false);
       tmp2_mapTo.a(tmp$ret$2);
     }
     tmp$ret$3 = tmp2_mapTo;
     tmp$ret$4 = tmp$ret$3;
     var pathField = tmp$ret$4;
-    var parameters = plus(plus(plus(pathField, _this__u8e3s4.ii_1), _this__u8e3s4.ji_1), _this__u8e3s4.ki_1);
+    var parameters = plus(plus(plus(pathField, _this__u8e3s4.ji_1), _this__u8e3s4.ki_1), _this__u8e3s4.li_1);
     var tmp0_safe_receiver = content;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zh_1;
     var tmp = filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
     return joinToString(tmp, ', ', VOID, VOID, VOID, VOID, JavaEmitter$emitRequestSignature$lambda($this));
   }
@@ -865,34 +864,34 @@
       tmp$ret$1 = tmp$ret$0.substring(0, 1);
       tmp = tmp$ret$1 + 'XX';
     } else {
-      tmp = Companion_getInstance_2().qi(_this__u8e3s4);
+      tmp = Companion_getInstance_2().ri(_this__u8e3s4);
     }
     return tmp;
   }
   function JavaEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('public record ' + $this_emit.vi_1 + '(\n            |' + this$0.xi($this_emit.wi_1) + '\n            |) {};\n            |');
+      return trimMargin('public record ' + $this_emit.wi_1 + '(\n            |' + this$0.yi($this_emit.xi_1) + '\n            |) {};\n            |');
     };
   }
   function JavaEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.yi(it);
+      return this$0.zi(it);
     };
   }
   function JavaEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.zi_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.aj_1, ',\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda(this$0));
     };
   }
   function JavaEmitter$emit$lambda_1($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + ($this_emit.cj_1 ? 'java.util.Optional<' + this$0.ei($this_emit.bj_1) + '>' : this$0.ei($this_emit.bj_1)) + ' ' + this$0.dj($this_emit.aj_1);
+      return '  ' + ($this_emit.dj_1 ? 'java.util.Optional<' + this$0.fi($this_emit.cj_1) + '>' : this$0.fi($this_emit.cj_1)) + ' ' + this$0.ej($this_emit.bj_1);
     };
   }
   function JavaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return $this_emit.ej_1;
+      return $this_emit.fj_1;
     };
   }
   function JavaEmitter$emitPrimaryType$lambda($this_emitPrimaryType) {
@@ -903,10 +902,10 @@
         tmp = 'Object';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emitPrimaryType.ij_1;
+          tmp = $this_emitPrimaryType.jj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emitPrimaryType.fj_1;
+            var tmp1_subject = $this_emitPrimaryType.gj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -940,7 +939,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.ri() ? 'java.util.List<' + tmp0_let + '>' : tmp0_let;
+      tmp$ret$0 = $this_emit.si() ? 'java.util.List<' + tmp0_let + '>' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       return tmp$ret$1;
     };
@@ -966,26 +965,26 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var body = trimMargin('\n          |' + '  ' + 'public final String label;\n          |' + '  ' + $this_emit.lj_1 + '(String label) {\n          |' + '  ' + '  ' + 'this.label = label;\n          |' + '  ' + '}\n          ');
+      var body = trimMargin('\n          |' + '  ' + 'public final String label;\n          |' + '  ' + $this_emit.mj_1 + '(String label) {\n          |' + '  ' + '  ' + 'this.label = label;\n          |' + '  ' + '}\n          ');
       Companion_getInstance_2();
       Companion_getInstance_2();
       var tmp = ',\n' + '  ';
-      return 'public enum ' + $this_emit.lj_1 + ' {\n' + '  ' + joinToString($this_emit.mj_1, tmp, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_0) + ';\n' + body + '\n}\n';
+      return 'public enum ' + $this_emit.mj_1 + ' {\n' + '  ' + joinToString($this_emit.nj_1, tmp, VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_0) + ';\n' + body + '\n}\n';
     };
   }
   function JavaEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp = this$0.pj($this_emit.oj_1);
+      var tmp = this$0.qj($this_emit.pj_1);
       Companion_getInstance_2();
-      return trimMargin('public record ' + $this_emit.nj_1 + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.nj_1 + ' record) {\n            |' + '  ' + tmp + '\n            |' + '  ' + '}\n            |}\n            |');
+      return trimMargin('public record ' + $this_emit.oj_1 + '(String value) {\n            |' + '  ' + 'static void validate(' + $this_emit.oj_1 + ' record) {\n            |' + '  ' + tmp + '\n            |' + '  ' + '}\n            |}\n            |');
     };
   }
   function JavaEmitter$emit$lambda_6($this_emit) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.qj_1 + ').matcher(record.value).find();';
+      return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.rj_1 + ').matcher(record.value).find();';
     };
   }
   function JavaEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
@@ -1011,14 +1010,14 @@
   function JavaEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      var tmp = emitSegment($this_emit.hi_1, this$0);
-      var tmp_0 = emitResponseMapper($this_emit.mi_1, this$0);
+      var tmp = emitSegment($this_emit.ii_1, this$0);
+      var tmp_0 = emitResponseMapper($this_emit.ni_1, this$0);
       Companion_getInstance_2();
-      var tmp_1 = joinToString($this_emit.li_1, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_1(this$0, $this_emit));
+      var tmp_1 = joinToString($this_emit.mi_1, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_1(this$0, $this_emit));
       Companion_getInstance_2();
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map = $this_emit.mi_1;
+      var tmp1_map = $this_emit.ni_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -1027,7 +1026,7 @@
         var item = tmp0_iterator.e();
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$0 = groupStatus(item.ni_1, this$0);
+        tmp$ret$0 = groupStatus(item.oi_1, this$0);
         tmp0_mapTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapTo;
@@ -1038,7 +1037,7 @@
       // Inline function 'kotlin.collections.map' call
       var tmp$ret$5;
       // Inline function 'kotlin.collections.filter' call
-      var tmp3_filter = $this_emit.mi_1;
+      var tmp3_filter = $this_emit.ni_1;
       var tmp$ret$4;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp2_filterTo = ArrayList_init_$Create$();
@@ -1047,7 +1046,7 @@
         var element = tmp0_iterator_0.e();
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$3 = isInt(element.ni_1, this$0);
+        tmp$ret$3 = isInt(element.oi_1, this$0);
         if (tmp$ret$3) {
           tmp2_filterTo.a(element);
         }
@@ -1063,7 +1062,7 @@
         var item_0 = tmp0_iterator_1.e();
         var tmp$ret$6;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$6 = item_0.ni_1;
+        tmp$ret$6 = item_0.oi_1;
         tmp4_mapTo.a(tmp$ret$6);
       }
       tmp$ret$7 = tmp4_mapTo;
@@ -1072,7 +1071,7 @@
       var tmp_5 = joinToString(tmp_4, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_3(this$0));
       var tmp$ret$10;
       // Inline function 'kotlin.collections.distinctBy' call
-      var tmp6_distinctBy = $this_emit.mi_1;
+      var tmp6_distinctBy = $this_emit.ni_1;
       var set = HashSet_init_$Create$();
       var list = ArrayList_init_$Create$();
       var tmp0_iterator_2 = tmp6_distinctBy.c();
@@ -1080,8 +1079,8 @@
         var e = tmp0_iterator_2.e();
         var tmp$ret$9;
         // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_safe_receiver = e.oi_1;
-        tmp$ret$9 = to(e.ni_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.xh_1);
+        var tmp0_safe_receiver = e.pi_1;
+        tmp$ret$9 = to(e.oi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1);
         var key = tmp$ret$9;
         if (set.a(key)) {
           list.a(e);
@@ -1091,7 +1090,7 @@
       var tmp_6 = tmp$ret$10;
       var tmp_7 = joinToString(tmp_6, '\n', VOID, VOID, VOID, VOID, JavaEmitter$emit$lambda$lambda_4(this$0));
       Companion_getInstance_2();
-      return trimMargin('public interface ' + $this_emit.fi_1 + ' {\n            |' + '  ' + 'static String PATH = "' + tmp + '";\n            |' + tmp_0 + '\n            |' + '  ' + 'interface Request<T> extends WirespecShared.Request<T> {}\n            |' + tmp_1 + '\n            |' + '  ' + 'interface Response<T> extends WirespecShared.Response<T> {}\n            |' + tmp_3 + '\n            |' + tmp_5 + '\n            |' + tmp_7 + '\n            |' + '  ' + 'public Response ' + Companion_getInstance_2().rj($this_emit.fi_1) + '(Request request);\n            |}\n            |');
+      return trimMargin('public interface ' + $this_emit.gi_1 + ' {\n            |' + '  ' + 'static String PATH = "' + tmp + '";\n            |' + tmp_0 + '\n            |' + '  ' + 'interface Request<T> extends WirespecShared.Request<T> {}\n            |' + tmp_1 + '\n            |' + '  ' + 'interface Response<T> extends WirespecShared.Response<T> {}\n            |' + tmp_3 + '\n            |' + tmp_5 + '\n            |' + tmp_7 + '\n            |' + '  ' + 'public Response ' + Companion_getInstance_2().sj($this_emit.gi_1) + '(Request request);\n            |}\n            |');
     };
   }
   function JavaEmitter$emitResponseMapper$lambda(this$0) {
@@ -1100,17 +1099,17 @@
     };
   }
   function JavaEmitter$emitContentType$lambda(it) {
-    return Companion_getInstance_2().qi(it);
+    return Companion_getInstance_2().ri(it);
   }
   function JavaEmitter$emit$lambda_8($this_emit) {
     return function () {
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = '"' + $this_emit.sj_1 + '"';
+        tmp = '"' + $this_emit.tj_1 + '"';
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = $this_emit.ti_1.ej_1;
+          tmp = $this_emit.ui_1.fj_1;
         } else {
           noWhenBranchMatchedException();
         }
@@ -1120,22 +1119,22 @@
   }
   function JavaEmitter$emitRequestSignature$lambda(this$0) {
     return function (it) {
-      return this$0.yi(it);
+      return this$0.zi(it);
     };
   }
   function JavaEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return '"' + this$0.dj(it.aj_1) + '", java.util.List.of(' + this$0.dj(it.aj_1) + ')';
+      return '"' + this$0.ej(it.bj_1) + '", java.util.List.of(' + this$0.ej(it.bj_1) + ')';
     };
   }
   function JavaEmitter$emitSegment$lambda(it) {
     var tmp0_subject = it;
     var tmp;
     if (tmp0_subject instanceof Param) {
-      tmp = '{' + it.ti_1.ej_1 + '}';
+      tmp = '{' + it.ui_1.fj_1 + '}';
     } else {
       if (tmp0_subject instanceof Literal) {
-        tmp = it.sj_1;
+        tmp = it.tj_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1188,13 +1187,13 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    tmp.ci_1 = trimMargin('\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |\n        |public interface WirespecShared {\n        |' + '  ' + 'enum Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE };\n        |' + '  ' + 'record Content<T> (String type, T body) {};\n        |' + '  ' + 'interface Request<T> { String getPath(); Method getMethod(); java.util.Map<String, java.util.List<Object>> getQuery(); java.util.Map<String, java.util.List<Object>> getHeaders(); Content<T> getContent(); }\n        |' + '  ' + 'interface Response<T> { int getStatus(); java.util.Map<String, java.util.List<Object>> getHeaders(); Content<T> getContent(); }\n        |' + '  ' + 'interface ContentMapper<B> { <T> Content<T> read(Content<B> content, Type valueType); <T> Content<B> write(Content<T> content); }\n        |' + '  ' + 'static Type getType(final Class<?> type, final boolean isIterable) {\n        |' + '  ' + '  ' + 'if(isIterable) {\n        |' + '  ' + '  ' + '  ' + 'return new ParameterizedType() {\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type getRawType() {return java.util.List.class;}\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type[] getActualTypeArguments() {Class<?>[] types = {type};return types;}\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type getOwnerType() {return null;}\n        |' + '  ' + '  ' + '  ' + '};\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + 'else {\n        |' + '  ' + '  ' + '  ' + 'return type;\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '}\n        |}\n    ');
-    this.di_1 = isBlank(packageName) ? '' : 'package ' + packageName + ';';
+    tmp.di_1 = trimMargin('\n        |import java.lang.reflect.Type;\n        |import java.lang.reflect.ParameterizedType;\n        |\n        |public interface WirespecShared {\n        |' + '  ' + 'enum Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE };\n        |' + '  ' + 'record Content<T> (String type, T body) {};\n        |' + '  ' + 'interface Request<T> { String getPath(); Method getMethod(); java.util.Map<String, java.util.List<Object>> getQuery(); java.util.Map<String, java.util.List<Object>> getHeaders(); Content<T> getContent(); }\n        |' + '  ' + 'interface Response<T> { int getStatus(); java.util.Map<String, java.util.List<Object>> getHeaders(); Content<T> getContent(); }\n        |' + '  ' + 'interface ContentMapper<B> { <T> Content<T> read(Content<B> content, Type valueType); <T> Content<B> write(Content<T> content); }\n        |' + '  ' + 'static Type getType(final Class<?> type, final boolean isIterable) {\n        |' + '  ' + '  ' + 'if(isIterable) {\n        |' + '  ' + '  ' + '  ' + 'return new ParameterizedType() {\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type getRawType() {return java.util.List.class;}\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type[] getActualTypeArguments() {Class<?>[] types = {type};return types;}\n        |' + '  ' + '  ' + '  ' + '  ' + 'public Type getOwnerType() {return null;}\n        |' + '  ' + '  ' + '  ' + '};\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '  ' + 'else {\n        |' + '  ' + '  ' + '  ' + 'return type;\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '}\n        |}\n    ');
+    this.ei_1 = isBlank(packageName) ? '' : 'package ' + packageName + ';';
   }
-  protoOf(JavaEmitter).sh = function (ast) {
+  protoOf(JavaEmitter).th = function (ast) {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = protoOf(Emitter).sh.call(this, ast);
+    var tmp1_map = protoOf(Emitter).th.call(this, ast);
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -1205,46 +1204,46 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
       var name = item.i3();
       var result = item.j3();
-      tmp$ret$0 = to(name, this.di_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, this.ei_1 + '\n\n' + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapTo;
     tmp$ret$2 = tmp$ret$1;
-    return plus_0(tmp$ret$2, to('WirespecShared', this.di_1 + '\n\n' + this.ci_1));
-  };
-  protoOf(JavaEmitter).tj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.qh_1, JavaEmitter$emit$lambda(_this__u8e3s4, this));
+    return plus_0(tmp$ret$2, to('WirespecShared', this.ei_1 + '\n\n' + this.di_1));
   };
-  protoOf(JavaEmitter).xi = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.qh_1, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(JavaEmitter).uj = function (_this__u8e3s4) {
+    return this.vj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(JavaEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.qh_1, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
+    return this.wj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
-  protoOf(JavaEmitter).dj = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.qh_1, JavaEmitter$emit$lambda_2(_this__u8e3s4));
+  protoOf(JavaEmitter).zi = function (_this__u8e3s4) {
+    return this.xj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_1(_this__u8e3s4, this));
   };
-  protoOf(JavaEmitter).ei = function (_this__u8e3s4) {
-    return this.vh(_this__u8e3s4, this.qh_1, JavaEmitter$emit$lambda_3(this, _this__u8e3s4));
+  protoOf(JavaEmitter).ej = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_2(_this__u8e3s4));
   };
-  protoOf(JavaEmitter).yj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.qh_1, JavaEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(JavaEmitter).fi = function (_this__u8e3s4) {
+    return this.wh(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_3(this, _this__u8e3s4));
   };
-  protoOf(JavaEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.qh_1, JavaEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(JavaEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(JavaEmitter).pj = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.qh_1, JavaEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(JavaEmitter).bk = function (_this__u8e3s4) {
+    return this.ck(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(JavaEmitter).dk = function (_this__u8e3s4) {
-    return this.ek(_this__u8e3s4, this.qh_1, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(JavaEmitter).qj = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_6(_this__u8e3s4));
+  };
+  protoOf(JavaEmitter).ek = function (_this__u8e3s4) {
+    return this.fk(_this__u8e3s4, this.rh_1, JavaEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   function emitRequestSignature_0(_this__u8e3s4, $this, content) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.map' call
     var tmp$ret$1;
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp1_filterIsInstance = _this__u8e3s4.hi_1;
+    var tmp1_filterIsInstance = _this__u8e3s4.ii_1;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var tmp0_filterIsInstanceTo = ArrayList_init_$Create$();
@@ -1266,15 +1265,15 @@
       var item = tmp0_iterator_0.e();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitRequestSignature.<anonymous>' call
-      tmp$ret$2 = new Field(item.ti_1, item.ui_1, false);
+      tmp$ret$2 = new Field(item.ui_1, item.vi_1, false);
       tmp2_mapTo.a(tmp$ret$2);
     }
     tmp$ret$3 = tmp2_mapTo;
     tmp$ret$4 = tmp$ret$3;
     var pathField = tmp$ret$4;
-    var parameters = plus(plus(plus(pathField, _this__u8e3s4.ii_1), _this__u8e3s4.ji_1), _this__u8e3s4.ki_1);
+    var parameters = plus(plus(plus(pathField, _this__u8e3s4.ji_1), _this__u8e3s4.ki_1), _this__u8e3s4.li_1);
     var tmp0_safe_receiver = content;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zh_1;
     var tmp = filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
     return trimMargin('\n            |(' + joinToString(tmp, ', ', VOID, VOID, VOID, VOID, KotlinEmitter$emitRequestSignature$lambda($this)) + ')\n        ');
   }
@@ -1285,7 +1284,7 @@
     return joinToString(_this__u8e3s4, ', ', VOID, VOID, VOID, VOID, KotlinEmitter$emitMap$lambda($this));
   }
   function emit_2(_this__u8e3s4, $this) {
-    return $this.si(_this__u8e3s4, $this.qh_1, KotlinEmitter$emit$lambda_8(_this__u8e3s4));
+    return $this.ti(_this__u8e3s4, $this.rh_1, KotlinEmitter$emit$lambda_8(_this__u8e3s4));
   }
   function emitPath_0(_this__u8e3s4, $this) {
     return '/' + joinToString(_this__u8e3s4, '/', VOID, VOID, VOID, VOID, KotlinEmitter$emitPath$lambda($this));
@@ -1306,7 +1305,7 @@
       var element = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      tmp$ret$0 = Companion_getInstance_2().fk(element.ni_1);
+      tmp$ret$0 = Companion_getInstance_2().gk(element.oi_1);
       if (tmp$ret$0) {
         tmp0_filterTo.a(element);
       }
@@ -1321,8 +1320,8 @@
       var e = tmp0_iterator_0.e();
       var tmp$ret$3;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      var tmp0_safe_receiver = e.oi_1;
-      tmp$ret$3 = to(e.ni_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.xh_1);
+      var tmp0_safe_receiver = e.pi_1;
+      tmp$ret$3 = to(e.oi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1);
       var key = tmp$ret$3;
       if (set.a(key)) {
         list.a(e);
@@ -1343,7 +1342,7 @@
       var element_0 = tmp0_iterator_1.e();
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      tmp$ret$5 = !Companion_getInstance_2().fk(element_0.ni_1);
+      tmp$ret$5 = !Companion_getInstance_2().gk(element_0.oi_1);
       if (tmp$ret$5) {
         tmp2_filterTo.a(element_0);
       }
@@ -1358,8 +1357,8 @@
       var e_0 = tmp0_iterator_2.e();
       var tmp$ret$8;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapper.<anonymous>' call
-      var tmp0_safe_receiver_0 = e_0.oi_1;
-      tmp$ret$8 = to(e_0.ni_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.xh_1);
+      var tmp0_safe_receiver_0 = e_0.pi_1;
+      tmp$ret$8 = to(e_0.oi_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.yh_1);
       var key_0 = tmp$ret$8;
       if (set_0.a(key_0)) {
         list_0.a(e_0);
@@ -1374,7 +1373,7 @@
     return trimMargin('\n        |fun <B> RESPONSE_MAPPER(contentMapper: WirespecShared.ContentMapper<B>) =\n        |' + '  ' + 'fun(status: Int, headers:Map<String, List<Any?>>, content: WirespecShared.Content<B>?) =\n        |' + '  ' + '  ' + 'when {\n        |' + tmp_0 + '\n        |' + tmp_2 + '\n        |' + '  ' + '  ' + '  ' + 'else -> error("Cannot map response with status $status")\n    ');
   }
   function emitResponseMapperCondition_0(_this__u8e3s4, $this) {
-    var tmp0_subject = _this__u8e3s4.oi_1;
+    var tmp0_subject = _this__u8e3s4.pi_1;
     var tmp;
     if (tmp0_subject == null) {
       Companion_getInstance_2();
@@ -1382,12 +1381,12 @@
       Companion_getInstance_2();
       var tmp$ret$1;
       // Inline function 'kotlin.takeIf' call
-      var tmp0_takeIf = _this__u8e3s4.ni_1;
+      var tmp0_takeIf = _this__u8e3s4.oi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_0;
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$0 = Companion_getInstance_2().fk(tmp0_takeIf);
+      tmp$ret$0 = Companion_getInstance_2().gk(tmp0_takeIf);
       if (tmp$ret$0) {
         tmp_0 = tmp0_takeIf;
       } else {
@@ -1404,20 +1403,20 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-        tmp$ret$2 = 'status == ' + _this__u8e3s4.ni_1 + ' && ';
+        tmp$ret$2 = 'status == ' + _this__u8e3s4.oi_1 + ' && ';
         tmp$ret$3 = tmp$ret$2;
         tmp_1 = tmp$ret$3;
       }
       var tmp_2 = orEmptyString_0(tmp_1);
-      var tmp_3 = Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
+      var tmp_3 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
       var tmp$ret$5;
       // Inline function 'kotlin.takeIf' call
-      var tmp1_takeIf = _this__u8e3s4.ni_1;
+      var tmp1_takeIf = _this__u8e3s4.oi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_4;
       var tmp$ret$4;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$4 = !Companion_getInstance_2().fk(tmp1_takeIf);
+      tmp$ret$4 = !Companion_getInstance_2().gk(tmp1_takeIf);
       if (tmp$ret$4) {
         tmp_4 = tmp1_takeIf;
       } else {
@@ -1445,12 +1444,12 @@
       Companion_getInstance_2();
       var tmp$ret$9;
       // Inline function 'kotlin.takeIf' call
-      var tmp2_takeIf = _this__u8e3s4.ni_1;
+      var tmp2_takeIf = _this__u8e3s4.oi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_6;
       var tmp$ret$8;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$8 = Companion_getInstance_2().fk(tmp2_takeIf);
+      tmp$ret$8 = Companion_getInstance_2().gk(tmp2_takeIf);
       if (tmp$ret$8) {
         tmp_6 = tmp2_takeIf;
       } else {
@@ -1467,7 +1466,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$10;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-        tmp$ret$10 = 'status == ' + _this__u8e3s4.ni_1 + ' && ';
+        tmp$ret$10 = 'status == ' + _this__u8e3s4.oi_1 + ' && ';
         tmp$ret$11 = tmp$ret$10;
         tmp_7 = tmp$ret$11;
       }
@@ -1476,22 +1475,22 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_9 = $this.ei(_this__u8e3s4.oi_1.yh_1);
-      var tmp_10 = $this.ei(_this__u8e3s4.oi_1.yh_1);
+      var tmp_9 = $this.fi(_this__u8e3s4.pi_1.zh_1);
+      var tmp_10 = $this.fi(_this__u8e3s4.pi_1.zh_1);
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_11 = Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
-      var tmp_12 = emitContentType_0(_this__u8e3s4.oi_1);
+      var tmp_11 = Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
+      var tmp_12 = emitContentType_0(_this__u8e3s4.pi_1);
       var tmp$ret$13;
       // Inline function 'kotlin.takeIf' call
-      var tmp3_takeIf = _this__u8e3s4.ni_1;
+      var tmp3_takeIf = _this__u8e3s4.oi_1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp_13;
       var tmp$ret$12;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$12 = !Companion_getInstance_2().fk(tmp3_takeIf);
+      tmp$ret$12 = !Companion_getInstance_2().gk(tmp3_takeIf);
       if (tmp$ret$12) {
         tmp_13 = tmp3_takeIf;
       } else {
@@ -1512,13 +1511,13 @@
         tmp$ret$15 = tmp$ret$14;
         tmp_14 = tmp$ret$15;
       }
-      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + tmp_8 + 'content?.type == "' + _this__u8e3s4.oi_1.xh_1 + '" -> contentMapper\n                    |' + '  ' + '  ' + '  ' + '  ' + '.read<' + tmp_9 + '>(content, typeOf<' + tmp_10 + '>())\n                    |' + '  ' + '  ' + '  ' + '  ' + '.let{ Response' + tmp_11 + tmp_12 + '(' + orEmptyString_0(tmp_14) + 'headers, it.body) }\n                ');
+      tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + tmp_8 + 'content?.type == "' + _this__u8e3s4.pi_1.yh_1 + '" -> contentMapper\n                    |' + '  ' + '  ' + '  ' + '  ' + '.read<' + tmp_9 + '>(content, typeOf<' + tmp_10 + '>())\n                    |' + '  ' + '  ' + '  ' + '  ' + '.let{ Response' + tmp_11 + tmp_12 + '(' + orEmptyString_0(tmp_14) + 'headers, it.body) }\n                ');
     }
     return tmp;
   }
   function Companion() {
     Companion_instance = this;
-    this.kk_1 = listOf(['as', 'break', 'class', 'continue', 'do', 'else', 'false', 'for', 'fun', 'if', 'in', 'interface', 'is', 'null', 'object', 'package', 'return', 'super', 'this', 'throw', 'true', 'try', 'typealias', 'typeof', 'val', 'var', 'when', 'while']);
+    this.lk_1 = listOf(['as', 'break', 'class', 'continue', 'do', 'else', 'false', 'for', 'fun', 'if', 'in', 'interface', 'is', 'null', 'object', 'package', 'return', 'super', 'this', 'throw', 'true', 'try', 'typealias', 'typeof', 'val', 'var', 'when', 'while']);
   }
   var Companion_instance;
   function Companion_getInstance_0() {
@@ -1528,30 +1527,30 @@
   }
   function KotlinEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('|data class ' + $this_emit.vi_1 + '(\n           |' + this$0.xi($this_emit.wi_1) + '\n           |)\n           |');
+      return trimMargin('|data class ' + $this_emit.wi_1 + '(\n           |' + this$0.yi($this_emit.xi_1) + '\n           |)\n           |');
     };
   }
   function KotlinEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
       Companion_getInstance_2();
-      return '  ' + 'val ' + this$0.yi(it);
+      return '  ' + 'val ' + this$0.zi(it);
     };
   }
   function KotlinEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.zi_1, ',\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.aj_1, ',\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda(this$0));
     };
   }
   function KotlinEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
-      return this$0.dj($this_emit.aj_1) + ': ' + this$0.ei($this_emit.bj_1) + ($this_emit.cj_1 ? '? = null' : '');
+      return this$0.ej($this_emit.bj_1) + ': ' + this$0.fi($this_emit.cj_1) + ($this_emit.dj_1 ? '? = null' : '');
     };
   }
   function KotlinEmitter$emit$lambda_2(this$0, $this_emit) {
     return function () {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.mapIndexed' call
-      var tmp1_mapIndexed = split($this_emit.ej_1, ['-']);
+      var tmp1_mapIndexed = split($this_emit.fj_1, ['-']);
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapIndexedTo' call
       var tmp0_mapIndexedTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_mapIndexed, 10));
@@ -1564,12 +1563,12 @@
         var tmp1 = index;
         index = tmp1 + 1 | 0;
         var tmp2__anonymous__z9zvc9 = checkIndexOverflow(tmp1);
-        tmp$ret$0 = tmp2__anonymous__z9zvc9 > 0 ? Companion_getInstance_2().qi(item) : item;
+        tmp$ret$0 = tmp2__anonymous__z9zvc9 > 0 ? Companion_getInstance_2().ri(item) : item;
         tmp0_mapIndexedTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapIndexedTo;
       tmp$ret$2 = tmp$ret$1;
-      return this$0.lk(joinToString(tmp$ret$2, ''));
+      return this$0.mk(joinToString(tmp$ret$2, ''));
     };
   }
   function KotlinEmitter$emit$lambda_3($this_emit) {
@@ -1584,10 +1583,10 @@
         tmp = 'Any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.ij_1;
+          tmp = $this_emit.jj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.fj_1;
+            var tmp1_subject = $this_emit.gj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -1614,13 +1613,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.ri() ? 'List<' + tmp0_let + '>' : tmp0_let;
+      tmp$ret$0 = $this_emit.si() ? 'List<' + tmp0_let + '>' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       var tmp1_let = tmp$ret$1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$2 = $this_emit.mk() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.nk() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -1638,7 +1637,7 @@
   }
   function KotlinEmitter$emit$lambda$lambda_0(this$0) {
     return function (it) {
-      return this$0.lk(invoke$sanitize_0(it)) + '("' + it + '")';
+      return this$0.mk(invoke$sanitize_0(it)) + '("' + it + '")';
     };
   }
   function KotlinEmitter$emit$lambda_4($this_emit, this$0) {
@@ -1646,34 +1645,34 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       var tmp = ',\n' + '  ';
-      return 'enum class ' + $this_emit.lj_1 + ' (val label: String){\n' + '  ' + joinToString($this_emit.mj_1, tmp, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_0(this$0)) + '\n}\n';
+      return 'enum class ' + $this_emit.mj_1 + ' (val label: String){\n' + '  ' + joinToString($this_emit.nj_1, tmp, VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_0(this$0)) + '\n}\n';
     };
   }
   function KotlinEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return trimMargin('data class ' + $this_emit.nj_1 + '(val value: String)\n            |fun ' + $this_emit.nj_1 + '.validate() = ' + this$0.pj($this_emit.oj_1) + '\n            |');
+      return trimMargin('data class ' + $this_emit.oj_1 + '(val value: String)\n            |fun ' + $this_emit.oj_1 + '.validate() = ' + this$0.qj($this_emit.pj_1) + '\n            |');
     };
   }
   function KotlinEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return 'Regex(' + $this_emit.qj_1 + ').find(value)';
+      return 'Regex(' + $this_emit.rj_1 + ').find(value)';
     };
   }
   function KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
     return function (it) {
       Companion_getInstance_2();
-      var tmp0_safe_receiver = it.wh_1;
+      var tmp0_safe_receiver = it.xh_1;
       var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
       var tmp = tmp1_elvis_lhs == null ? 'Unit' : tmp1_elvis_lhs;
-      var tmp_0 = emitRequestSignature_0($this_emit, this$0, it.wh_1);
-      var tmp2_safe_receiver = it.wh_1;
-      var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.yh_1;
-      var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : this$0.ei(tmp3_safe_receiver);
+      var tmp_0 = emitRequestSignature_0($this_emit, this$0, it.xh_1);
+      var tmp2_safe_receiver = it.xh_1;
+      var tmp3_safe_receiver = tmp2_safe_receiver == null ? null : tmp2_safe_receiver.zh_1;
+      var tmp4_elvis_lhs = tmp3_safe_receiver == null ? null : this$0.fi(tmp3_safe_receiver);
       var tmp_1 = tmp4_elvis_lhs == null ? 'Unit' : tmp4_elvis_lhs;
-      var tmp_2 = emitPath_0($this_emit.hi_1, this$0);
-      var tmp_3 = emitMap_0($this_emit.ii_1, this$0);
-      var tmp_4 = emitMap_0($this_emit.ji_1, this$0);
-      var tmp5_safe_receiver = it.wh_1;
+      var tmp_2 = emitPath_0($this_emit.ii_1, this$0);
+      var tmp_3 = emitMap_0($this_emit.ji_1, this$0);
+      var tmp_4 = emitMap_0($this_emit.ki_1, this$0);
+      var tmp5_safe_receiver = it.xh_1;
       var tmp_5;
       if (tmp5_safe_receiver == null) {
         tmp_5 = null;
@@ -1683,12 +1682,12 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = 'WirespecShared.Content("' + tmp5_safe_receiver.xh_1 + '", body)';
+        tmp$ret$0 = 'WirespecShared.Content("' + tmp5_safe_receiver.yh_1 + '", body)';
         tmp$ret$1 = tmp$ret$0;
         tmp_5 = tmp$ret$1;
       }
       var tmp6_elvis_lhs = tmp_5;
-      return '  ' + 'class Request' + tmp + ' ' + tmp_0 + ': Request<' + tmp_1 + '> {override val path = "' + tmp_2 + '"; override val method = WirespecShared.Method.' + $this_emit.gi_1.p4_1 + '; override val query = mapOf<String, List<Any?>>(' + tmp_3 + '); override val headers = mapOf<String, List<Any?>>(' + tmp_4 + '); override val content = ' + (tmp6_elvis_lhs == null ? 'null' : tmp6_elvis_lhs) + '}';
+      return '  ' + 'class Request' + tmp + ' ' + tmp_0 + ': Request<' + tmp_1 + '> {override val path = "' + tmp_2 + '"; override val method = WirespecShared.Method.' + $this_emit.hi_1.p4_1 + '; override val query = mapOf<String, List<Any?>>(' + tmp_3 + '); override val headers = mapOf<String, List<Any?>>(' + tmp_4 + '); override val content = ' + (tmp6_elvis_lhs == null ? 'null' : tmp6_elvis_lhs) + '}';
     };
   }
   function KotlinEmitter$emit$lambda$lambda_2(it) {
@@ -1702,10 +1701,10 @@
   function KotlinEmitter$emit$lambda$lambda_4(this$0) {
     return function (it) {
       Companion_getInstance_2();
-      var tmp0_safe_receiver = it.oi_1;
+      var tmp0_safe_receiver = it.pi_1;
       var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
       var tmp = tmp1_elvis_lhs == null ? 'Unit' : tmp1_elvis_lhs;
-      var tmp2_safe_receiver = it.oi_1;
+      var tmp2_safe_receiver = it.pi_1;
       var tmp_0;
       if (tmp2_safe_receiver == null) {
         tmp_0 = null;
@@ -1715,17 +1714,17 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', body: ' + this$0.ei(tmp2_safe_receiver.yh_1);
+        tmp$ret$0 = ', body: ' + this$0.fi(tmp2_safe_receiver.zh_1);
         tmp$ret$1 = tmp$ret$0;
         tmp_0 = tmp$ret$1;
       }
       var tmp3_elvis_lhs = tmp_0;
       var tmp_1 = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-      var tmp4_safe_receiver = it.oi_1;
-      var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.yh_1;
-      var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.ei(tmp5_safe_receiver);
+      var tmp4_safe_receiver = it.pi_1;
+      var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.zh_1;
+      var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.fi(tmp5_safe_receiver);
       var tmp_2 = tmp6_elvis_lhs == null ? 'Unit' : tmp6_elvis_lhs;
-      var tmp7_safe_receiver = it.oi_1;
+      var tmp7_safe_receiver = it.pi_1;
       var tmp_3;
       if (tmp7_safe_receiver == null) {
         tmp_3 = null;
@@ -1735,22 +1734,22 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$2 = 'WirespecShared.Content("' + tmp7_safe_receiver.xh_1 + '", body)';
+        tmp$ret$2 = 'WirespecShared.Content("' + tmp7_safe_receiver.yh_1 + '", body)';
         tmp$ret$3 = tmp$ret$2;
         tmp_3 = tmp$ret$3;
       }
       var tmp8_elvis_lhs = tmp_3;
-      return '  ' + 'class Response' + it.ni_1 + tmp + ' (override val headers: Map<String, List<Any?>>' + tmp_1 + ' ): Response' + it.ni_1 + '<' + tmp_2 + '> { override val status = ' + it.ni_1 + '; override val content = ' + (tmp8_elvis_lhs == null ? 'null' : tmp8_elvis_lhs) + '}';
+      return '  ' + 'class Response' + it.oi_1 + tmp + ' (override val headers: Map<String, List<Any?>>' + tmp_1 + ' ): Response' + it.oi_1 + '<' + tmp_2 + '> { override val status = ' + it.oi_1 + '; override val content = ' + (tmp8_elvis_lhs == null ? 'null' : tmp8_elvis_lhs) + '}';
     };
   }
   function KotlinEmitter$emit$lambda$lambda_5(this$0) {
     return function (it) {
       Companion_getInstance_2();
-      var tmp = Companion_getInstance_2().qi(it.ni_1);
-      var tmp0_safe_receiver = it.oi_1;
+      var tmp = Companion_getInstance_2().ri(it.oi_1);
+      var tmp0_safe_receiver = it.pi_1;
       var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
       var tmp_0 = tmp1_elvis_lhs == null ? 'Unit' : tmp1_elvis_lhs;
-      var tmp2_safe_receiver = it.oi_1;
+      var tmp2_safe_receiver = it.pi_1;
       var tmp_1;
       if (tmp2_safe_receiver == null) {
         tmp_1 = null;
@@ -1760,18 +1759,18 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', body: ' + this$0.ei(tmp2_safe_receiver.yh_1);
+        tmp$ret$0 = ', body: ' + this$0.fi(tmp2_safe_receiver.zh_1);
         tmp$ret$1 = tmp$ret$0;
         tmp_1 = tmp$ret$1;
       }
       var tmp3_elvis_lhs = tmp_1;
       var tmp_2 = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-      var tmp_3 = Companion_getInstance_2().qi(it.ni_1);
-      var tmp4_safe_receiver = it.oi_1;
-      var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.yh_1;
-      var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.ei(tmp5_safe_receiver);
+      var tmp_3 = Companion_getInstance_2().ri(it.oi_1);
+      var tmp4_safe_receiver = it.pi_1;
+      var tmp5_safe_receiver = tmp4_safe_receiver == null ? null : tmp4_safe_receiver.zh_1;
+      var tmp6_elvis_lhs = tmp5_safe_receiver == null ? null : this$0.fi(tmp5_safe_receiver);
       var tmp_4 = tmp6_elvis_lhs == null ? 'Unit' : tmp6_elvis_lhs;
-      var tmp7_safe_receiver = it.oi_1;
+      var tmp7_safe_receiver = it.pi_1;
       var tmp_5;
       if (tmp7_safe_receiver == null) {
         tmp_5 = null;
@@ -1781,7 +1780,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$2 = 'WirespecShared.Content("' + tmp7_safe_receiver.xh_1 + '", body)';
+        tmp$ret$2 = 'WirespecShared.Content("' + tmp7_safe_receiver.yh_1 + '", body)';
         tmp$ret$3 = tmp$ret$2;
         tmp_5 = tmp$ret$3;
       }
@@ -1792,11 +1791,11 @@
   function KotlinEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      var tmp = joinToString($this_emit.li_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit));
+      var tmp = joinToString($this_emit.mi_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit));
       Companion_getInstance_2();
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map = $this_emit.mi_1;
+      var tmp1_map = $this_emit.ni_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -1805,7 +1804,7 @@
         var item = tmp0_iterator.e();
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$0 = groupStatus_0(item.ni_1);
+        tmp$ret$0 = groupStatus_0(item.oi_1);
         tmp0_mapTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapTo;
@@ -1816,7 +1815,7 @@
       // Inline function 'kotlin.collections.map' call
       var tmp$ret$5;
       // Inline function 'kotlin.collections.filter' call
-      var tmp3_filter = $this_emit.mi_1;
+      var tmp3_filter = $this_emit.ni_1;
       var tmp$ret$4;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp2_filterTo = ArrayList_init_$Create$();
@@ -1825,7 +1824,7 @@
         var element = tmp0_iterator_0.e();
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$3 = Companion_getInstance_2().fk(element.ni_1);
+        tmp$ret$3 = Companion_getInstance_2().gk(element.oi_1);
         if (tmp$ret$3) {
           tmp2_filterTo.a(element);
         }
@@ -1841,7 +1840,7 @@
         var item_0 = tmp0_iterator_1.e();
         var tmp$ret$6;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$6 = item_0.ni_1;
+        tmp$ret$6 = item_0.oi_1;
         tmp4_mapTo.a(tmp$ret$6);
       }
       tmp$ret$7 = tmp4_mapTo;
@@ -1852,7 +1851,7 @@
       // Inline function 'kotlin.collections.distinctBy' call
       var tmp$ret$11;
       // Inline function 'kotlin.collections.filter' call
-      var tmp7_filter = $this_emit.mi_1;
+      var tmp7_filter = $this_emit.ni_1;
       var tmp$ret$10;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp6_filterTo = ArrayList_init_$Create$();
@@ -1861,7 +1860,7 @@
         var element_0 = tmp0_iterator_2.e();
         var tmp$ret$9;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$9 = Companion_getInstance_2().fk(element_0.ni_1);
+        tmp$ret$9 = Companion_getInstance_2().gk(element_0.oi_1);
         if (tmp$ret$9) {
           tmp6_filterTo.a(element_0);
         }
@@ -1876,8 +1875,8 @@
         var e = tmp0_iterator_3.e();
         var tmp$ret$12;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_safe_receiver = e.oi_1;
-        tmp$ret$12 = to(e.ni_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.xh_1);
+        var tmp0_safe_receiver = e.pi_1;
+        tmp$ret$12 = to(e.oi_1, tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1);
         var key = tmp$ret$12;
         if (set.a(key)) {
           list.a(e);
@@ -1890,7 +1889,7 @@
       // Inline function 'kotlin.collections.distinctBy' call
       var tmp$ret$16;
       // Inline function 'kotlin.collections.filter' call
-      var tmp10_filter = $this_emit.mi_1;
+      var tmp10_filter = $this_emit.ni_1;
       var tmp$ret$15;
       // Inline function 'kotlin.collections.filterTo' call
       var tmp9_filterTo = ArrayList_init_$Create$();
@@ -1899,7 +1898,7 @@
         var element_1 = tmp0_iterator_4.e();
         var tmp$ret$14;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        tmp$ret$14 = !Companion_getInstance_2().fk(element_1.ni_1);
+        tmp$ret$14 = !Companion_getInstance_2().gk(element_1.oi_1);
         if (tmp$ret$14) {
           tmp9_filterTo.a(element_1);
         }
@@ -1914,8 +1913,8 @@
         var e_0 = tmp0_iterator_5.e();
         var tmp$ret$17;
         // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>.<anonymous>' call
-        var tmp0_safe_receiver_0 = e_0.oi_1;
-        tmp$ret$17 = to(e_0.ni_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.xh_1);
+        var tmp0_safe_receiver_0 = e_0.pi_1;
+        tmp$ret$17 = to(e_0.oi_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.yh_1);
         var key_0 = tmp$ret$17;
         if (set_0.a(key_0)) {
           list_0.a(e_0);
@@ -1924,33 +1923,33 @@
       tmp$ret$18 = list_0;
       var tmp_6 = tmp$ret$18;
       var tmp_7 = joinToString(tmp_6, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_5(this$0));
-      var tmp_8 = Companion_getInstance_2().rj($this_emit.fi_1);
+      var tmp_8 = Companion_getInstance_2().sj($this_emit.gi_1);
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_9 = emitSegment_0($this_emit.hi_1, this$0);
+      var tmp_9 = emitSegment_0($this_emit.ii_1, this$0);
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_10 = emitResponseMapper_0($this_emit.mi_1, this$0);
+      var tmp_10 = emitResponseMapper_0($this_emit.ni_1, this$0);
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      return trimMargin('interface ' + $this_emit.fi_1 + ' {\n        |' + '  ' + 'sealed interface Request<T>: WirespecShared.Request<T>\n        |' + tmp + '\n        |' + '  ' + 'sealed interface Response<T>: WirespecShared.Response<T>\n        |' + tmp_1 + '\n        |' + tmp_3 + '\n        |' + tmp_5 + '\n        |' + tmp_7 + '\n        |suspend fun ' + tmp_8 + '(request: Request<*>): Response<*>\n        |' + '  ' + 'companion object{\n        |' + '  ' + '  ' + 'const val PATH = "' + tmp_9 + '"\n        |' + '  ' + '  ' + tmp_10 + '\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '}\n        |}\n        |');
+      return trimMargin('interface ' + $this_emit.gi_1 + ' {\n        |' + '  ' + 'sealed interface Request<T>: WirespecShared.Request<T>\n        |' + tmp + '\n        |' + '  ' + 'sealed interface Response<T>: WirespecShared.Response<T>\n        |' + tmp_1 + '\n        |' + tmp_3 + '\n        |' + tmp_5 + '\n        |' + tmp_7 + '\n        |suspend fun ' + tmp_8 + '(request: Request<*>): Response<*>\n        |' + '  ' + 'companion object{\n        |' + '  ' + '  ' + 'const val PATH = "' + tmp_9 + '"\n        |' + '  ' + '  ' + tmp_10 + '\n        |' + '  ' + '  ' + '}\n        |' + '  ' + '}\n        |}\n        |');
     };
   }
   function KotlinEmitter$emitRequestSignature$lambda(this$0) {
     return function (it) {
-      return this$0.yi(it);
+      return this$0.zi(it);
     };
   }
   function KotlinEmitter$emitSegment$lambda(it) {
     var tmp0_subject = it;
     var tmp;
     if (tmp0_subject instanceof Param) {
-      tmp = '{' + it.ti_1.ej_1 + '}';
+      tmp = '{' + it.ui_1.fj_1 + '}';
     } else {
       if (tmp0_subject instanceof Literal) {
-        tmp = it.sj_1;
+        tmp = it.tj_1;
       } else {
         noWhenBranchMatchedException();
       }
@@ -1959,7 +1958,7 @@
   }
   function KotlinEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return '"' + this$0.dj(it.aj_1) + '" to listOf(' + this$0.dj(it.aj_1) + ')';
+      return '"' + this$0.ej(it.bj_1) + '" to listOf(' + this$0.ej(it.bj_1) + ')';
     };
   }
   function KotlinEmitter$emit$lambda_8($this_emit) {
@@ -1967,10 +1966,10 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emit.sj_1;
+        tmp = $this_emit.tj_1;
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = '${' + $this_emit.ti_1.ej_1 + '}';
+          tmp = '${' + $this_emit.ui_1.fj_1 + '}';
         } else {
           noWhenBranchMatchedException();
         }
@@ -1998,19 +1997,19 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.ik_1 = packageName;
+    this.jk_1 = packageName;
     var tmp = this;
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    tmp.jk_1 = trimMargin('\n        |import kotlin.reflect.KType\n        |import kotlin.reflect.typeOf\n        |object WirespecShared {\n        |' + '  ' + 'enum class Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + '  ' + 'data class Content<T> (val type:String, val body:T )\n        |' + '  ' + 'interface Request<T> { val path:String; val method: Method; val query: Map<String, List<Any?>>; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface Response<T> { val status:Int; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface ContentMapper<B> { fun <T> read(content: Content<B>, valueType: KType): Content<T> fun <T> write(content: Content<T>): Content<B> }\n        |}\n    ');
+    tmp.kk_1 = trimMargin('\n        |import kotlin.reflect.KType\n        |import kotlin.reflect.typeOf\n        |object WirespecShared {\n        |' + '  ' + 'enum class Method { GET, PUT, POST, DELETE, OPTIONS, HEAD, PATCH, TRACE }\n        |' + '  ' + 'data class Content<T> (val type:String, val body:T )\n        |' + '  ' + 'interface Request<T> { val path:String; val method: Method; val query: Map<String, List<Any?>>; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface Response<T> { val status:Int; val headers: Map<String, List<Any?>>; val content:Content<T>? }\n        |' + '  ' + 'interface ContentMapper<B> { fun <T> read(content: Content<B>, valueType: KType): Content<T> fun <T> write(content: Content<T>): Content<B> }\n        |}\n    ');
   }
-  protoOf(KotlinEmitter).sh = function (ast) {
+  protoOf(KotlinEmitter).th = function (ast) {
     var tmp$ret$3;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = protoOf(Emitter).sh.call(this, ast);
+    var tmp1_map = protoOf(Emitter).th.call(this, ast);
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -2023,7 +2022,7 @@
       var result = item.j3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.ik_1) ? '' : 'package ' + this.ik_1) + '\n                    |' + (Companion_getInstance_2().nk(ast) ? this.jk_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (isBlank(this.jk_1) ? '' : 'package ' + this.jk_1) + '\n                    |' + (Companion_getInstance_2().ok(ast) ? this.kk_1 : '') + '\n                    |' + result + '\n            ');
       tmp$ret$0 = toString(trimStart(isCharSequence(tmp0_trimStart) ? tmp0_trimStart : THROW_CCE()));
       tmp$ret$1 = to(name, tmp$ret$0);
       tmp0_mapTo.a(tmp$ret$1);
@@ -2032,46 +2031,46 @@
     tmp$ret$3 = tmp$ret$2;
     return tmp$ret$3;
   };
-  protoOf(KotlinEmitter).tj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda(_this__u8e3s4, this));
-  };
-  protoOf(KotlinEmitter).xi = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).uj = function (_this__u8e3s4) {
+    return this.vj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(KotlinEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.wj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).dj = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_2(this, _this__u8e3s4));
+  protoOf(KotlinEmitter).zi = function (_this__u8e3s4) {
+    return this.xj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).ei = function (_this__u8e3s4) {
-    return this.vh(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_3(_this__u8e3s4));
+  protoOf(KotlinEmitter).ej = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_2(this, _this__u8e3s4));
   };
-  protoOf(KotlinEmitter).yj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_4(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).fi = function (_this__u8e3s4) {
+    return this.wh(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(KotlinEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_4(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).pj = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(KotlinEmitter).bk = function (_this__u8e3s4) {
+    return this.ck(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(KotlinEmitter).dk = function (_this__u8e3s4) {
-    return this.ek(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(KotlinEmitter).qj = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(KotlinEmitter).lk = function (_this__u8e3s4) {
-    return Companion_getInstance_0().kk_1.i1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
+  protoOf(KotlinEmitter).ek = function (_this__u8e3s4) {
+    return this.fk(_this__u8e3s4, this.rh_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
+  };
+  protoOf(KotlinEmitter).mk = function (_this__u8e3s4) {
+    return Companion_getInstance_0().lk_1.i1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
   };
   function toField(_this__u8e3s4, identifier, isNullable) {
     return new Field(new Identifier(identifier), _this__u8e3s4, isNullable);
   }
   function emitContentType_0(_this__u8e3s4) {
-    var tmp = split(_this__u8e3s4.xh_1, ['/', '-']);
+    var tmp = split(_this__u8e3s4.yh_1, ['/', '-']);
     return joinToString(tmp, '', VOID, VOID, VOID, VOID, emitContentType$lambda);
   }
   function groupStatus_0(_this__u8e3s4) {
     var tmp;
-    if (Companion_getInstance_2().fk(_this__u8e3s4)) {
+    if (Companion_getInstance_2().gk(_this__u8e3s4)) {
       var tmp$ret$1;
       // Inline function 'kotlin.text.substring' call
       var tmp$ret$0;
@@ -2080,7 +2079,7 @@
       tmp$ret$1 = tmp$ret$0.substring(0, 1);
       tmp = tmp$ret$1 + 'XX';
     } else {
-      tmp = Companion_getInstance_2().qi(_this__u8e3s4);
+      tmp = Companion_getInstance_2().ri(_this__u8e3s4);
     }
     return tmp;
   }
@@ -2089,11 +2088,11 @@
     return tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
   }
   function emitContentType$lambda(it) {
-    return Companion_getInstance_2().qi(it);
+    return Companion_getInstance_2().ri(it);
   }
   function Companion_0() {
     Companion_instance_0 = this;
-    this.ok_1 = listOf(['abstract', 'case', 'catch', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', 'finally', 'for', 'forSome', 'if', 'implicit', 'import', 'lazy', 'match', 'new', 'null', 'object', 'override', 'package', 'private', 'protected', 'return', 'sealed', 'super', 'this', 'throw', 'trait', 'true', 'try', 'type', 'val', 'var', 'while', 'with', 'yield']);
+    this.pk_1 = listOf(['abstract', 'case', 'catch', 'class', 'def', 'do', 'else', 'extends', 'false', 'final', 'finally', 'for', 'forSome', 'if', 'implicit', 'import', 'lazy', 'match', 'new', 'null', 'object', 'override', 'package', 'private', 'protected', 'return', 'sealed', 'super', 'this', 'throw', 'trait', 'true', 'try', 'type', 'val', 'var', 'while', 'with', 'yield']);
   }
   var Companion_instance_0;
   function Companion_getInstance_1() {
@@ -2103,28 +2102,28 @@
   }
   function ScalaEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('case class ' + $this_emit.vi_1 + '(\n            |' + this$0.xi($this_emit.wi_1) + '\n            |)\n            |\n            |');
+      return trimMargin('case class ' + $this_emit.wi_1 + '(\n            |' + this$0.yi($this_emit.xi_1) + '\n            |)\n            |\n            |');
     };
   }
   function ScalaEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.yi(it);
+      return this$0.zi(it);
     };
   }
   function ScalaEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return dropLast(joinToString($this_emit.zi_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda(this$0)), 1);
+      return dropLast(joinToString($this_emit.aj_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda(this$0)), 1);
     };
   }
   function ScalaEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + 'val ' + this$0.dj($this_emit.aj_1) + ': ' + ($this_emit.cj_1 ? 'Option[' + this$0.ei($this_emit.bj_1) + ']' : this$0.ei($this_emit.bj_1)) + ',';
+      return '  ' + 'val ' + this$0.ej($this_emit.bj_1) + ': ' + ($this_emit.dj_1 ? 'Option[' + this$0.fi($this_emit.cj_1) + ']' : this$0.fi($this_emit.cj_1)) + ',';
     };
   }
   function ScalaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return Companion_getInstance_1().ok_1.i1($this_emit.ej_1) ? '`' + $this_emit.ej_1 + '`' : $this_emit.ej_1;
+      return Companion_getInstance_1().pk_1.i1($this_emit.fj_1) ? '`' + $this_emit.fj_1 + '`' : $this_emit.fj_1;
     };
   }
   function ScalaEmitter$emit$lambda_3($this_emit) {
@@ -2137,10 +2136,10 @@
         tmp = 'Any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.ij_1;
+          tmp = $this_emit.jj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.fj_1;
+            var tmp1_subject = $this_emit.gj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -2167,7 +2166,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.ri() ? 'List[' + tmp0_let + ']' : tmp0_let;
+      tmp$ret$0 = $this_emit.si() ? 'List[' + tmp0_let + ']' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       return tmp$ret$1;
     };
@@ -2193,20 +2192,20 @@
       // Inline function 'kotlin.js.asDynamic' call
       tmp$ret$0 = tmp0_uppercase;
       tmp$ret$1 = tmp$ret$0.toUpperCase();
-      return '  ' + 'final case object ' + tmp$ret$1 + ' extends ' + $this_emit.lj_1 + '(label = "' + it + '")';
+      return '  ' + 'final case object ' + tmp$ret$1 + ' extends ' + $this_emit.mj_1 + '(label = "' + it + '")';
     };
   }
   function ScalaEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return trimMargin('\n        |sealed abstract class ' + $this_emit.lj_1 + '(val label: String)\n        |object ' + $this_emit.lj_1 + ' {\n        |' + joinToString($this_emit.mj_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda_0($this_emit)) + '\n        |}\n        |');
+      return trimMargin('\n        |sealed abstract class ' + $this_emit.mj_1 + '(val label: String)\n        |object ' + $this_emit.mj_1 + ' {\n        |' + joinToString($this_emit.nj_1, '\n', VOID, VOID, VOID, VOID, ScalaEmitter$emit$lambda$lambda_0($this_emit)) + '\n        |}\n        |');
     };
   }
   function ScalaEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      var tmp = this$0.pj($this_emit.oj_1);
+      var tmp = this$0.qj($this_emit.pj_1);
       Companion_getInstance_2();
-      return trimMargin('case class ' + $this_emit.nj_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.nj_1 + 'Ops(val that: ' + $this_emit.nj_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
+      return trimMargin('case class ' + $this_emit.oj_1 + '(val value: String) {\n            |' + '  ' + 'implicit class ' + $this_emit.oj_1 + 'Ops(val that: ' + $this_emit.oj_1 + ') {\n            |' + tmp + '\n            |' + '  ' + '}\n            |}\n            |\n            |');
     };
   }
   function ScalaEmitter$emit$lambda_6($this_emit) {
@@ -2215,7 +2214,7 @@
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.qj_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
+      return trimMargin('  ' + '  ' + 'val regex = new scala.util.matching.Regex(' + $this_emit.rj_1 + ')\n            |' + '  ' + '  ' + 'regex.findFirstIn(that.value)');
     };
   }
   function ScalaEmitter$emit$lambda_7() {
@@ -2226,12 +2225,12 @@
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.rk_1 = packageName;
+    this.sk_1 = packageName;
   }
-  protoOf(ScalaEmitter).sh = function (ast) {
+  protoOf(ScalaEmitter).th = function (ast) {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = protoOf(Emitter).sh.call(this, ast);
+    var tmp1_map = protoOf(Emitter).th.call(this, ast);
     var tmp$ret$1;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -2242,54 +2241,54 @@
       // Inline function 'community.flock.wirespec.compiler.core.emit.ScalaEmitter.emit.<anonymous>' call
       var name = item.i3();
       var result = item.j3();
-      tmp$ret$0 = to(name, isBlank(this.rk_1) ? '' : 'package ' + this.rk_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, isBlank(this.sk_1) ? '' : 'package ' + this.sk_1 + '\n\n' + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapTo;
     tmp$ret$2 = tmp$ret$1;
     return tmp$ret$2;
   };
-  protoOf(ScalaEmitter).tj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.qh_1, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
-  };
-  protoOf(ScalaEmitter).xi = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.qh_1, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(ScalaEmitter).uj = function (_this__u8e3s4) {
+    return this.vj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(ScalaEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.qh_1, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.wj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_0(_this__u8e3s4, this));
+  };
+  protoOf(ScalaEmitter).zi = function (_this__u8e3s4) {
+    return this.xj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(ScalaEmitter).dj = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.qh_1, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
+  protoOf(ScalaEmitter).ej = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_2(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).ei = function (_this__u8e3s4) {
-    return this.vh(_this__u8e3s4, this.qh_1, ScalaEmitter$emit$lambda_3(_this__u8e3s4));
+  protoOf(ScalaEmitter).fi = function (_this__u8e3s4) {
+    return this.wh(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).yj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.qh_1, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(ScalaEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.qh_1, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(ScalaEmitter).bk = function (_this__u8e3s4) {
+    return this.ck(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(ScalaEmitter).pj = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.qh_1, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(ScalaEmitter).qj = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(ScalaEmitter).dk = function (_this__u8e3s4) {
-    return this.ek(_this__u8e3s4, this.qh_1, ScalaEmitter$emit$lambda_7);
+  protoOf(ScalaEmitter).ek = function (_this__u8e3s4) {
+    return this.fk(_this__u8e3s4, this.rh_1, ScalaEmitter$emit$lambda_7);
   };
   function emitType(_this__u8e3s4, $this) {
     return '`' + joinToString(_this__u8e3s4, '', VOID, VOID, VOID, VOID, TypeScriptEmitter$emitType$lambda($this)) + '`';
   }
   function emitType_0(_this__u8e3s4, $this) {
-    return $this.si(_this__u8e3s4, $this.qh_1, TypeScriptEmitter$emitType$lambda_0(_this__u8e3s4, $this));
+    return $this.ti(_this__u8e3s4, $this.rh_1, TypeScriptEmitter$emitType$lambda_0(_this__u8e3s4, $this));
   }
   function emitName(_this__u8e3s4, $this) {
-    var tmp0_safe_receiver = _this__u8e3s4.wh_1;
+    var tmp0_safe_receiver = _this__u8e3s4.xh_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
     return 'Request' + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
   function emitName_0(_this__u8e3s4, $this) {
-    var tmp = 'Response' + Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
-    var tmp0_safe_receiver = _this__u8e3s4.oi_1;
+    var tmp = 'Response' + Companion_getInstance_2().ri(_this__u8e3s4.oi_1);
+    var tmp0_safe_receiver = _this__u8e3s4.pi_1;
     var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : emitContentType_0(tmp0_safe_receiver);
     return tmp + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
@@ -2300,32 +2299,32 @@
     return '/' + joinToString(_this__u8e3s4, '/', VOID, VOID, VOID, VOID, TypeScriptEmitter$emitPath$lambda($this));
   }
   function emit_3(_this__u8e3s4, $this) {
-    return $this.si(_this__u8e3s4, $this.qh_1, TypeScriptEmitter$emit$lambda_8(_this__u8e3s4));
+    return $this.ti(_this__u8e3s4, $this.rh_1, TypeScriptEmitter$emit$lambda_8(_this__u8e3s4));
   }
   function TypeScriptEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('export type ' + $this_emit.vi_1 + ' = {\n            |' + this$0.xi($this_emit.wi_1) + '\n            |}\n            |\n            |');
+      return trimMargin('export type ' + $this_emit.wi_1 + ' = {\n            |' + this$0.yi($this_emit.xi_1) + '\n            |}\n            |\n            |');
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.yi(it);
+      return this$0.zi(it);
     };
   }
   function TypeScriptEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return joinToString($this_emit.zi_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda(this$0));
+      return joinToString($this_emit.aj_1, ',\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda(this$0));
     };
   }
   function TypeScriptEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + this$0.dj($this_emit.aj_1) + ($this_emit.cj_1 ? '?' : '') + ': ' + this$0.ei($this_emit.bj_1);
+      return '  ' + this$0.ej($this_emit.bj_1) + ($this_emit.dj_1 ? '?' : '') + ': ' + this$0.fi($this_emit.cj_1);
     };
   }
   function TypeScriptEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return $this_emit.ej_1;
+      return $this_emit.fj_1;
     };
   }
   function TypeScriptEmitter$emit$lambda_3($this_emit) {
@@ -2340,10 +2339,10 @@
         tmp = 'any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.ij_1;
+          tmp = $this_emit.jj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.fj_1;
+            var tmp1_subject = $this_emit.gj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -2370,13 +2369,13 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.ri() ? tmp0_let + '[]' : tmp0_let;
+      tmp$ret$0 = $this_emit.si() ? tmp0_let + '[]' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       var tmp1_let = tmp$ret$1;
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$2 = $this_emit.mk() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.nk() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -2386,28 +2385,28 @@
   }
   function TypeScriptEmitter$emit$lambda_4($this_emit) {
     return function () {
-      return 'type ' + $this_emit.lj_1 + ' = ' + joinToString($this_emit.mj_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
+      return 'type ' + $this_emit.mj_1 + ' = ' + joinToString($this_emit.nj_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_0) + '\n';
     };
   }
   function TypeScriptEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
       Companion_getInstance_2();
-      return trimMargin('type ' + $this_emit.nj_1 + ' = {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.nj_1 + ' = (type: ' + $this_emit.nj_1 + ') => (' + this$0.pj($this_emit.oj_1) + ').test(type.value);\n            |\n            |');
+      return trimMargin('type ' + $this_emit.oj_1 + ' = {\n            |' + '  ' + 'value: string\n            |}\n            |const validate' + $this_emit.oj_1 + ' = (type: ' + $this_emit.oj_1 + ') => (' + this$0.qj($this_emit.pj_1) + ').test(type.value);\n            |\n            |');
     };
   }
   function TypeScriptEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return "new RegExp('" + dropLast(drop($this_emit.qj_1, 1), 1) + "')";
+      return "new RegExp('" + dropLast(drop($this_emit.rj_1, 1), 1) + "')";
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
     return function (it) {
       Companion_getInstance_2();
       var tmp = emitName(it, this$0);
-      var tmp_0 = emitType($this_emit.hi_1, this$0);
+      var tmp_0 = emitType($this_emit.ii_1, this$0);
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
-      var tmp1_map = $this_emit.ji_1;
+      var tmp1_map = $this_emit.ki_1;
       var tmp$ret$1;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -2416,7 +2415,7 @@
         var item = tmp0_iterator.e();
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = this$0.yi(item);
+        tmp$ret$0 = this$0.zi(item);
         tmp0_mapTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapTo;
@@ -2424,7 +2423,7 @@
       var tmp_1 = joinToString(tmp$ret$2, ',');
       var tmp$ret$5;
       // Inline function 'kotlin.collections.map' call
-      var tmp3_map = $this_emit.ii_1;
+      var tmp3_map = $this_emit.ji_1;
       var tmp$ret$4;
       // Inline function 'kotlin.collections.mapTo' call
       var tmp2_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp3_map, 10));
@@ -2433,13 +2432,13 @@
         var item_0 = tmp0_iterator_0.e();
         var tmp$ret$3;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$3 = this$0.yi(item_0);
+        tmp$ret$3 = this$0.zi(item_0);
         tmp2_mapTo.a(tmp$ret$3);
       }
       tmp$ret$4 = tmp2_mapTo;
       tmp$ret$5 = tmp$ret$4;
       var tmp_2 = joinToString(tmp$ret$5, ',');
-      var tmp0_safe_receiver = it.wh_1;
+      var tmp0_safe_receiver = it.xh_1;
       var tmp_3;
       if (tmp0_safe_receiver == null) {
         tmp_3 = null;
@@ -2449,12 +2448,12 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$6;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$6 = ', content: { type: "' + tmp0_safe_receiver.xh_1 + '", body: ' + this$0.ei(tmp0_safe_receiver.yh_1) + ' }';
+        tmp$ret$6 = ', content: { type: "' + tmp0_safe_receiver.yh_1 + '", body: ' + this$0.fi(tmp0_safe_receiver.zh_1) + ' }';
         tmp$ret$7 = tmp$ret$6;
         tmp_3 = tmp$ret$7;
       }
       var tmp1_elvis_lhs = tmp_3;
-      return '  ' + 'type ' + tmp + ' = { path: ' + tmp_0 + ', method: "' + $this_emit.gi_1 + '", headers: {' + tmp_1 + '}, query: {' + tmp_2 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' } ';
+      return '  ' + 'type ' + tmp + ' = { path: ' + tmp_0 + ', method: "' + $this_emit.hi_1 + '", headers: {' + tmp_1 + '}, query: {' + tmp_2 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + ' } ';
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_2(this$0) {
@@ -2466,8 +2465,8 @@
     return function (it) {
       Companion_getInstance_2();
       var tmp = emitName_0(it, this$0);
-      var tmp_0 = Companion_getInstance_2().fk(it.ni_1) ? it.ni_1 : 'number';
-      var tmp0_safe_receiver = it.oi_1;
+      var tmp_0 = Companion_getInstance_2().gk(it.oi_1) ? it.oi_1 : 'number';
+      var tmp0_safe_receiver = it.pi_1;
       var tmp_1;
       if (tmp0_safe_receiver == null) {
         tmp_1 = null;
@@ -2477,7 +2476,7 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', content: { type: "' + tmp0_safe_receiver.xh_1 + '", body: ' + this$0.ei(tmp0_safe_receiver.yh_1) + ' }';
+        tmp$ret$0 = ', content: { type: "' + tmp0_safe_receiver.yh_1 + '", body: ' + this$0.fi(tmp0_safe_receiver.zh_1) + ' }';
         tmp$ret$1 = tmp$ret$0;
         tmp_1 = tmp$ret$1;
       }
@@ -2492,18 +2491,18 @@
   }
   function TypeScriptEmitter$emit$lambda$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.yi(it);
+      return this$0.zi(it);
     };
   }
   function TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit) {
     return function (it) {
-      var tmp = Companion_getInstance_2().rj(emitName(it, this$0));
-      var tmp_0 = Companion_getInstance_2().vk($this_emit, it.wh_1);
+      var tmp = Companion_getInstance_2().sj(emitName(it, this$0));
+      var tmp_0 = Companion_getInstance_2().wk($this_emit, it.xh_1);
       var tmp_1 = joinToString(tmp_0, ',', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda$lambda(this$0));
-      var tmp_2 = emitPath_1($this_emit.hi_1, this$0);
-      var tmp_3 = emitMap_1($this_emit.ii_1, this$0);
-      var tmp_4 = emitMap_1($this_emit.ji_1, this$0);
-      var tmp0_safe_receiver = it.wh_1;
+      var tmp_2 = emitPath_1($this_emit.ii_1, this$0);
+      var tmp_3 = emitMap_1($this_emit.ji_1, this$0);
+      var tmp_4 = emitMap_1($this_emit.ki_1, this$0);
+      var tmp0_safe_receiver = it.xh_1;
       var tmp_5;
       if (tmp0_safe_receiver == null) {
         tmp_5 = null;
@@ -2513,33 +2512,33 @@
         // Inline function 'kotlin.contracts.contract' call
         var tmp$ret$0;
         // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emit.<anonymous>.<anonymous>.<anonymous>' call
-        tmp$ret$0 = ', content: {type: "' + tmp0_safe_receiver.xh_1 + '", body}';
+        tmp$ret$0 = ', content: {type: "' + tmp0_safe_receiver.yh_1 + '", body}';
         tmp$ret$1 = tmp$ret$0;
         tmp_5 = tmp$ret$1;
       }
       var tmp1_elvis_lhs = tmp_5;
-      return 'export const ' + tmp + ' = (' + tmp_1 + ') => ({path: `' + tmp_2 + '`, method: "' + $this_emit.gi_1.p4_1 + '", query: {' + tmp_3 + '}, headers: {' + tmp_4 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + '} as const)';
+      return 'export const ' + tmp + ' = (' + tmp_1 + ') => ({path: `' + tmp_2 + '`, method: "' + $this_emit.hi_1.p4_1 + '", query: {' + tmp_3 + '}, headers: {' + tmp_4 + '}' + (tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs) + '} as const)';
     };
   }
   function TypeScriptEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
-      var tmp = toSet($this_emit.li_1);
+      var tmp = toSet($this_emit.mi_1);
       var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit));
       Companion_getInstance_2();
-      var tmp_1 = toSet($this_emit.li_1);
+      var tmp_1 = toSet($this_emit.mi_1);
       var tmp_2 = joinToString(tmp_1, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_2(this$0));
-      var tmp_3 = toSet($this_emit.mi_1);
+      var tmp_3 = toSet($this_emit.ni_1);
       var tmp_4 = joinToString(tmp_3, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_3(this$0));
       Companion_getInstance_2();
-      var tmp_5 = toSet($this_emit.mi_1);
+      var tmp_5 = toSet($this_emit.ni_1);
       var tmp_6 = joinToString(tmp_5, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_4(this$0));
       Companion_getInstance_2();
       Companion_getInstance_2();
       Companion_getInstance_2();
-      var tmp_7 = Companion_getInstance_2().rj($this_emit.fi_1);
+      var tmp_7 = Companion_getInstance_2().sj($this_emit.gi_1);
       Companion_getInstance_2();
       Companion_getInstance_2();
-      return trimMargin('\n          |export namespace ' + $this_emit.fi_1 + ' {\n          |' + tmp_0 + '\n          |' + '  ' + 'export type Request = ' + tmp_2 + '\n          |' + tmp_4 + '\n          |' + '  ' + 'export type Response = ' + tmp_6 + '\n          |' + '  ' + 'export type Call = {\n          |' + '  ' + '  ' + tmp_7 + ':(request: Request) => Promise<Response>\n          |' + '  ' + '}\n          |' + '  ' + joinToString($this_emit.li_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit)) + '\n          |}\n          |\n        ');
+      return trimMargin('\n          |export namespace ' + $this_emit.gi_1 + ' {\n          |' + tmp_0 + '\n          |' + '  ' + 'export type Request = ' + tmp_2 + '\n          |' + tmp_4 + '\n          |' + '  ' + 'export type Response = ' + tmp_6 + '\n          |' + '  ' + 'export type Call = {\n          |' + '  ' + '  ' + tmp_7 + ':(request: Request) => Promise<Response>\n          |' + '  ' + '}\n          |' + '  ' + joinToString($this_emit.mi_1, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit)) + '\n          |}\n          |\n        ');
     };
   }
   function TypeScriptEmitter$emitType$lambda(this$0) {
@@ -2552,10 +2551,10 @@
       var tmp0_subject = $this_emitType;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emitType.sj_1;
+        tmp = $this_emitType.tj_1;
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = '${' + this$0.ei($this_emitType.ui_1) + '}';
+          tmp = '${' + this$0.fi($this_emitType.vi_1) + '}';
         } else {
           noWhenBranchMatchedException();
         }
@@ -2565,7 +2564,7 @@
   }
   function TypeScriptEmitter$emitMap$lambda(this$0) {
     return function (it) {
-      return '"' + this$0.dj(it.aj_1) + '": ' + this$0.dj(it.aj_1);
+      return '"' + this$0.ej(it.bj_1) + '": ' + this$0.ej(it.bj_1);
     };
   }
   function TypeScriptEmitter$emitPath$lambda(this$0) {
@@ -2578,10 +2577,10 @@
       var tmp0_subject = $this_emit;
       var tmp;
       if (tmp0_subject instanceof Literal) {
-        tmp = $this_emit.sj_1;
+        tmp = $this_emit.tj_1;
       } else {
         if (tmp0_subject instanceof Param) {
-          tmp = '${' + $this_emit.ti_1.ej_1 + '}';
+          tmp = '${' + $this_emit.ui_1.fj_1 + '}';
         } else {
           noWhenBranchMatchedException();
         }
@@ -2597,12 +2596,12 @@
     Companion_getInstance_2();
     Companion_getInstance_2();
     Companion_getInstance_2();
-    tmp.uk_1 = trimMargin('\n        |export namespace WirespecShared {\n        |' + '  ' + 'type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
+    tmp.vk_1 = trimMargin('\n        |export namespace WirespecShared {\n        |' + '  ' + 'type Method = "GET" | "PUT" | "POST" | "DELETE" | "OPTIONS" | "HEAD" | "PATCH" | "TRACE"\n        |' + '  ' + 'type Content<T> = { type:string, body:T }\n        |' + '  ' + 'export type Request<T> = { path:string, method: Method, query?: Record<string, any[]>, headers?: Record<string, any[]>, content?:Content<T> }\n        |' + '  ' + 'export type Response<T> = { status:number, headers?: Record<string, any[]>, content?:Content<T> }\n        |}\n    ');
   }
-  protoOf(TypeScriptEmitter).sh = function (ast) {
+  protoOf(TypeScriptEmitter).th = function (ast) {
     var tmp$ret$3;
     // Inline function 'kotlin.collections.map' call
-    var tmp1_map = protoOf(Emitter).sh.call(this, ast);
+    var tmp1_map = protoOf(Emitter).th.call(this, ast);
     var tmp$ret$2;
     // Inline function 'kotlin.collections.mapTo' call
     var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
@@ -2615,7 +2614,7 @@
       var result = item.j3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_2().nk(ast) ? this.uk_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_2().ok(ast) ? this.vk_1 : '') + '\n                    |' + result + '\n            ');
       tmp$ret$0 = toString(trimStart(isCharSequence(tmp0_trimStart) ? tmp0_trimStart : THROW_CCE()));
       tmp$ret$1 = to(name, tmp$ret$0);
       tmp0_mapTo.a(tmp$ret$1);
@@ -2624,57 +2623,57 @@
     tmp$ret$3 = tmp$ret$2;
     return tmp$ret$3;
   };
-  protoOf(TypeScriptEmitter).tj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.qh_1, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
-  };
-  protoOf(TypeScriptEmitter).xi = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.qh_1, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).uj = function (_this__u8e3s4) {
+    return this.vj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(TypeScriptEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.qh_1, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.wj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_0(_this__u8e3s4, this));
+  };
+  protoOf(TypeScriptEmitter).zi = function (_this__u8e3s4) {
+    return this.xj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).dj = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.qh_1, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).ej = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_2(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).ei = function (_this__u8e3s4) {
-    return this.vh(_this__u8e3s4, this.qh_1, TypeScriptEmitter$emit$lambda_3(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).fi = function (_this__u8e3s4) {
+    return this.wh(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).yj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.qh_1, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.qh_1, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).bk = function (_this__u8e3s4) {
+    return this.ck(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(TypeScriptEmitter).pj = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.qh_1, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(TypeScriptEmitter).qj = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_6(_this__u8e3s4));
   };
-  protoOf(TypeScriptEmitter).dk = function (_this__u8e3s4) {
-    return this.ek(_this__u8e3s4, this.qh_1, TypeScriptEmitter$emit$lambda_7(_this__u8e3s4, this));
+  protoOf(TypeScriptEmitter).ek = function (_this__u8e3s4) {
+    return this.fk(_this__u8e3s4, this.rh_1, TypeScriptEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
   function WirespecEmitter$emit$lambda($this_emit, this$0) {
     return function () {
-      return trimMargin('type ' + $this_emit.vi_1 + ' {\n            |' + this$0.xi($this_emit.wi_1) + '\n            |}\n            |');
+      return trimMargin('type ' + $this_emit.wi_1 + ' {\n            |' + this$0.yi($this_emit.xi_1) + '\n            |}\n            |');
     };
   }
   function WirespecEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      return this$0.yi(it);
+      return this$0.zi(it);
     };
   }
   function WirespecEmitter$emit$lambda_0($this_emit, this$0) {
     return function () {
-      return dropLast(joinToString($this_emit.zi_1, '\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda$lambda(this$0)), 1);
+      return dropLast(joinToString($this_emit.aj_1, '\n', VOID, VOID, VOID, VOID, WirespecEmitter$emit$lambda$lambda(this$0)), 1);
     };
   }
   function WirespecEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
       Companion_getInstance_2();
-      return '  ' + this$0.dj($this_emit.aj_1) + ($this_emit.cj_1 ? '?' : '') + ': ' + this$0.ei($this_emit.bj_1) + ',';
+      return '  ' + this$0.ej($this_emit.bj_1) + ($this_emit.dj_1 ? '?' : '') + ': ' + this$0.fi($this_emit.cj_1) + ',';
     };
   }
   function WirespecEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return $this_emit.ej_1;
+      return $this_emit.fj_1;
     };
   }
   function WirespecEmitter$emit$lambda_3($this_emit) {
@@ -2687,10 +2686,10 @@
         tmp = 'Any';
       } else {
         if (tmp0_subject instanceof Custom) {
-          tmp = $this_emit.ij_1;
+          tmp = $this_emit.jj_1;
         } else {
           if (tmp0_subject instanceof Primitive) {
-            var tmp1_subject = $this_emit.fj_1;
+            var tmp1_subject = $this_emit.gj_1;
             var tmp0 = tmp1_subject.q4_1;
             var tmp_0;
             switch (tmp0) {
@@ -2717,7 +2716,7 @@
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.WirespecEmitter.emit.<anonymous>.<anonymous>' call
-      tmp$ret$0 = $this_emit.ri() ? tmp0_let + '[]' : tmp0_let;
+      tmp$ret$0 = $this_emit.si() ? tmp0_let + '[]' : tmp0_let;
       tmp$ret$1 = tmp$ret$0;
       return tmp$ret$1;
     };
@@ -2725,17 +2724,17 @@
   function WirespecEmitter$emit$lambda_4($this_emit) {
     return function () {
       Companion_getInstance_2();
-      return 'enum ' + $this_emit.lj_1 + ' {\n' + '  ' + joinToString($this_emit.mj_1, ', ') + '\n}\n';
+      return 'enum ' + $this_emit.mj_1 + ' {\n' + '  ' + joinToString($this_emit.nj_1, ', ') + '\n}\n';
     };
   }
   function WirespecEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      return 'refined ' + $this_emit.nj_1 + ' ' + this$0.pj($this_emit.oj_1) + '\n';
+      return 'refined ' + $this_emit.oj_1 + ' ' + this$0.qj($this_emit.pj_1) + '\n';
     };
   }
   function WirespecEmitter$emit$lambda_6($this_emit) {
     return function () {
-      return '/' + dropLast(drop($this_emit.qj_1, 1), 1) + '/g';
+      return '/' + dropLast(drop($this_emit.rj_1, 1), 1) + '/g';
     };
   }
   function WirespecEmitter$emit$lambda_7() {
@@ -2745,32 +2744,32 @@
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
   }
-  protoOf(WirespecEmitter).tj = function (_this__u8e3s4) {
-    return this.uj(_this__u8e3s4, this.qh_1, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
-  };
-  protoOf(WirespecEmitter).xi = function (_this__u8e3s4) {
-    return this.vj(_this__u8e3s4, this.qh_1, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
+  protoOf(WirespecEmitter).uj = function (_this__u8e3s4) {
+    return this.vj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda(_this__u8e3s4, this));
   };
   protoOf(WirespecEmitter).yi = function (_this__u8e3s4) {
-    return this.wj(_this__u8e3s4, this.qh_1, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
+    return this.wj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_0(_this__u8e3s4, this));
   };
-  protoOf(WirespecEmitter).dj = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.qh_1, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
+  protoOf(WirespecEmitter).zi = function (_this__u8e3s4) {
+    return this.xj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
-  protoOf(WirespecEmitter).ei = function (_this__u8e3s4) {
-    return this.vh(_this__u8e3s4, this.qh_1, WirespecEmitter$emit$lambda_3(_this__u8e3s4));
+  protoOf(WirespecEmitter).ej = function (_this__u8e3s4) {
+    return this.yj(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_2(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).yj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.qh_1, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
+  protoOf(WirespecEmitter).fi = function (_this__u8e3s4) {
+    return this.wh(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_3(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).ak = function (_this__u8e3s4) {
-    return this.bk(_this__u8e3s4, this.qh_1, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
+  protoOf(WirespecEmitter).zj = function (_this__u8e3s4) {
+    return this.ak(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_4(_this__u8e3s4));
   };
-  protoOf(WirespecEmitter).pj = function (_this__u8e3s4) {
-    return this.ck(_this__u8e3s4, this.qh_1, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
+  protoOf(WirespecEmitter).bk = function (_this__u8e3s4) {
+    return this.ck(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_5(_this__u8e3s4, this));
   };
-  protoOf(WirespecEmitter).dk = function (_this__u8e3s4) {
-    return this.ek(_this__u8e3s4, this.qh_1, WirespecEmitter$emit$lambda_7);
+  protoOf(WirespecEmitter).qj = function (_this__u8e3s4) {
+    return this.dk(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_6(_this__u8e3s4));
+  };
+  protoOf(WirespecEmitter).ek = function (_this__u8e3s4) {
+    return this.fk(_this__u8e3s4, this.rh_1, WirespecEmitter$emit$lambda_7);
   };
   function get_DEFAULT_PACKAGE_NAME() {
     return DEFAULT_PACKAGE_NAME;
@@ -2778,9 +2777,9 @@
   var DEFAULT_PACKAGE_NAME;
   function Companion_1() {
     Companion_instance_1 = this;
-    this.pi_1 = '  ';
+    this.qi_1 = '  ';
   }
-  protoOf(Companion_1).qi = function (_this__u8e3s4) {
+  protoOf(Companion_1).ri = function (_this__u8e3s4) {
     var tmp$ret$6;
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
@@ -2814,7 +2813,7 @@
     tmp$ret$6 = tmp;
     return tmp$ret$6;
   };
-  protoOf(Companion_1).rj = function (_this__u8e3s4) {
+  protoOf(Companion_1).sj = function (_this__u8e3s4) {
     var tmp$ret$6;
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
@@ -2848,7 +2847,7 @@
     tmp$ret$6 = tmp;
     return tmp$ret$6;
   };
-  protoOf(Companion_1).nk = function (_this__u8e3s4) {
+  protoOf(Companion_1).ok = function (_this__u8e3s4) {
     var tmp$ret$0;
     $l$block_0: {
       // Inline function 'kotlin.collections.any' call
@@ -2877,12 +2876,12 @@
     }
     return tmp$ret$0;
   };
-  protoOf(Companion_1).vk = function (_this__u8e3s4, content) {
+  protoOf(Companion_1).wk = function (_this__u8e3s4, content) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.map' call
     var tmp$ret$1;
     // Inline function 'kotlin.collections.filterIsInstance' call
-    var tmp1_filterIsInstance = _this__u8e3s4.hi_1;
+    var tmp1_filterIsInstance = _this__u8e3s4.ii_1;
     var tmp$ret$0;
     // Inline function 'kotlin.collections.filterIsInstanceTo' call
     var tmp0_filterIsInstanceTo = ArrayList_init_$Create$();
@@ -2904,18 +2903,18 @@
       var item = tmp0_iterator_0.e();
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.emit.common.Companion.joinParameters.<anonymous>' call
-      tmp$ret$2 = new Field(item.ti_1, item.ui_1, false);
+      tmp$ret$2 = new Field(item.ui_1, item.vi_1, false);
       tmp2_mapTo.a(tmp$ret$2);
     }
     tmp$ret$3 = tmp2_mapTo;
     tmp$ret$4 = tmp$ret$3;
     var pathField = tmp$ret$4;
-    var parameters = plus(plus(plus(pathField, _this__u8e3s4.ii_1), _this__u8e3s4.ji_1), _this__u8e3s4.ki_1);
+    var parameters = plus(plus(plus(pathField, _this__u8e3s4.ji_1), _this__u8e3s4.ki_1), _this__u8e3s4.li_1);
     var tmp0_safe_receiver = content;
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1;
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zh_1;
     return filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
   };
-  protoOf(Companion_1).fk = function (_this__u8e3s4) {
+  protoOf(Companion_1).gk = function (_this__u8e3s4) {
     return !(toIntOrNull(_this__u8e3s4) == null);
   };
   var Companion_instance_1;
@@ -2930,10 +2929,10 @@
   function Emitter(logger, split) {
     Companion_getInstance_2();
     split = split === VOID ? false : split;
-    this.qh_1 = logger;
-    this.rh_1 = split;
+    this.rh_1 = logger;
+    this.sh_1 = split;
   }
-  protoOf(Emitter).sh = function (ast) {
+  protoOf(Emitter).th = function (ast) {
     var tmp$ret$4;
     // Inline function 'kotlin.run' call
     var tmp$ret$2;
@@ -2946,20 +2945,20 @@
       var item = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
-      this.qh_1.kh('Emitting Node ' + this);
+      this.rh_1.lh('Emitting Node ' + this);
       var tmp0_subject = item;
       var tmp;
       if (tmp0_subject instanceof Type_0) {
-        tmp = to(item.vi_1, this.tj(item));
+        tmp = to(item.wi_1, this.uj(item));
       } else {
         if (tmp0_subject instanceof Endpoint) {
-          tmp = to(item.fi_1, this.dk(item));
+          tmp = to(item.gi_1, this.ek(item));
         } else {
           if (tmp0_subject instanceof Enum_0) {
-            tmp = to(item.lj_1, this.yj(item));
+            tmp = to(item.mj_1, this.zj(item));
           } else {
             if (tmp0_subject instanceof Refined) {
-              tmp = to(item.nj_1, this.ak(item));
+              tmp = to(item.oj_1, this.bk(item));
             } else {
               noWhenBranchMatchedException();
             }
@@ -2976,7 +2975,7 @@
     var tmp$ret$3;
     // Inline function 'community.flock.wirespec.compiler.core.emit.common.Emitter.emit.<anonymous>' call
     var tmp_0;
-    if (this.rh_1) {
+    if (this.sh_1) {
       tmp_0 = tmp1_run;
     } else {
       tmp_0 = listOf_0(to('NoName', joinToString(tmp1_run, '\n', VOID, VOID, VOID, VOID, Emitter$emit$lambda)));
@@ -2993,16 +2992,12 @@
   }
   function TypeDefinitionEmitterLogger() {
   }
-  function StartingException() {
-    NullTokenException.call(this, 'Starting Token', new Coordinates());
-    captureStack(this, StartingException);
-  }
   function NextException(coordinates) {
     NullTokenException.call(this, 'Next Token', coordinates);
     captureStack(this, NextException);
   }
   function WrongTokenException(expected, actual) {
-    ParserException.call(this, actual.bl_1, '' + expected.fc() + ' expected, not: ' + getKClassFromExpression(actual.zk_1).fc() + ' at line ' + actual.bl_1.cl_1 + ' and position ' + (actual.bl_1.dl_1 - actual.al_1.length | 0));
+    ParserException.call(this, actual.cl_1, '' + expected.fc() + ' expected, not: ' + getKClassFromExpression(actual.al_1).fc() + ' at line ' + actual.cl_1.dl_1 + ' and position ' + (actual.cl_1.el_1 - actual.bl_1.length | 0));
     captureStack(this, WrongTokenException);
   }
   function NullTokenException(message, coordinates) {
@@ -3020,32 +3015,48 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.fl_1 = coordinates;
+    this.gl_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
-    var tmp$ret$2;
+    var tmp$ret$4;
+    // Inline function 'arrow.core.NonEmptyList.map' call
+    var tmp$ret$0;
+    // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
+    var tmp2__anonymous__z9zvc9 = _this__u8e3s4.ug_1;
+    var tmp0_subject = tmp2__anonymous__z9zvc9.al_1;
+    var tmp;
+    if (tmp0_subject instanceof CustomRegex) {
+      tmp = tmp2__anonymous__z9zvc9.hl(VOID, '"' + dropLast(drop(tmp2__anonymous__z9zvc9.bl_1, 1), 2) + '"');
+    } else {
+      tmp = tmp2__anonymous__z9zvc9;
+    }
+    tmp$ret$0 = tmp;
+    var tmp_0 = tmp$ret$0;
+    var tmp$ret$3;
     // Inline function 'kotlin.collections.map' call
-    var tmp$ret$1;
+    var tmp1_map = _this__u8e3s4.vg_1;
+    var tmp$ret$2;
     // Inline function 'kotlin.collections.mapTo' call
-    var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(_this__u8e3s4, 10));
-    var tmp0_iterator = _this__u8e3s4.c();
+    var tmp0_mapTo = ArrayList_init_$Create$_0(collectionSizeOrDefault(tmp1_map, 10));
+    var tmp0_iterator = tmp1_map.c();
     while (tmp0_iterator.d()) {
       var item = tmp0_iterator.e();
-      var tmp$ret$0;
+      var tmp$ret$1;
       // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
-      var tmp0_subject = item.zk_1;
-      var tmp;
-      if (tmp0_subject instanceof CustomRegex) {
-        tmp = item.gl(VOID, '"' + dropLast(drop(item.al_1, 1), 2) + '"');
+      var tmp0_subject_0 = item.al_1;
+      var tmp_1;
+      if (tmp0_subject_0 instanceof CustomRegex) {
+        tmp_1 = item.hl(VOID, '"' + dropLast(drop(item.bl_1, 1), 2) + '"');
       } else {
-        tmp = item;
+        tmp_1 = item;
       }
-      tmp$ret$0 = tmp;
-      tmp0_mapTo.a(tmp$ret$0);
+      tmp$ret$1 = tmp_1;
+      tmp0_mapTo.a(tmp$ret$1);
     }
-    tmp$ret$1 = tmp0_mapTo;
-    tmp$ret$2 = tmp$ret$1;
-    return tmp$ret$2;
+    tmp$ret$2 = tmp0_mapTo;
+    tmp$ret$3 = tmp$ret$2;
+    tmp$ret$4 = new NonEmptyList(tmp_0, tmp$ret$3);
+    return tmp$ret$4;
   }
   var Type_String_instance;
   var Type_Integer_instance;
@@ -3076,29 +3087,29 @@
   }
   function Any(isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.hl_1 = isIterable;
-    this.il_1 = isMap;
+    this.il_1 = isIterable;
+    this.jl_1 = isMap;
   }
-  protoOf(Any).ri = function () {
-    return this.hl_1;
-  };
-  protoOf(Any).mk = function () {
+  protoOf(Any).si = function () {
     return this.il_1;
   };
-  protoOf(Any).jl = function (isIterable, isMap) {
+  protoOf(Any).nk = function () {
+    return this.jl_1;
+  };
+  protoOf(Any).kl = function (isIterable, isMap) {
     return new Any(isIterable, isMap);
   };
-  protoOf(Any).kl = function (isIterable, isMap, $super) {
-    isIterable = isIterable === VOID ? this.hl_1 : isIterable;
-    isMap = isMap === VOID ? this.il_1 : isMap;
-    return $super === VOID ? this.jl(isIterable, isMap) : $super.jl.call(this, isIterable, isMap);
+  protoOf(Any).ll = function (isIterable, isMap, $super) {
+    isIterable = isIterable === VOID ? this.il_1 : isIterable;
+    isMap = isMap === VOID ? this.jl_1 : isMap;
+    return $super === VOID ? this.kl(isIterable, isMap) : $super.kl.call(this, isIterable, isMap);
   };
   protoOf(Any).toString = function () {
-    return 'Any(isIterable=' + this.hl_1 + ', isMap=' + this.il_1 + ')';
+    return 'Any(isIterable=' + this.il_1 + ', isMap=' + this.jl_1 + ')';
   };
   protoOf(Any).hashCode = function () {
-    var result = this.hl_1 | 0;
-    result = imul(result, 31) + (this.il_1 | 0) | 0;
+    var result = this.il_1 | 0;
+    result = imul(result, 31) + (this.jl_1 | 0) | 0;
     return result;
   };
   protoOf(Any).equals = function (other) {
@@ -3107,40 +3118,40 @@
     if (!(other instanceof Any))
       return false;
     var tmp0_other_with_cast = other instanceof Any ? other : THROW_CCE();
-    if (!(this.hl_1 === tmp0_other_with_cast.hl_1))
-      return false;
     if (!(this.il_1 === tmp0_other_with_cast.il_1))
       return false;
+    if (!(this.jl_1 === tmp0_other_with_cast.jl_1))
+      return false;
     return true;
   };
   function Custom(value, isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.ij_1 = value;
-    this.jj_1 = isIterable;
-    this.kj_1 = isMap;
+    this.jj_1 = value;
+    this.kj_1 = isIterable;
+    this.lj_1 = isMap;
   }
-  protoOf(Custom).ri = function () {
-    return this.jj_1;
-  };
-  protoOf(Custom).mk = function () {
+  protoOf(Custom).si = function () {
     return this.kj_1;
   };
-  protoOf(Custom).ll = function (value, isIterable, isMap) {
+  protoOf(Custom).nk = function () {
+    return this.lj_1;
+  };
+  protoOf(Custom).ml = function (value, isIterable, isMap) {
     return new Custom(value, isIterable, isMap);
   };
-  protoOf(Custom).ml = function (value, isIterable, isMap, $super) {
-    value = value === VOID ? this.ij_1 : value;
-    isIterable = isIterable === VOID ? this.jj_1 : isIterable;
-    isMap = isMap === VOID ? this.kj_1 : isMap;
-    return $super === VOID ? this.ll(value, isIterable, isMap) : $super.ll.call(this, value, isIterable, isMap);
+  protoOf(Custom).nl = function (value, isIterable, isMap, $super) {
+    value = value === VOID ? this.jj_1 : value;
+    isIterable = isIterable === VOID ? this.kj_1 : isIterable;
+    isMap = isMap === VOID ? this.lj_1 : isMap;
+    return $super === VOID ? this.ml(value, isIterable, isMap) : $super.ml.call(this, value, isIterable, isMap);
   };
   protoOf(Custom).toString = function () {
-    return 'Custom(value=' + this.ij_1 + ', isIterable=' + this.jj_1 + ', isMap=' + this.kj_1 + ')';
+    return 'Custom(value=' + this.jj_1 + ', isIterable=' + this.kj_1 + ', isMap=' + this.lj_1 + ')';
   };
   protoOf(Custom).hashCode = function () {
-    var result = getStringHashCode(this.ij_1);
-    result = imul(result, 31) + (this.jj_1 | 0) | 0;
+    var result = getStringHashCode(this.jj_1);
     result = imul(result, 31) + (this.kj_1 | 0) | 0;
+    result = imul(result, 31) + (this.lj_1 | 0) | 0;
     return result;
   };
   protoOf(Custom).equals = function (other) {
@@ -3149,42 +3160,42 @@
     if (!(other instanceof Custom))
       return false;
     var tmp0_other_with_cast = other instanceof Custom ? other : THROW_CCE();
-    if (!(this.ij_1 === tmp0_other_with_cast.ij_1))
-      return false;
     if (!(this.jj_1 === tmp0_other_with_cast.jj_1))
       return false;
     if (!(this.kj_1 === tmp0_other_with_cast.kj_1))
       return false;
+    if (!(this.lj_1 === tmp0_other_with_cast.lj_1))
+      return false;
     return true;
   };
   function Primitive(type, isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.fj_1 = type;
-    this.gj_1 = isIterable;
-    this.hj_1 = isMap;
+    this.gj_1 = type;
+    this.hj_1 = isIterable;
+    this.ij_1 = isMap;
   }
-  protoOf(Primitive).ri = function () {
-    return this.gj_1;
-  };
-  protoOf(Primitive).mk = function () {
+  protoOf(Primitive).si = function () {
     return this.hj_1;
   };
-  protoOf(Primitive).nl = function (type, isIterable, isMap) {
+  protoOf(Primitive).nk = function () {
+    return this.ij_1;
+  };
+  protoOf(Primitive).ol = function (type, isIterable, isMap) {
     return new Primitive(type, isIterable, isMap);
   };
-  protoOf(Primitive).ol = function (type, isIterable, isMap, $super) {
-    type = type === VOID ? this.fj_1 : type;
-    isIterable = isIterable === VOID ? this.gj_1 : isIterable;
-    isMap = isMap === VOID ? this.hj_1 : isMap;
-    return $super === VOID ? this.nl(type, isIterable, isMap) : $super.nl.call(this, type, isIterable, isMap);
+  protoOf(Primitive).pl = function (type, isIterable, isMap, $super) {
+    type = type === VOID ? this.gj_1 : type;
+    isIterable = isIterable === VOID ? this.hj_1 : isIterable;
+    isMap = isMap === VOID ? this.ij_1 : isMap;
+    return $super === VOID ? this.ol(type, isIterable, isMap) : $super.ol.call(this, type, isIterable, isMap);
   };
   protoOf(Primitive).toString = function () {
-    return 'Primitive(type=' + this.fj_1 + ', isIterable=' + this.gj_1 + ', isMap=' + this.hj_1 + ')';
+    return 'Primitive(type=' + this.gj_1 + ', isIterable=' + this.hj_1 + ', isMap=' + this.ij_1 + ')';
   };
   protoOf(Primitive).hashCode = function () {
-    var result = this.fj_1.hashCode();
-    result = imul(result, 31) + (this.gj_1 | 0) | 0;
+    var result = this.gj_1.hashCode();
     result = imul(result, 31) + (this.hj_1 | 0) | 0;
+    result = imul(result, 31) + (this.ij_1 | 0) | 0;
     return result;
   };
   protoOf(Primitive).equals = function (other) {
@@ -3193,22 +3204,22 @@
     if (!(other instanceof Primitive))
       return false;
     var tmp0_other_with_cast = other instanceof Primitive ? other : THROW_CCE();
-    if (!this.fj_1.equals(tmp0_other_with_cast.fj_1))
-      return false;
-    if (!(this.gj_1 === tmp0_other_with_cast.gj_1))
+    if (!this.gj_1.equals(tmp0_other_with_cast.gj_1))
       return false;
     if (!(this.hj_1 === tmp0_other_with_cast.hj_1))
       return false;
+    if (!(this.ij_1 === tmp0_other_with_cast.ij_1))
+      return false;
     return true;
   };
   function Identifier(value) {
-    this.ej_1 = value;
+    this.fj_1 = value;
   }
   protoOf(Identifier).toString = function () {
-    return 'Identifier(value=' + this.ej_1 + ')';
+    return 'Identifier(value=' + this.fj_1 + ')';
   };
   protoOf(Identifier).hashCode = function () {
-    return getStringHashCode(this.ej_1);
+    return getStringHashCode(this.fj_1);
   };
   protoOf(Identifier).equals = function (other) {
     if (this === other)
@@ -3216,22 +3227,22 @@
     if (!(other instanceof Identifier))
       return false;
     var tmp0_other_with_cast = other instanceof Identifier ? other : THROW_CCE();
-    if (!(this.ej_1 === tmp0_other_with_cast.ej_1))
+    if (!(this.fj_1 === tmp0_other_with_cast.fj_1))
       return false;
     return true;
   };
   function Field(identifier, reference, isNullable) {
-    this.aj_1 = identifier;
-    this.bj_1 = reference;
-    this.cj_1 = isNullable;
+    this.bj_1 = identifier;
+    this.cj_1 = reference;
+    this.dj_1 = isNullable;
   }
   protoOf(Field).toString = function () {
-    return 'Field(identifier=' + this.aj_1 + ', reference=' + this.bj_1 + ', isNullable=' + this.cj_1 + ')';
+    return 'Field(identifier=' + this.bj_1 + ', reference=' + this.cj_1 + ', isNullable=' + this.dj_1 + ')';
   };
   protoOf(Field).hashCode = function () {
-    var result = this.aj_1.hashCode();
-    result = imul(result, 31) + hashCode(this.bj_1) | 0;
-    result = imul(result, 31) + (this.cj_1 | 0) | 0;
+    var result = this.bj_1.hashCode();
+    result = imul(result, 31) + hashCode(this.cj_1) | 0;
+    result = imul(result, 31) + (this.dj_1 | 0) | 0;
     return result;
   };
   protoOf(Field).equals = function (other) {
@@ -3240,22 +3251,22 @@
     if (!(other instanceof Field))
       return false;
     var tmp0_other_with_cast = other instanceof Field ? other : THROW_CCE();
-    if (!this.aj_1.equals(tmp0_other_with_cast.aj_1))
+    if (!this.bj_1.equals(tmp0_other_with_cast.bj_1))
       return false;
-    if (!equals(this.bj_1, tmp0_other_with_cast.bj_1))
+    if (!equals(this.cj_1, tmp0_other_with_cast.cj_1))
       return false;
-    if (!(this.cj_1 === tmp0_other_with_cast.cj_1))
+    if (!(this.dj_1 === tmp0_other_with_cast.dj_1))
       return false;
     return true;
   };
   function Shape(value) {
-    this.zi_1 = value;
+    this.aj_1 = value;
   }
   protoOf(Shape).toString = function () {
-    return 'Shape(value=' + this.zi_1 + ')';
+    return 'Shape(value=' + this.aj_1 + ')';
   };
   protoOf(Shape).hashCode = function () {
-    return hashCode(this.zi_1);
+    return hashCode(this.aj_1);
   };
   protoOf(Shape).equals = function (other) {
     if (this === other)
@@ -3263,20 +3274,20 @@
     if (!(other instanceof Shape))
       return false;
     var tmp0_other_with_cast = other instanceof Shape ? other : THROW_CCE();
-    if (!equals(this.zi_1, tmp0_other_with_cast.zi_1))
+    if (!equals(this.aj_1, tmp0_other_with_cast.aj_1))
       return false;
     return true;
   };
   function Type_0(name, shape) {
-    this.vi_1 = name;
-    this.wi_1 = shape;
+    this.wi_1 = name;
+    this.xi_1 = shape;
   }
   protoOf(Type_0).toString = function () {
-    return 'Type(name=' + this.vi_1 + ', shape=' + this.wi_1 + ')';
+    return 'Type(name=' + this.wi_1 + ', shape=' + this.xi_1 + ')';
   };
   protoOf(Type_0).hashCode = function () {
-    var result = getStringHashCode(this.vi_1);
-    result = imul(result, 31) + this.wi_1.hashCode() | 0;
+    var result = getStringHashCode(this.wi_1);
+    result = imul(result, 31) + this.xi_1.hashCode() | 0;
     return result;
   };
   protoOf(Type_0).equals = function (other) {
@@ -3285,9 +3296,9 @@
     if (!(other instanceof Type_0))
       return false;
     var tmp0_other_with_cast = other instanceof Type_0 ? other : THROW_CCE();
-    if (!(this.vi_1 === tmp0_other_with_cast.vi_1))
+    if (!(this.wi_1 === tmp0_other_with_cast.wi_1))
       return false;
-    if (!this.wi_1.equals(tmp0_other_with_cast.wi_1))
+    if (!this.xi_1.equals(tmp0_other_with_cast.xi_1))
       return false;
     return true;
   };
@@ -3317,13 +3328,13 @@
     Method_TRACE_instance = new Method('TRACE', 7);
   }
   function Literal(value) {
-    this.sj_1 = value;
+    this.tj_1 = value;
   }
   protoOf(Literal).toString = function () {
-    return 'Literal(value=' + this.sj_1 + ')';
+    return 'Literal(value=' + this.tj_1 + ')';
   };
   protoOf(Literal).hashCode = function () {
-    return getStringHashCode(this.sj_1);
+    return getStringHashCode(this.tj_1);
   };
   protoOf(Literal).equals = function (other) {
     if (this === other)
@@ -3331,20 +3342,20 @@
     if (!(other instanceof Literal))
       return false;
     var tmp0_other_with_cast = other instanceof Literal ? other : THROW_CCE();
-    if (!(this.sj_1 === tmp0_other_with_cast.sj_1))
+    if (!(this.tj_1 === tmp0_other_with_cast.tj_1))
       return false;
     return true;
   };
   function Param(identifier, reference) {
-    this.ti_1 = identifier;
-    this.ui_1 = reference;
+    this.ui_1 = identifier;
+    this.vi_1 = reference;
   }
   protoOf(Param).toString = function () {
-    return 'Param(identifier=' + this.ti_1 + ', reference=' + this.ui_1 + ')';
+    return 'Param(identifier=' + this.ui_1 + ', reference=' + this.vi_1 + ')';
   };
   protoOf(Param).hashCode = function () {
-    var result = this.ti_1.hashCode();
-    result = imul(result, 31) + hashCode(this.ui_1) | 0;
+    var result = this.ui_1.hashCode();
+    result = imul(result, 31) + hashCode(this.vi_1) | 0;
     return result;
   };
   protoOf(Param).equals = function (other) {
@@ -3353,9 +3364,9 @@
     if (!(other instanceof Param))
       return false;
     var tmp0_other_with_cast = other instanceof Param ? other : THROW_CCE();
-    if (!this.ti_1.equals(tmp0_other_with_cast.ti_1))
+    if (!this.ui_1.equals(tmp0_other_with_cast.ui_1))
       return false;
-    if (!equals(this.ui_1, tmp0_other_with_cast.ui_1))
+    if (!equals(this.vi_1, tmp0_other_with_cast.vi_1))
       return false;
     return true;
   };
@@ -3363,13 +3374,13 @@
     Enum.call(this, name, ordinal);
   }
   function Request(content) {
-    this.wh_1 = content;
+    this.xh_1 = content;
   }
   protoOf(Request).toString = function () {
-    return 'Request(content=' + this.wh_1 + ')';
+    return 'Request(content=' + this.xh_1 + ')';
   };
   protoOf(Request).hashCode = function () {
-    return this.wh_1 == null ? 0 : this.wh_1.hashCode();
+    return this.xh_1 == null ? 0 : this.xh_1.hashCode();
   };
   protoOf(Request).equals = function (other) {
     if (this === other)
@@ -3377,20 +3388,20 @@
     if (!(other instanceof Request))
       return false;
     var tmp0_other_with_cast = other instanceof Request ? other : THROW_CCE();
-    if (!equals(this.wh_1, tmp0_other_with_cast.wh_1))
+    if (!equals(this.xh_1, tmp0_other_with_cast.xh_1))
       return false;
     return true;
   };
   function Response(status, content) {
-    this.ni_1 = status;
-    this.oi_1 = content;
+    this.oi_1 = status;
+    this.pi_1 = content;
   }
   protoOf(Response).toString = function () {
-    return 'Response(status=' + this.ni_1 + ', content=' + this.oi_1 + ')';
+    return 'Response(status=' + this.oi_1 + ', content=' + this.pi_1 + ')';
   };
   protoOf(Response).hashCode = function () {
-    var result = getStringHashCode(this.ni_1);
-    result = imul(result, 31) + (this.oi_1 == null ? 0 : this.oi_1.hashCode()) | 0;
+    var result = getStringHashCode(this.oi_1);
+    result = imul(result, 31) + (this.pi_1 == null ? 0 : this.pi_1.hashCode()) | 0;
     return result;
   };
   protoOf(Response).equals = function (other) {
@@ -3399,24 +3410,24 @@
     if (!(other instanceof Response))
       return false;
     var tmp0_other_with_cast = other instanceof Response ? other : THROW_CCE();
-    if (!(this.ni_1 === tmp0_other_with_cast.ni_1))
+    if (!(this.oi_1 === tmp0_other_with_cast.oi_1))
       return false;
-    if (!equals(this.oi_1, tmp0_other_with_cast.oi_1))
+    if (!equals(this.pi_1, tmp0_other_with_cast.pi_1))
       return false;
     return true;
   };
   function Content(type, reference, isNullable) {
-    this.xh_1 = type;
-    this.yh_1 = reference;
-    this.zh_1 = isNullable;
+    this.yh_1 = type;
+    this.zh_1 = reference;
+    this.ai_1 = isNullable;
   }
   protoOf(Content).toString = function () {
-    return 'Content(type=' + this.xh_1 + ', reference=' + this.yh_1 + ', isNullable=' + this.zh_1 + ')';
+    return 'Content(type=' + this.yh_1 + ', reference=' + this.zh_1 + ', isNullable=' + this.ai_1 + ')';
   };
   protoOf(Content).hashCode = function () {
-    var result = getStringHashCode(this.xh_1);
-    result = imul(result, 31) + hashCode(this.yh_1) | 0;
-    result = imul(result, 31) + (this.zh_1 | 0) | 0;
+    var result = getStringHashCode(this.yh_1);
+    result = imul(result, 31) + hashCode(this.zh_1) | 0;
+    result = imul(result, 31) + (this.ai_1 | 0) | 0;
     return result;
   };
   protoOf(Content).equals = function (other) {
@@ -3425,11 +3436,11 @@
     if (!(other instanceof Content))
       return false;
     var tmp0_other_with_cast = other instanceof Content ? other : THROW_CCE();
-    if (!(this.xh_1 === tmp0_other_with_cast.xh_1))
+    if (!(this.yh_1 === tmp0_other_with_cast.yh_1))
       return false;
-    if (!equals(this.yh_1, tmp0_other_with_cast.yh_1))
+    if (!equals(this.zh_1, tmp0_other_with_cast.zh_1))
       return false;
-    if (!(this.zh_1 === tmp0_other_with_cast.zh_1))
+    if (!(this.ai_1 === tmp0_other_with_cast.ai_1))
       return false;
     return true;
   };
@@ -3466,27 +3477,27 @@
     return Method_TRACE_instance;
   }
   function Endpoint(name, method, path, query, headers, cookies, requests, responses) {
-    this.fi_1 = name;
-    this.gi_1 = method;
-    this.hi_1 = path;
-    this.ii_1 = query;
-    this.ji_1 = headers;
-    this.ki_1 = cookies;
-    this.li_1 = requests;
-    this.mi_1 = responses;
+    this.gi_1 = name;
+    this.hi_1 = method;
+    this.ii_1 = path;
+    this.ji_1 = query;
+    this.ki_1 = headers;
+    this.li_1 = cookies;
+    this.mi_1 = requests;
+    this.ni_1 = responses;
   }
   protoOf(Endpoint).toString = function () {
-    return 'Endpoint(name=' + this.fi_1 + ', method=' + this.gi_1 + ', path=' + this.hi_1 + ', query=' + this.ii_1 + ', headers=' + this.ji_1 + ', cookies=' + this.ki_1 + ', requests=' + this.li_1 + ', responses=' + this.mi_1 + ')';
+    return 'Endpoint(name=' + this.gi_1 + ', method=' + this.hi_1 + ', path=' + this.ii_1 + ', query=' + this.ji_1 + ', headers=' + this.ki_1 + ', cookies=' + this.li_1 + ', requests=' + this.mi_1 + ', responses=' + this.ni_1 + ')';
   };
   protoOf(Endpoint).hashCode = function () {
-    var result = getStringHashCode(this.fi_1);
-    result = imul(result, 31) + this.gi_1.hashCode() | 0;
-    result = imul(result, 31) + hashCode(this.hi_1) | 0;
+    var result = getStringHashCode(this.gi_1);
+    result = imul(result, 31) + this.hi_1.hashCode() | 0;
     result = imul(result, 31) + hashCode(this.ii_1) | 0;
     result = imul(result, 31) + hashCode(this.ji_1) | 0;
     result = imul(result, 31) + hashCode(this.ki_1) | 0;
     result = imul(result, 31) + hashCode(this.li_1) | 0;
     result = imul(result, 31) + hashCode(this.mi_1) | 0;
+    result = imul(result, 31) + hashCode(this.ni_1) | 0;
     return result;
   };
   protoOf(Endpoint).equals = function (other) {
@@ -3495,11 +3506,9 @@
     if (!(other instanceof Endpoint))
       return false;
     var tmp0_other_with_cast = other instanceof Endpoint ? other : THROW_CCE();
-    if (!(this.fi_1 === tmp0_other_with_cast.fi_1))
-      return false;
-    if (!this.gi_1.equals(tmp0_other_with_cast.gi_1))
+    if (!(this.gi_1 === tmp0_other_with_cast.gi_1))
       return false;
-    if (!equals(this.hi_1, tmp0_other_with_cast.hi_1))
+    if (!this.hi_1.equals(tmp0_other_with_cast.hi_1))
       return false;
     if (!equals(this.ii_1, tmp0_other_with_cast.ii_1))
       return false;
@@ -3511,18 +3520,20 @@
       return false;
     if (!equals(this.mi_1, tmp0_other_with_cast.mi_1))
       return false;
+    if (!equals(this.ni_1, tmp0_other_with_cast.ni_1))
+      return false;
     return true;
   };
   function Enum_0(name, entries) {
-    this.lj_1 = name;
-    this.mj_1 = entries;
+    this.mj_1 = name;
+    this.nj_1 = entries;
   }
   protoOf(Enum_0).toString = function () {
-    return 'Enum(name=' + this.lj_1 + ', entries=' + this.mj_1 + ')';
+    return 'Enum(name=' + this.mj_1 + ', entries=' + this.nj_1 + ')';
   };
   protoOf(Enum_0).hashCode = function () {
-    var result = getStringHashCode(this.lj_1);
-    result = imul(result, 31) + hashCode(this.mj_1) | 0;
+    var result = getStringHashCode(this.mj_1);
+    result = imul(result, 31) + hashCode(this.nj_1) | 0;
     return result;
   };
   protoOf(Enum_0).equals = function (other) {
@@ -3531,20 +3542,20 @@
     if (!(other instanceof Enum_0))
       return false;
     var tmp0_other_with_cast = other instanceof Enum_0 ? other : THROW_CCE();
-    if (!(this.lj_1 === tmp0_other_with_cast.lj_1))
+    if (!(this.mj_1 === tmp0_other_with_cast.mj_1))
       return false;
-    if (!equals(this.mj_1, tmp0_other_with_cast.mj_1))
+    if (!equals(this.nj_1, tmp0_other_with_cast.nj_1))
       return false;
     return true;
   };
   function Validator(value) {
-    this.qj_1 = value;
+    this.rj_1 = value;
   }
   protoOf(Validator).toString = function () {
-    return 'Validator(value=' + this.qj_1 + ')';
+    return 'Validator(value=' + this.rj_1 + ')';
   };
   protoOf(Validator).hashCode = function () {
-    return getStringHashCode(this.qj_1);
+    return getStringHashCode(this.rj_1);
   };
   protoOf(Validator).equals = function (other) {
     if (this === other)
@@ -3552,20 +3563,20 @@
     if (!(other instanceof Validator))
       return false;
     var tmp0_other_with_cast = other instanceof Validator ? other : THROW_CCE();
-    if (!(this.qj_1 === tmp0_other_with_cast.qj_1))
+    if (!(this.rj_1 === tmp0_other_with_cast.rj_1))
       return false;
     return true;
   };
   function Refined(name, validator) {
-    this.nj_1 = name;
-    this.oj_1 = validator;
+    this.oj_1 = name;
+    this.pj_1 = validator;
   }
   protoOf(Refined).toString = function () {
-    return 'Refined(name=' + this.nj_1 + ', validator=' + this.oj_1 + ')';
+    return 'Refined(name=' + this.oj_1 + ', validator=' + this.pj_1 + ')';
   };
   protoOf(Refined).hashCode = function () {
-    var result = getStringHashCode(this.nj_1);
-    result = imul(result, 31) + this.oj_1.hashCode() | 0;
+    var result = getStringHashCode(this.oj_1);
+    result = imul(result, 31) + this.pj_1.hashCode() | 0;
     return result;
   };
   protoOf(Refined).equals = function (other) {
@@ -3574,9 +3585,9 @@
     if (!(other instanceof Refined))
       return false;
     var tmp0_other_with_cast = other instanceof Refined ? other : THROW_CCE();
-    if (!(this.nj_1 === tmp0_other_with_cast.nj_1))
+    if (!(this.oj_1 === tmp0_other_with_cast.oj_1))
       return false;
-    if (!this.oj_1.equals(tmp0_other_with_cast.oj_1))
+    if (!this.pj_1.equals(tmp0_other_with_cast.pj_1))
       return false;
     return true;
   };
@@ -3619,7 +3630,7 @@
         var item = tmp0_iterator.e();
         var tmp$ret$2;
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parse.<anonymous>.<anonymous>' call
-        tmp$ret$2 = raise.eh(item);
+        tmp$ret$2 = raise.fh(item);
         tmp1_mapTo.a(tmp$ret$2);
       }
       tmp$ret$3 = tmp1_mapTo;
@@ -3627,7 +3638,7 @@
       tmp$ret$5 = tmp$ret$4;
       tmp$ret$6 = tmp$ret$5;
       var res = tmp$ret$6;
-      raise.bh();
+      raise.ch();
       var tmp$ret$7;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$7 = new Right(res);
@@ -3636,7 +3647,7 @@
       var tmp_0;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$8;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -3645,7 +3656,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -3675,37 +3686,37 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>' call
-      log(_this__u8e3s4.rl_1, $this);
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      log(_this__u8e3s4.sl_1, $this);
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (tmp0_subject instanceof WsTypeDef) {
-        tmp_0 = raise.eh(parseTypeDeclaration(_this__u8e3s4, $this));
+        tmp_0 = raise.fh(parseTypeDeclaration(_this__u8e3s4, $this));
       } else {
         if (tmp0_subject instanceof WsEnumTypeDef) {
-          tmp_0 = raise.eh(parseEnumTypeDeclaration(_this__u8e3s4, $this));
+          tmp_0 = raise.fh(parseEnumTypeDeclaration(_this__u8e3s4, $this));
         } else {
           if (tmp0_subject instanceof WsRefinedTypeDef) {
-            tmp_0 = raise.eh(parseRefinedTypeDeclaration(_this__u8e3s4, $this));
+            tmp_0 = raise.fh(parseRefinedTypeDeclaration(_this__u8e3s4, $this));
           } else {
             var tmp$ret$1;
             // Inline function 'arrow.core.nel' call
             var tmp$ret$0;
             // Inline function 'kotlin.also' call
-            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.rl_1);
+            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.sl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            raise.eh(_this__u8e3s4.tl());
+            raise.fh(_this__u8e3s4.ul());
             tmp$ret$0 = tmp0_also;
             var tmp1_nel = tmp$ret$0;
             tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
-            raise.dh(tmp$ret$1);
+            raise.eh(tmp$ret$1);
           }
         }
       }
       tmp$ret$2 = tmp_0;
       tmp$ret$3 = tmp$ret$2;
       var res = tmp$ret$3;
-      raise.bh();
+      raise.ch();
       var tmp$ret$4;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$4 = new Right(res);
@@ -3714,7 +3725,7 @@
       var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$5;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -3723,7 +3734,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -3753,30 +3764,30 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDeclaration.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.eh(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.rl_1.al_1));
+        tmp_0 = raise.fh(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.sl_1.bl_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
-        raise.dh(tmp$ret$1);
+        raise.eh(tmp$ret$1);
       }
       tmp$ret$2 = tmp_0;
       tmp$ret$3 = tmp$ret$2;
       var res = tmp$ret$3;
-      raise.bh();
+      raise.ch();
       var tmp$ret$4;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$4 = new Right(res);
@@ -3785,7 +3796,7 @@
       var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$5;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -3794,7 +3805,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -3824,53 +3835,53 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
-        tmp_0 = new Type_0(typeName, raise.eh(parseTypeShape(_this__u8e3s4, $this)));
+        tmp_0 = new Type_0(typeName, raise.fh(parseTypeShape(_this__u8e3s4, $this)));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.rl_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
-        raise.dh(tmp$ret$1);
+        raise.eh(tmp$ret$1);
       }
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>' call
-      var tmp0_subject_0 = _this__u8e3s4.rl_1.zk_1;
+      var tmp0_subject_0 = _this__u8e3s4.sl_1.al_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
       else {
         var tmp$ret$3;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.rl_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
-        raise.dh(tmp$ret$3);
+        raise.eh(tmp$ret$3);
       }
       tmp$ret$4 = tmp2_also;
       tmp$ret$5 = tmp$ret$4;
       tmp$ret$6 = tmp$ret$5;
       var res = tmp$ret$6;
-      raise.bh();
+      raise.ch();
       var tmp$ret$7;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$7 = new Right(res);
@@ -3879,7 +3890,7 @@
       var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$8;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -3888,7 +3899,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -3918,11 +3929,11 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$7;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
       var tmp$ret$6;
       // Inline function 'kotlin.let' call
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomValue) {
         var tmp$ret$3;
@@ -3933,25 +3944,25 @@
         var tmp0_apply = tmp$ret$0;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>' call
-        tmp0_apply.a(raise.eh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.rl_1.al_1))));
-        while (equals(_this__u8e3s4.rl_1.zk_1, Comma_getInstance())) {
-          raise.eh(_this__u8e3s4.tl());
-          var tmp0_subject_0 = _this__u8e3s4.rl_1.zk_1;
+        tmp0_apply.a(raise.fh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.sl_1.bl_1))));
+        while (equals(_this__u8e3s4.sl_1.al_1, Comma_getInstance())) {
+          raise.fh(_this__u8e3s4.ul());
+          var tmp0_subject_0 = _this__u8e3s4.sl_1.al_1;
           if (tmp0_subject_0 instanceof CustomValue) {
-            tmp0_apply.a(raise.eh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.rl_1.al_1))));
+            tmp0_apply.a(raise.fh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.sl_1.bl_1))));
           } else {
             var tmp$ret$2;
             // Inline function 'arrow.core.nel' call
             var tmp$ret$1;
             // Inline function 'kotlin.also' call
-            var tmp0_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.rl_1);
+            var tmp0_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.sl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>.<anonymous>' call
-            raise.eh(_this__u8e3s4.tl());
+            raise.fh(_this__u8e3s4.ul());
             tmp$ret$1 = tmp0_also;
             var tmp1_nel = tmp$ret$1;
             tmp$ret$2 = nonEmptyListOf(tmp1_nel, []);
-            raise.dh(tmp$ret$2);
+            raise.eh(tmp$ret$2);
           }
         }
         tmp$ret$3 = tmp0_apply;
@@ -3961,14 +3972,14 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$4;
         // Inline function 'kotlin.also' call
-        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.rl_1);
+        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$4 = tmp1_also;
         var tmp2_nel = tmp$ret$4;
         tmp$ret$5 = nonEmptyListOf(tmp2_nel, []);
-        raise.dh(tmp$ret$5);
+        raise.eh(tmp$ret$5);
       }
       var tmp3_let = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
@@ -3976,7 +3987,7 @@
       tmp$ret$7 = tmp$ret$6;
       tmp$ret$8 = tmp$ret$7;
       var res = tmp$ret$8;
-      raise.bh();
+      raise.ch();
       var tmp$ret$9;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$9 = new Right(res);
@@ -3985,7 +3996,7 @@
       var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$10;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -3994,7 +4005,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -4024,37 +4035,37 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       if (tmp0_subject instanceof Colon)
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
       else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(Colon), _this__u8e3s4.rl_1);
+        var tmp0_also = new WrongTokenException(getKClass(Colon), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
-        raise.dh(tmp$ret$1);
+        raise.eh(tmp$ret$1);
       }
-      var type = _this__u8e3s4.rl_1.zk_1;
+      var type = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (isInterface(type, WsType)) {
-        var tmp_1 = raise.eh(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.rl_1.al_1));
+        var tmp_1 = raise.fh(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.sl_1.bl_1));
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.rl_1.zk_1;
+        var tmp_2 = _this__u8e3s4.sl_1.al_1;
         var tmp2_also = tmp_2 instanceof QuestionMark;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
         if (tmp2_also)
-          raise.eh(_this__u8e3s4.tl());
+          raise.fh(_this__u8e3s4.ul());
         tmp$ret$2 = tmp2_also;
         tmp_0 = new Field(identifier, tmp_1, tmp$ret$2);
       } else {
@@ -4062,19 +4073,19 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$3;
         // Inline function 'kotlin.also' call
-        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
+        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$3 = tmp3_also;
         var tmp4_nel = tmp$ret$3;
         tmp$ret$4 = nonEmptyListOf(tmp4_nel, []);
-        raise.dh(tmp$ret$4);
+        raise.eh(tmp$ret$4);
       }
       tmp$ret$5 = tmp_0;
       tmp$ret$6 = tmp$ret$5;
       var res = tmp$ret$6;
-      raise.bh();
+      raise.ch();
       var tmp$ret$7;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$7 = new Right(res);
@@ -4083,7 +4094,7 @@
       var tmp_3;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$8;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -4092,7 +4103,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -4122,16 +4133,16 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$1;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseFieldValue.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
       var tmp$ret$0;
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.rl_1.zk_1;
+      var tmp_0 = _this__u8e3s4.sl_1.al_1;
       var tmp0_also = tmp_0 instanceof Brackets;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseFieldValue.<anonymous>.<anonymous>' call
       if (tmp0_also)
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
       tmp$ret$0 = tmp0_also;
       var isIterable = tmp$ret$0;
       var tmp0_subject = wsType;
@@ -4156,7 +4167,7 @@
       tmp$ret$1 = tmp_1;
       tmp$ret$2 = tmp$ret$1;
       var res = tmp$ret$2;
-      raise.bh();
+      raise.ch();
       var tmp$ret$3;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$3 = new Right(res);
@@ -4165,7 +4176,7 @@
       var tmp_2;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$4;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -4174,7 +4185,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -4204,30 +4215,30 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDeclaration.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.eh(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.rl_1.al_1));
+        tmp_0 = raise.fh(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.sl_1.bl_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
-        raise.dh(tmp$ret$1);
+        raise.eh(tmp$ret$1);
       }
       tmp$ret$2 = tmp_0;
       tmp$ret$3 = tmp$ret$2;
       var res = tmp$ret$3;
-      raise.bh();
+      raise.ch();
       var tmp$ret$4;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$4 = new Right(res);
@@ -4236,7 +4247,7 @@
       var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$5;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -4245,7 +4256,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -4275,53 +4286,53 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$5;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
-        tmp_0 = new Enum_0(typeName, raise.eh(parseEnumTypeEntries(_this__u8e3s4, $this)));
+        tmp_0 = new Enum_0(typeName, raise.fh(parseEnumTypeEntries(_this__u8e3s4, $this)));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.rl_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
-        raise.dh(tmp$ret$1);
+        raise.eh(tmp$ret$1);
       }
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-      var tmp0_subject_0 = _this__u8e3s4.rl_1.zk_1;
+      var tmp0_subject_0 = _this__u8e3s4.sl_1.al_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
       else {
         var tmp$ret$3;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.rl_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
-        raise.dh(tmp$ret$3);
+        raise.eh(tmp$ret$3);
       }
       tmp$ret$4 = tmp2_also;
       tmp$ret$5 = tmp$ret$4;
       tmp$ret$6 = tmp$ret$5;
       var res = tmp$ret$6;
-      raise.bh();
+      raise.ch();
       var tmp$ret$7;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$7 = new Right(res);
@@ -4330,7 +4341,7 @@
       var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$8;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -4339,7 +4350,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -4369,9 +4380,9 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$7;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
         var tmp$ret$4;
@@ -4382,32 +4393,32 @@
         var tmp0_apply = tmp$ret$0;
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        tmp0_apply.a(_this__u8e3s4.rl_1.al_1);
-        raise.eh(_this__u8e3s4.tl());
-        while (equals(_this__u8e3s4.rl_1.zk_1, Comma_getInstance())) {
-          raise.eh(_this__u8e3s4.tl());
-          var tmp0_subject_0 = _this__u8e3s4.rl_1.zk_1;
+        tmp0_apply.a(_this__u8e3s4.sl_1.bl_1);
+        raise.fh(_this__u8e3s4.ul());
+        while (equals(_this__u8e3s4.sl_1.al_1, Comma_getInstance())) {
+          raise.fh(_this__u8e3s4.ul());
+          var tmp0_subject_0 = _this__u8e3s4.sl_1.al_1;
           if (tmp0_subject_0 instanceof CustomType) {
             var tmp$ret$1;
             // Inline function 'kotlin.also' call
-            var tmp0_also = tmp0_apply.a(_this__u8e3s4.rl_1.al_1);
+            var tmp0_also = tmp0_apply.a(_this__u8e3s4.sl_1.bl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.eh(_this__u8e3s4.tl());
+            raise.fh(_this__u8e3s4.ul());
             tmp$ret$1 = tmp0_also;
           } else {
             var tmp$ret$3;
             // Inline function 'arrow.core.nel' call
             var tmp$ret$2;
             // Inline function 'kotlin.also' call
-            var tmp1_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
+            var tmp1_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>.<anonymous>' call
-            raise.eh(_this__u8e3s4.tl());
+            raise.fh(_this__u8e3s4.ul());
             tmp$ret$2 = tmp1_also;
             var tmp2_nel = tmp$ret$2;
             tmp$ret$3 = nonEmptyListOf(tmp2_nel, []);
-            raise.dh(tmp$ret$3);
+            raise.eh(tmp$ret$3);
           }
         }
         tmp$ret$4 = tmp0_apply;
@@ -4417,19 +4428,19 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$5;
         // Inline function 'kotlin.also' call
-        var tmp1_also_0 = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
+        var tmp1_also_0 = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$5 = tmp1_also_0;
         var tmp2_nel_0 = tmp$ret$5;
         tmp$ret$6 = nonEmptyListOf(tmp2_nel_0, []);
-        raise.dh(tmp$ret$6);
+        raise.eh(tmp$ret$6);
       }
       tmp$ret$7 = toSet(tmp_0);
       tmp$ret$8 = tmp$ret$7;
       var res = tmp$ret$8;
-      raise.bh();
+      raise.ch();
       var tmp$ret$9;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$9 = new Right(res);
@@ -4438,7 +4449,7 @@
       var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$10;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -4447,7 +4458,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -4477,30 +4488,30 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$2;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseRefinedTypeDeclaration.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.eh(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.rl_1.al_1));
+        tmp_0 = raise.fh(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.sl_1.bl_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseRefinedTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
-        raise.dh(tmp$ret$1);
+        raise.eh(tmp$ret$1);
       }
       tmp$ret$2 = tmp_0;
       tmp$ret$3 = tmp$ret$2;
       var res = tmp$ret$3;
-      raise.bh();
+      raise.ch();
       var tmp$ret$4;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$4 = new Right(res);
@@ -4509,7 +4520,7 @@
       var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$5;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -4518,7 +4529,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -4548,37 +4559,37 @@
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       var tmp$ret$3;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
-      log(_this__u8e3s4.rl_1, $this);
+      raise.fh(_this__u8e3s4.ul());
+      log(_this__u8e3s4.sl_1, $this);
       var tmp$ret$2;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
+      var tmp0_subject = _this__u8e3s4.sl_1.al_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.rl_1.al_1));
+        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.sl_1.bl_1));
       } else {
         var tmp$ret$1;
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(CustomRegex), _this__u8e3s4.rl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomRegex), _this__u8e3s4.sl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.tl());
+        raise.fh(_this__u8e3s4.ul());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
-        raise.dh(tmp$ret$1);
+        raise.eh(tmp$ret$1);
       }
       var tmp2_also = tmp_0;
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>.<anonymous>' call
-      raise.eh(_this__u8e3s4.tl());
+      raise.fh(_this__u8e3s4.ul());
       tmp$ret$2 = tmp2_also;
       tmp$ret$3 = tmp$ret$2;
       tmp$ret$4 = tmp$ret$3;
       var res = tmp$ret$4;
-      raise.bh();
+      raise.ch();
       var tmp$ret$5;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$5 = new Right(res);
@@ -4587,7 +4598,7 @@
       var tmp_1;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$6;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -4596,7 +4607,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -4611,12 +4622,12 @@
     return tmp$ret$9;
   }
   function log(_this__u8e3s4, $this) {
-    return $this.oh_1.kh('Parsing ' + _this__u8e3s4.zk_1 + ' at line ' + _this__u8e3s4.bl_1.cl_1 + ' position ' + _this__u8e3s4.bl_1.dl_1);
+    return $this.ph_1.lh('Parsing ' + _this__u8e3s4.al_1 + ' at line ' + _this__u8e3s4.cl_1.dl_1 + ' position ' + _this__u8e3s4.cl_1.el_1);
   }
   function Parser(logger) {
-    this.oh_1 = logger;
+    this.ph_1 = logger;
   }
-  protoOf(Parser).ph = function (tokens) {
+  protoOf(Parser).qh = function (tokens) {
     var tmp$ret$2;
     // Inline function 'kotlin.collections.filterNot' call
     var tmp$ret$1;
@@ -4627,7 +4638,7 @@
       var element = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parse.<anonymous>' call
-      var tmp = element.zk_1;
+      var tmp = element.al_1;
       tmp$ret$0 = isInterface(tmp, WhiteSpace);
       if (!tmp$ret$0) {
         tmp0_filterNotTo.a(element);
@@ -4635,12 +4646,9 @@
     }
     tmp$ret$1 = tmp0_filterNotTo;
     tmp$ret$2 = tmp$ret$1;
-    return parse(toProvider(tmp$ret$2, this.oh_1), this);
+    return parse(toProvider(tmp$ret$2, this.ph_1), this);
   };
   function printTokens($this, previousToken) {
-    var tmp$ret$6;
-    // Inline function 'kotlin.run' call
-    // Inline function 'kotlin.contracts.contract' call
     var tmp0_safe_receiver = previousToken;
     var tmp;
     if (tmp0_safe_receiver == null) {
@@ -4650,8 +4658,8 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$0;
-      // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>.<anonymous>' call
-      tmp$ret$0 = "Eating: '" + tmp0_safe_receiver.al_1 + "', ";
+      // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
+      tmp$ret$0 = "Eating: '" + tmp0_safe_receiver.bl_1 + "', ";
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
     }
@@ -4659,14 +4667,14 @@
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     var tmp$ret$3;
     // Inline function 'kotlin.run' call
-    var tmp0_run = $this.rl_1;
+    var tmp0_run = $this.sl_1;
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$2;
-    // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>.<anonymous>' call
-    tmp$ret$2 = "Current: '" + tmp0_run.al_1 + "'";
+    // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
+    tmp$ret$2 = "Current: '" + tmp0_run.bl_1 + "'";
     tmp$ret$3 = tmp$ret$2;
     var curr = tmp$ret$3;
-    var tmp2_safe_receiver = $this.sl_1;
+    var tmp2_safe_receiver = $this.tl_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -4675,16 +4683,14 @@
       // Inline function 'kotlin.run' call
       // Inline function 'kotlin.contracts.contract' call
       var tmp$ret$4;
-      // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>.<anonymous>' call
-      tmp$ret$4 = ", Next: '" + tmp2_safe_receiver.al_1 + "'";
+      // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.printTokens.<anonymous>' call
+      tmp$ret$4 = ", Next: '" + tmp2_safe_receiver.bl_1 + "'";
       tmp$ret$5 = tmp$ret$4;
       tmp_0 = tmp$ret$5;
     }
     var tmp3_elvis_lhs = tmp_0;
     var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-    $this.pl_1.kh(prev + curr + next);
-    tmp$ret$6 = Unit_getInstance();
-    return tmp$ret$6;
+    $this.ql_1.lh(prev + curr + next);
   }
   function printTokens$default($this, previousToken, $super) {
     previousToken = previousToken === VOID ? null : previousToken;
@@ -4702,7 +4708,7 @@
       var tmp0_success = Companion_getInstance();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.parse.TokenProvider.nextToken.<anonymous>' call
-      tmp$ret$0 = $this.ql_1.e();
+      tmp$ret$0 = $this.rl_1.e();
       var tmp1_success = tmp$ret$0;
       tmp$ret$1 = _Result___init__impl__xyqfz8(tmp1_success);
       tmp = tmp$ret$1;
@@ -4733,24 +4739,28 @@
     return tmp$ret$4;
   }
   function TokenProvider(logger, tokenIterator) {
-    this.pl_1 = logger;
-    this.ql_1 = tokenIterator;
+    this.ql_1 = logger;
+    this.rl_1 = tokenIterator;
     var tmp = this;
     var tmp0_elvis_lhs = nextToken(this);
     var tmp_0;
     if (tmp0_elvis_lhs == null) {
-      throw new StartingException();
+      var tmp_1 = EndOfProgram_getInstance();
+      EndOfProgram_getInstance();
+      var tmp_2 = new Coordinates();
+      EndOfProgram_getInstance();
+      tmp_0 = new Token(tmp_1, 'EOP', plus_2(tmp_2, 'EOP'.length));
     } else {
       tmp_0 = tmp0_elvis_lhs;
     }
-    tmp.rl_1 = tmp_0;
-    this.sl_1 = nextToken(this);
+    tmp.sl_1 = tmp_0;
+    this.tl_1 = nextToken(this);
     printTokens$default(this);
   }
   protoOf(TokenProvider).d = function () {
-    return !(this.sl_1 == null);
+    return !(this.tl_1 == null);
   };
-  protoOf(TokenProvider).tl = function () {
+  protoOf(TokenProvider).ul = function () {
     var tmp$ret$6;
     // Inline function 'arrow.core.raise.either' call
     var tmp$ret$5;
@@ -4764,25 +4774,25 @@
     try {
       var tmp$ret$1;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      var previousToken = this.rl_1;
+      var previousToken = this.sl_1;
       var tmp_0 = this;
-      var tmp0_elvis_lhs = this.sl_1;
+      var tmp0_elvis_lhs = this.tl_1;
       var tmp_1;
       if (tmp0_elvis_lhs == null) {
         var tmp$ret$0;
         // Inline function 'arrow.core.nel' call
-        var tmp0_nel = new NextException(previousToken.bl_1);
+        var tmp0_nel = new NextException(previousToken.cl_1);
         tmp$ret$0 = nonEmptyListOf(tmp0_nel, []);
-        raise.dh(tmp$ret$0);
+        raise.eh(tmp$ret$0);
       } else {
         tmp_1 = tmp0_elvis_lhs;
       }
-      tmp_0.rl_1 = tmp_1;
-      this.sl_1 = nextToken(this);
+      tmp_0.sl_1 = tmp_1;
+      this.tl_1 = nextToken(this);
       printTokens(this, previousToken);
       tmp$ret$1 = Unit_getInstance();
       var res = tmp$ret$1;
-      raise.bh();
+      raise.ch();
       var tmp$ret$2;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
       tmp$ret$2 = new Right(Unit_getInstance());
@@ -4791,7 +4801,7 @@
       var tmp_2;
       if ($p instanceof CancellationException) {
         var e = $p;
-        raise.bh();
+        raise.ch();
         var tmp$ret$3;
         // Inline function 'arrow.core.raise.either.<anonymous>' call
         var tmp1__anonymous__uwfjfc = raisedOrRethrow(e, raise);
@@ -4800,7 +4810,7 @@
       } else {
         if ($p instanceof Error) {
           var e_0 = $p;
-          raise.bh();
+          raise.ch();
           var tmp0__anonymous__q1qw7t = nonFatalOrThrow(e_0);
           throw tmp0__anonymous__q1qw7t;
         } else {
@@ -4820,15 +4830,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.ul_1 = idx;
-    this.vl_1 = length;
+    this.vl_1 = idx;
+    this.wl_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.ul_1 + ', length=' + this.vl_1 + ')';
+    return 'IdxAndLength(idx=' + this.vl_1 + ', length=' + this.wl_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.ul_1;
-    result = imul(result, 31) + this.vl_1 | 0;
+    var result = this.vl_1;
+    result = imul(result, 31) + this.wl_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -4837,36 +4847,36 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.ul_1 === tmp0_other_with_cast.ul_1))
-      return false;
     if (!(this.vl_1 === tmp0_other_with_cast.vl_1))
       return false;
+    if (!(this.wl_1 === tmp0_other_with_cast.wl_1))
+      return false;
     return true;
   };
   function Coordinates(line, position, idxAndLength) {
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.cl_1 = line;
-    this.dl_1 = position;
-    this.el_1 = idxAndLength;
+    this.dl_1 = line;
+    this.el_1 = position;
+    this.fl_1 = idxAndLength;
   }
-  protoOf(Coordinates).wl = function (line, position, idxAndLength) {
+  protoOf(Coordinates).xl = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).xl = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.cl_1 : line;
-    position = position === VOID ? this.dl_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.el_1 : idxAndLength;
-    return $super === VOID ? this.wl(line, position, idxAndLength) : $super.wl.call(this, line, position, idxAndLength);
+  protoOf(Coordinates).yl = function (line, position, idxAndLength, $super) {
+    line = line === VOID ? this.dl_1 : line;
+    position = position === VOID ? this.el_1 : position;
+    idxAndLength = idxAndLength === VOID ? this.fl_1 : idxAndLength;
+    return $super === VOID ? this.xl(line, position, idxAndLength) : $super.xl.call(this, line, position, idxAndLength);
   };
   protoOf(Coordinates).toString = function () {
-    return 'Coordinates(line=' + this.cl_1 + ', position=' + this.dl_1 + ', idxAndLength=' + this.el_1 + ')';
+    return 'Coordinates(line=' + this.dl_1 + ', position=' + this.el_1 + ', idxAndLength=' + this.fl_1 + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.cl_1;
-    result = imul(result, 31) + this.dl_1 | 0;
-    result = imul(result, 31) + this.el_1.hashCode() | 0;
+    var result = this.dl_1;
+    result = imul(result, 31) + this.el_1 | 0;
+    result = imul(result, 31) + this.fl_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -4875,35 +4885,35 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    if (!(this.cl_1 === tmp0_other_with_cast.cl_1))
-      return false;
     if (!(this.dl_1 === tmp0_other_with_cast.dl_1))
       return false;
-    if (!this.el_1.equals(tmp0_other_with_cast.el_1))
+    if (!(this.el_1 === tmp0_other_with_cast.el_1))
+      return false;
+    if (!this.fl_1.equals(tmp0_other_with_cast.fl_1))
       return false;
     return true;
   };
   function Token(type, value, coordinates) {
-    this.zk_1 = type;
-    this.al_1 = value;
-    this.bl_1 = coordinates;
+    this.al_1 = type;
+    this.bl_1 = value;
+    this.cl_1 = coordinates;
   }
-  protoOf(Token).yl = function (type, value, coordinates) {
+  protoOf(Token).zl = function (type, value, coordinates) {
     return new Token(type, value, coordinates);
   };
-  protoOf(Token).gl = function (type, value, coordinates, $super) {
-    type = type === VOID ? this.zk_1 : type;
-    value = value === VOID ? this.al_1 : value;
-    coordinates = coordinates === VOID ? this.bl_1 : coordinates;
-    return $super === VOID ? this.yl(type, value, coordinates) : $super.yl.call(this, type, value, coordinates);
+  protoOf(Token).hl = function (type, value, coordinates, $super) {
+    type = type === VOID ? this.al_1 : type;
+    value = value === VOID ? this.bl_1 : value;
+    coordinates = coordinates === VOID ? this.cl_1 : coordinates;
+    return $super === VOID ? this.zl(type, value, coordinates) : $super.zl.call(this, type, value, coordinates);
   };
   protoOf(Token).toString = function () {
-    return 'Token(type=' + this.zk_1 + ', value=' + this.al_1 + ', coordinates=' + this.bl_1 + ')';
+    return 'Token(type=' + this.al_1 + ', value=' + this.bl_1 + ', coordinates=' + this.cl_1 + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = hashCode(this.zk_1);
-    result = imul(result, 31) + getStringHashCode(this.al_1) | 0;
-    result = imul(result, 31) + this.bl_1.hashCode() | 0;
+    var result = hashCode(this.al_1);
+    result = imul(result, 31) + getStringHashCode(this.bl_1) | 0;
+    result = imul(result, 31) + this.cl_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -4912,73 +4922,79 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!equals(this.zk_1, tmp0_other_with_cast.zk_1))
+    if (!equals(this.al_1, tmp0_other_with_cast.al_1))
       return false;
-    if (!(this.al_1 === tmp0_other_with_cast.al_1))
+    if (!(this.bl_1 === tmp0_other_with_cast.bl_1))
       return false;
-    if (!this.bl_1.equals(tmp0_other_with_cast.bl_1))
+    if (!this.cl_1.equals(tmp0_other_with_cast.cl_1))
       return false;
     return true;
   };
   function plus_1(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.ul_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.vl_1 + length | 0, length);
   }
   function plus_2(_this__u8e3s4, length) {
-    return _this__u8e3s4.xl(VOID, _this__u8e3s4.dl_1 + length | 0, plus_1(_this__u8e3s4.el_1, length));
+    return _this__u8e3s4.yl(VOID, _this__u8e3s4.el_1 + length | 0, plus_1(_this__u8e3s4.fl_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
+    var tmp$ret$3;
+    // Inline function 'kotlin.let' call
     var tmp$ret$1;
     // Inline function 'kotlin.let' call
-    var tmp0_let = tokenize_0(_this__u8e3s4, source, emptyList());
+    var tmp0_let = extractToken(_this__u8e3s4, source, new Coordinates());
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$0;
     // Inline function 'community.flock.wirespec.compiler.core.tokenize.tokenize.<anonymous>' call
+    var token = tmp0_let.i3();
+    var remaining = tmp0_let.j3();
+    tmp$ret$0 = tokenize_0(_this__u8e3s4, remaining, nonEmptyListOf(token, []));
+    tmp$ret$1 = tmp$ret$0;
+    var tmp1_let = tmp$ret$1;
+    // Inline function 'kotlin.contracts.contract' call
+    var tmp$ret$2;
+    // Inline function 'community.flock.wirespec.compiler.core.tokenize.tokenize.<anonymous>' call
     var tmp = EndOfProgram_getInstance();
     EndOfProgram_getInstance();
-    var tmp_0 = lastCoordinates(tmp0_let);
+    var tmp_0 = last(tmp1_let).cl_1;
     var tmp_1 = EndOfProgram_getInstance();
     EndOfProgram_getInstance();
-    tmp$ret$0 = plus_0(tmp0_let, new Token(tmp, 'EOP', nextCoordinates(tmp_0, tmp_1, 'EOP')));
-    tmp$ret$1 = tmp$ret$0;
-    return tmp$ret$1;
+    tmp$ret$2 = tmp1_let.zg(new Token(tmp, 'EOP', nextCoordinates(tmp_0, tmp_1, 'EOP')));
+    tmp$ret$3 = tmp$ret$2;
+    return tmp$ret$3;
   }
   function nextCoordinates(_this__u8e3s4, type, value) {
     var tmp0_subject = type;
     var tmp;
     if (tmp0_subject instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.cl_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.el_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.dl_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.fl_1, value.length));
     } else {
       tmp = plus_2(_this__u8e3s4, value.length);
     }
     return tmp;
   }
-  function lastCoordinates(_this__u8e3s4) {
-    var tmp0_safe_receiver = lastOrNull(_this__u8e3s4);
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.bl_1;
-    return tmp1_elvis_lhs == null ? new Coordinates() : tmp1_elvis_lhs;
-  }
-  function tokenize_0(_this__u8e3s4, source, tokens) {
+  function tokenize_0(_this__u8e3s4, source, incompleteTokens) {
     var $this = _this__u8e3s4;
     var source_0 = source;
-    var tokens_0 = tokens;
+    var incompleteTokens_0 = incompleteTokens;
     $l$1: do {
       $l$0: do {
-        var token = findToken($this, lastCoordinates(tokens_0), source_0);
-        var newSource = removePrefix(source_0, token.al_1);
-        var newTokens = plus_0(tokens_0, token);
+        var tmp0_container = extractToken($this, source_0, last(incompleteTokens_0).cl_1);
+        var token = tmp0_container.i3();
+        var remaining = tmp0_container.j3();
+        var tokens = incompleteTokens_0.zg(token);
         var tmp;
         var tmp$ret$0;
         // Inline function 'kotlin.text.isEmpty' call
-        tmp$ret$0 = charSequenceLength(newSource) === 0;
+        tmp$ret$0 = charSequenceLength(remaining) === 0;
         if (tmp$ret$0) {
-          tmp = newTokens;
+          tmp = tokens;
         } else {
           var tmp0 = $this;
-          var tmp1 = newSource;
-          var tmp2 = newTokens;
+          var tmp1 = remaining;
+          var tmp2 = tokens;
           $this = tmp0;
           source_0 = tmp1;
-          tokens_0 = tmp2;
+          incompleteTokens_0 = tmp2;
           continue $l$0;
         }
         return tmp;
@@ -4987,10 +5003,12 @@
     }
      while (true);
   }
-  function findToken(_this__u8e3s4, previousTokenCoordinates, source) {
+  function extractToken(_this__u8e3s4, source, previousTokenCoordinates) {
+    var tmp$ret$4;
+    // Inline function 'kotlin.let' call
     var tmp$ret$2;
     // Inline function 'kotlin.collections.firstNotNullOf' call
-    var tmp0_firstNotNullOf = _this__u8e3s4.uh();
+    var tmp0_firstNotNullOf = _this__u8e3s4.vh();
     var tmp$ret$1;
     $l$block: {
       // Inline function 'kotlin.collections.firstNotNullOfOrNull' call
@@ -4998,7 +5016,7 @@
       while (tmp0_iterator.d()) {
         var element = tmp0_iterator.e();
         var tmp$ret$0;
-        // Inline function 'community.flock.wirespec.compiler.core.tokenize.findToken.<anonymous>' call
+        // Inline function 'community.flock.wirespec.compiler.core.tokenize.extractToken.<anonymous>' call
         var regex = element.i3();
         var tokenType = element.j3();
         var tmp0_safe_receiver = regex.ce(source);
@@ -5019,7 +5037,13 @@
       tmp = tmp0_elvis_lhs;
     }
     tmp$ret$2 = tmp;
-    return tmp$ret$2;
+    var tmp1_let = tmp$ret$2;
+    // Inline function 'kotlin.contracts.contract' call
+    var tmp$ret$3;
+    // Inline function 'community.flock.wirespec.compiler.core.tokenize.extractToken.<anonymous>' call
+    tmp$ret$3 = to(tmp1_let, removePrefix(source, tmp1_let.bl_1));
+    tmp$ret$4 = tmp$ret$3;
+    return tmp$ret$4;
   }
   function toToken(_this__u8e3s4, type, previousTokenCoordinates) {
     return new Token(type, _this__u8e3s4.w(), nextCoordinates(previousTokenCoordinates, type, _this__u8e3s4.w()));
@@ -5190,7 +5214,7 @@
   }
   function EndOfProgram() {
     EndOfProgram_instance = this;
-    this.am_1 = 'EOP';
+    this.bm_1 = 'EOP';
   }
   var EndOfProgram_instance;
   function EndOfProgram_getInstance() {
@@ -5211,11 +5235,11 @@
   }
   var noLogger;
   function Logger(enableLogging) {
-    this.jh_1 = enableLogging;
+    this.kh_1 = enableLogging;
   }
-  protoOf(Logger).kh = function (s) {
+  protoOf(Logger).lh = function (s) {
     var tmp;
-    if (this.jh_1) {
+    if (this.kh_1) {
       println(s);
       tmp = Unit_getInstance();
     } else {
@@ -5223,13 +5247,13 @@
     }
     return tmp;
   };
-  protoOf(Logger).yk = function (s, block) {
+  protoOf(Logger).zk = function (s, block) {
     var tmp$ret$1;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     var tmp$ret$0;
     // Inline function 'community.flock.wirespec.compiler.utils.Logger.log.<anonymous>' call
-    this.kh(s);
+    this.lh(s);
     tmp$ret$0 = block();
     tmp$ret$1 = tmp$ret$0;
     return tmp$ret$1;
@@ -5246,73 +5270,73 @@
     }
   }
   //region block: post-declaration
-  protoOf(JavaEmitter).uj = withLogging;
-  protoOf(JavaEmitter).vj = withLogging_0;
-  protoOf(JavaEmitter).wj = withLogging_1;
-  protoOf(JavaEmitter).xj = withLogging_2;
-  protoOf(JavaEmitter).vh = withLogging_3;
-  protoOf(JavaEmitter).zj = withLogging_4;
-  protoOf(JavaEmitter).bk = withLogging_5;
-  protoOf(JavaEmitter).ck = withLogging_6;
-  protoOf(JavaEmitter).ek = withLogging_7;
-  protoOf(JavaEmitter).si = withLogging_8;
-  protoOf(KotlinEmitter).uj = withLogging;
-  protoOf(KotlinEmitter).vj = withLogging_0;
-  protoOf(KotlinEmitter).wj = withLogging_1;
-  protoOf(KotlinEmitter).xj = withLogging_2;
-  protoOf(KotlinEmitter).vh = withLogging_3;
-  protoOf(KotlinEmitter).zj = withLogging_4;
-  protoOf(KotlinEmitter).bk = withLogging_5;
-  protoOf(KotlinEmitter).ck = withLogging_6;
-  protoOf(KotlinEmitter).ek = withLogging_7;
-  protoOf(KotlinEmitter).si = withLogging_8;
-  protoOf(ScalaEmitter).uj = withLogging;
-  protoOf(ScalaEmitter).vj = withLogging_0;
-  protoOf(ScalaEmitter).wj = withLogging_1;
-  protoOf(ScalaEmitter).xj = withLogging_2;
-  protoOf(ScalaEmitter).vh = withLogging_3;
-  protoOf(ScalaEmitter).zj = withLogging_4;
-  protoOf(ScalaEmitter).bk = withLogging_5;
-  protoOf(ScalaEmitter).ck = withLogging_6;
-  protoOf(ScalaEmitter).ek = withLogging_7;
-  protoOf(TypeScriptEmitter).uj = withLogging;
-  protoOf(TypeScriptEmitter).vj = withLogging_0;
-  protoOf(TypeScriptEmitter).wj = withLogging_1;
-  protoOf(TypeScriptEmitter).xj = withLogging_2;
-  protoOf(TypeScriptEmitter).vh = withLogging_3;
-  protoOf(TypeScriptEmitter).zj = withLogging_4;
-  protoOf(TypeScriptEmitter).bk = withLogging_5;
-  protoOf(TypeScriptEmitter).ck = withLogging_6;
-  protoOf(TypeScriptEmitter).ek = withLogging_7;
-  protoOf(TypeScriptEmitter).si = withLogging_8;
-  protoOf(WirespecEmitter).uj = withLogging;
-  protoOf(WirespecEmitter).vj = withLogging_0;
-  protoOf(WirespecEmitter).wj = withLogging_1;
-  protoOf(WirespecEmitter).xj = withLogging_2;
-  protoOf(WirespecEmitter).vh = withLogging_3;
-  protoOf(WirespecEmitter).zj = withLogging_4;
-  protoOf(WirespecEmitter).bk = withLogging_5;
-  protoOf(WirespecEmitter).ck = withLogging_6;
-  protoOf(WirespecEmitter).ek = withLogging_7;
-  protoOf(WsTypeDef).zl = name;
-  protoOf(WsEnumTypeDef).zl = name;
-  protoOf(WsRefinedTypeDef).zl = name;
-  protoOf(WhiteSpaceExceptNewLine).zl = name;
-  protoOf(NewLine).zl = name;
-  protoOf(LeftCurly).zl = name;
-  protoOf(Colon).zl = name;
-  protoOf(Comma).zl = name;
-  protoOf(QuestionMark).zl = name;
-  protoOf(Brackets).zl = name;
-  protoOf(WsString).zl = name;
-  protoOf(WsInteger).zl = name;
-  protoOf(WsBoolean).zl = name;
-  protoOf(RightCurly).zl = name;
-  protoOf(CustomValue).zl = name;
-  protoOf(CustomType).zl = name;
-  protoOf(CustomRegex).zl = name;
-  protoOf(Invalid).zl = name;
-  protoOf(EndOfProgram).zl = name;
+  protoOf(JavaEmitter).vj = withLogging;
+  protoOf(JavaEmitter).wj = withLogging_0;
+  protoOf(JavaEmitter).xj = withLogging_1;
+  protoOf(JavaEmitter).yj = withLogging_2;
+  protoOf(JavaEmitter).wh = withLogging_3;
+  protoOf(JavaEmitter).ak = withLogging_4;
+  protoOf(JavaEmitter).ck = withLogging_5;
+  protoOf(JavaEmitter).dk = withLogging_6;
+  protoOf(JavaEmitter).fk = withLogging_7;
+  protoOf(JavaEmitter).ti = withLogging_8;
+  protoOf(KotlinEmitter).vj = withLogging;
+  protoOf(KotlinEmitter).wj = withLogging_0;
+  protoOf(KotlinEmitter).xj = withLogging_1;
+  protoOf(KotlinEmitter).yj = withLogging_2;
+  protoOf(KotlinEmitter).wh = withLogging_3;
+  protoOf(KotlinEmitter).ak = withLogging_4;
+  protoOf(KotlinEmitter).ck = withLogging_5;
+  protoOf(KotlinEmitter).dk = withLogging_6;
+  protoOf(KotlinEmitter).fk = withLogging_7;
+  protoOf(KotlinEmitter).ti = withLogging_8;
+  protoOf(ScalaEmitter).vj = withLogging;
+  protoOf(ScalaEmitter).wj = withLogging_0;
+  protoOf(ScalaEmitter).xj = withLogging_1;
+  protoOf(ScalaEmitter).yj = withLogging_2;
+  protoOf(ScalaEmitter).wh = withLogging_3;
+  protoOf(ScalaEmitter).ak = withLogging_4;
+  protoOf(ScalaEmitter).ck = withLogging_5;
+  protoOf(ScalaEmitter).dk = withLogging_6;
+  protoOf(ScalaEmitter).fk = withLogging_7;
+  protoOf(TypeScriptEmitter).vj = withLogging;
+  protoOf(TypeScriptEmitter).wj = withLogging_0;
+  protoOf(TypeScriptEmitter).xj = withLogging_1;
+  protoOf(TypeScriptEmitter).yj = withLogging_2;
+  protoOf(TypeScriptEmitter).wh = withLogging_3;
+  protoOf(TypeScriptEmitter).ak = withLogging_4;
+  protoOf(TypeScriptEmitter).ck = withLogging_5;
+  protoOf(TypeScriptEmitter).dk = withLogging_6;
+  protoOf(TypeScriptEmitter).fk = withLogging_7;
+  protoOf(TypeScriptEmitter).ti = withLogging_8;
+  protoOf(WirespecEmitter).vj = withLogging;
+  protoOf(WirespecEmitter).wj = withLogging_0;
+  protoOf(WirespecEmitter).xj = withLogging_1;
+  protoOf(WirespecEmitter).yj = withLogging_2;
+  protoOf(WirespecEmitter).wh = withLogging_3;
+  protoOf(WirespecEmitter).ak = withLogging_4;
+  protoOf(WirespecEmitter).ck = withLogging_5;
+  protoOf(WirespecEmitter).dk = withLogging_6;
+  protoOf(WirespecEmitter).fk = withLogging_7;
+  protoOf(WsTypeDef).am = name;
+  protoOf(WsEnumTypeDef).am = name;
+  protoOf(WsRefinedTypeDef).am = name;
+  protoOf(WhiteSpaceExceptNewLine).am = name;
+  protoOf(NewLine).am = name;
+  protoOf(LeftCurly).am = name;
+  protoOf(Colon).am = name;
+  protoOf(Comma).am = name;
+  protoOf(QuestionMark).am = name;
+  protoOf(Brackets).am = name;
+  protoOf(WsString).am = name;
+  protoOf(WsInteger).am = name;
+  protoOf(WsBoolean).am = name;
+  protoOf(RightCurly).am = name;
+  protoOf(CustomValue).am = name;
+  protoOf(CustomType).am = name;
+  protoOf(CustomRegex).am = name;
+  protoOf(Invalid).am = name;
+  protoOf(EndOfProgram).am = name;
   //endregion
   //region block: init
   DEFAULT_PACKAGE_NAME = 'community.flock.wirespec.generated';