@flock/wirespec 0.7.2 → 0.7.3

package/kotlin/wirespec-core.js

@@ -89,47 +89,48 @@
   setMetadataFor(Reported, 'Reported', classMeta, Enum);
   setMetadataFor(Wirespec, 'Wirespec', objectMeta);
   function withLogging(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Type', block);
+    return logger.yk('Emitting Definition: Type', block);
   }
   function withLogging_0(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Type Shape', block);
+    return logger.yk('Emitting Definition: Type Shape', block);
   }
   function withLogging_1(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Type Shape Field', block);
+    return logger.yk('Emitting Definition: Type Shape Field', block);
   }
   function withLogging_2(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Type Shape Field Key', block);
+    return logger.yk('Emitting Definition: Type Shape Field Key', block);
   }
   function withLogging_3(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Type Shape Field Value', block);
+    return logger.yk('Emitting Definition: Type Shape Field Value', block);
   }
   setMetadataFor(TypeDefinitionEmitterLogger, 'TypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_4(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Endpoint', block);
+    return logger.yk('Emitting Definition: Endpoint', block);
   }
   setMetadataFor(EnumDefinitionEmitterLogger, 'EnumDefinitionEmitterLogger', interfaceMeta);
   function withLogging_5(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Refined', block);
+    return logger.yk('Emitting Definition: Refined', block);
   }
   function withLogging_6(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Refined Validator', block);
+    return logger.yk('Emitting Definition: Refined Validator', block);
   }
   setMetadataFor(RefinedTypeDefinitionEmitterLogger, 'RefinedTypeDefinitionEmitterLogger', interfaceMeta);
   function withLogging_7(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Endpoint', block);
+    return logger.yk('Emitting Definition: Endpoint', block);
   }
   function withLogging_8(_this__u8e3s4, logger, block) {
-    return logger.wk('Emitting Definition: Endpoint Segment', block);
+    return logger.yk('Emitting Definition: Endpoint Segment', block);
   }
   setMetadataFor(EndpointDefinitionEmitterLogger, 'EndpointDefinitionEmitterLogger', interfaceMeta);
   setMetadataFor(Emitter, 'Emitter', classMeta, VOID, [TypeDefinitionEmitterLogger, EnumDefinitionEmitterLogger, RefinedTypeDefinitionEmitterLogger, EndpointDefinitionEmitterLogger]);
   setMetadataFor(JavaEmitter, 'JavaEmitter', classMeta, Emitter);
-  setMetadataFor(KotlinEmitter, 'KotlinEmitter', classMeta, Emitter);
   setMetadataFor(Companion, 'Companion', objectMeta);
+  setMetadataFor(KotlinEmitter, 'KotlinEmitter', classMeta, Emitter);
+  setMetadataFor(Companion_0, 'Companion', objectMeta);
   setMetadataFor(ScalaEmitter, 'ScalaEmitter', classMeta, Emitter);
   setMetadataFor(TypeScriptEmitter, 'TypeScriptEmitter', classMeta, Emitter);
   setMetadataFor(WirespecEmitter, 'WirespecEmitter', classMeta, Emitter);
-  setMetadataFor(Companion_0, 'Companion', objectMeta);
+  setMetadataFor(Companion_1, 'Companion', objectMeta);
   setMetadataFor(WirespecException, 'WirespecException', classMeta, RuntimeException);
   setMetadataFor(CompilerException, 'CompilerException', classMeta, WirespecException);
   setMetadataFor(ParserException, 'ParserException', classMeta, CompilerException);
@@ -392,48 +393,48 @@
     return $this.vh(_this__u8e3s4, $this.qh_1, JavaEmitter$emitPrimaryType$lambda(_this__u8e3s4));
   }
   function emit(_this__u8e3s4, $this, endpoint) {
-    Companion_getInstance_1();
+    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_0 = tmp2_elvis_lhs == null ? 'Void' : tmp2_elvis_lhs;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    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 tmp_1 = tmp5_elvis_lhs == null ? 'Void' : tmp5_elvis_lhs;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    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);
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
     var tmp_4 = emitPath(endpoint.hi_1, $this);
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    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);
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
     var tmp_6 = emitMap(endpoint.ji_1, $this);
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
     var tmp6_safe_receiver = _this__u8e3s4.wh_1;
     var tmp_7;
     if (tmp6_safe_receiver == null) {
@@ -450,28 +451,28 @@
     }
     var tmp7_elvis_lhs = tmp_7;
     var tmp_8 = tmp7_elvis_lhs == null ? 'null' : tmp7_elvis_lhs;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    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 tmp_9 = tmp10_elvis_lhs == null ? 'Void' : tmp10_elvis_lhs;
-    Companion_getInstance_1();
+    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    ');
   }
   function emit_0(_this__u8e3s4, $this) {
-    Companion_getInstance_1();
-    var tmp = Companion_getInstance_1().qi(_this__u8e3s4.ni_1);
+    Companion_getInstance_2();
+    var tmp = Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
     var tmp_0 = emitContentType(_this__u8e3s4.oi_1, $this);
     var tmp$ret$1;
     // Inline function 'kotlin.takeIf' call
@@ -493,19 +494,19 @@
     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 tmp_3 = tmp3_elvis_lhs == null ? 'Void' : tmp3_elvis_lhs;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    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 tmp_4 = tmp6_elvis_lhs == null ? 'Void' : tmp6_elvis_lhs;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    var tmp_5 = Companion_getInstance_1().qi(_this__u8e3s4.ni_1);
+    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$ret$3;
     // Inline function 'kotlin.takeIf' call
@@ -552,9 +553,9 @@
     }
     var tmp9_elvis_lhs = tmp_10;
     var tmp_11 = tmp9_elvis_lhs == null ? '' : tmp9_elvis_lhs;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
     var tmp$ret$9;
     // Inline function 'kotlin.takeIf' call
     var tmp2_takeIf = _this__u8e3s4.ni_1;
@@ -571,12 +572,12 @@
     tmp$ret$9 = tmp_12;
     var tmp10_elvis_lhs = tmp$ret$9;
     var tmp_13 = tmp10_elvis_lhs == null ? 'status' : tmp10_elvis_lhs;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
     var tmp11_safe_receiver = _this__u8e3s4.oi_1;
     var tmp_14;
     if (tmp11_safe_receiver == null) {
@@ -593,23 +594,23 @@
     }
     var tmp12_elvis_lhs = tmp_14;
     var tmp_15 = tmp12_elvis_lhs == null ? 'null' : tmp12_elvis_lhs;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    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 tmp_16 = tmp15_elvis_lhs == null ? 'Void' : tmp15_elvis_lhs;
-    Companion_getInstance_1();
+    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        ');
   }
   function emitResponseMapper(_this__u8e3s4, $this) {
-    Companion_getInstance_1();
+    Companion_getInstance_2();
     var tmp$ret$1;
     // Inline function 'kotlin.collections.distinctBy' call
     var set = HashSet_init_$Create$();
@@ -629,18 +630,18 @@
     tmp$ret$1 = list;
     var tmp = tmp$ret$1;
     var tmp_0 = joinToString(tmp, '', VOID, VOID, VOID, VOID, JavaEmitter$emitResponseMapper$lambda($this));
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
     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 tmp;
     if (tmp0_subject == null) {
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
       var tmp$ret$1;
       // Inline function 'kotlin.takeIf' call
       var tmp0_takeIf = _this__u8e3s4.ni_1;
@@ -670,7 +671,7 @@
         tmp_1 = tmp$ret$3;
       }
       var tmp_2 = orEmptyString(tmp_1, $this);
-      var tmp_3 = Companion_getInstance_1().qi(_this__u8e3s4.ni_1);
+      var tmp_3 = Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
       var tmp$ret$5;
       // Inline function 'kotlin.takeIf' call
       var tmp1_takeIf = _this__u8e3s4.ni_1;
@@ -701,9 +702,9 @@
       }
       tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + 'if(' + tmp_2 + 'content == null) { return new Response' + tmp_3 + 'Void(' + orEmptyString(tmp_5, $this) + 'headers); }\n                    |\n                ');
     } else {
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
       var tmp$ret$9;
       // Inline function 'kotlin.takeIf' call
       var tmp2_takeIf = _this__u8e3s4.ni_1;
@@ -733,18 +734,18 @@
         tmp_7 = tmp$ret$11;
       }
       var tmp_8 = orEmptyString(tmp_7, $this);
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      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();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      var tmp_12 = Companion_getInstance_1().qi(_this__u8e3s4.ni_1);
+      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$ret$13;
       // Inline function 'kotlin.takeIf' call
@@ -775,9 +776,9 @@
         tmp_15 = tmp$ret$15;
       }
       var tmp_16 = orEmptyString(tmp_15, $this);
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      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                ');
     }
     return tmp;
@@ -864,7 +865,7 @@
       tmp$ret$1 = tmp$ret$0.substring(0, 1);
       tmp = tmp$ret$1 + 'XX';
     } else {
-      tmp = Companion_getInstance_1().qi(_this__u8e3s4);
+      tmp = Companion_getInstance_2().qi(_this__u8e3s4);
     }
     return tmp;
   }
@@ -885,7 +886,7 @@
   }
   function JavaEmitter$emit$lambda_1($this_emit, this$0) {
     return function () {
-      Companion_getInstance_1();
+      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);
     };
   }
@@ -960,30 +961,30 @@
   }
   function JavaEmitter$emit$lambda_4($this_emit) {
     return function () {
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      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          ');
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      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';
     };
   }
   function JavaEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
       var tmp = this$0.pj($this_emit.oj_1);
-      Companion_getInstance_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            |');
     };
   }
   function JavaEmitter$emit$lambda_6($this_emit) {
     return function () {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       return '  ' + 'java.util.regex.Pattern.compile(' + $this_emit.qj_1 + ').matcher(record.value).find();';
     };
   }
@@ -993,12 +994,12 @@
     };
   }
   function JavaEmitter$emit$lambda$lambda_2(it) {
-    Companion_getInstance_1();
+    Companion_getInstance_2();
     return '  ' + 'interface Response' + it + '<T> extends Response<T>{};';
   }
   function JavaEmitter$emit$lambda$lambda_3(this$0) {
     return function (it) {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       return '  ' + 'interface Response' + it + '<T> extends Response' + groupStatus(it, this$0) + '<T>{};';
     };
   }
@@ -1009,12 +1010,12 @@
   }
   function JavaEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp = emitSegment($this_emit.hi_1, this$0);
       var tmp_0 = emitResponseMapper($this_emit.mi_1, this$0);
-      Companion_getInstance_1();
+      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));
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
       var tmp1_map = $this_emit.mi_1;
@@ -1089,8 +1090,8 @@
       tmp$ret$10 = list;
       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_1();
-      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_1().rj($this_emit.fi_1) + '(Request request);\n            |}\n            |');
+      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            |');
     };
   }
   function JavaEmitter$emitResponseMapper$lambda(this$0) {
@@ -1099,7 +1100,7 @@
     };
   }
   function JavaEmitter$emitContentType$lambda(it) {
-    return Companion_getInstance_1().qi(it);
+    return Companion_getInstance_2().qi(it);
   }
   function JavaEmitter$emit$lambda_8($this_emit) {
     return function () {
@@ -1151,42 +1152,42 @@
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger, true);
     var tmp = this;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    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 + ';';
   }
@@ -1290,9 +1291,9 @@
     return '/' + joinToString(_this__u8e3s4, '/', VOID, VOID, VOID, VOID, KotlinEmitter$emitPath$lambda($this));
   }
   function emitResponseMapper_0(_this__u8e3s4, $this) {
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
     var tmp$ret$4;
     // Inline function 'kotlin.collections.distinctBy' call
     var tmp$ret$2;
@@ -1305,7 +1306,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_1().fk(element.ni_1);
+      tmp$ret$0 = Companion_getInstance_2().fk(element.ni_1);
       if (tmp$ret$0) {
         tmp0_filterTo.a(element);
       }
@@ -1342,7 +1343,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_1().fk(element_0.ni_1);
+      tmp$ret$5 = !Companion_getInstance_2().fk(element_0.ni_1);
       if (tmp$ret$5) {
         tmp2_filterTo.a(element_0);
       }
@@ -1367,18 +1368,18 @@
     tmp$ret$9 = list_0;
     var tmp_1 = tmp$ret$9;
     var tmp_2 = joinToString(tmp_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emitResponseMapper$lambda_0($this));
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
+    Companion_getInstance_2();
     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 tmp;
     if (tmp0_subject == null) {
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
       var tmp$ret$1;
       // Inline function 'kotlin.takeIf' call
       var tmp0_takeIf = _this__u8e3s4.ni_1;
@@ -1386,7 +1387,7 @@
       var tmp_0;
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$0 = Companion_getInstance_1().fk(tmp0_takeIf);
+      tmp$ret$0 = Companion_getInstance_2().fk(tmp0_takeIf);
       if (tmp$ret$0) {
         tmp_0 = tmp0_takeIf;
       } else {
@@ -1408,7 +1409,7 @@
         tmp_1 = tmp$ret$3;
       }
       var tmp_2 = orEmptyString_0(tmp_1);
-      var tmp_3 = Companion_getInstance_1().qi(_this__u8e3s4.ni_1);
+      var tmp_3 = Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
       var tmp$ret$5;
       // Inline function 'kotlin.takeIf' call
       var tmp1_takeIf = _this__u8e3s4.ni_1;
@@ -1416,7 +1417,7 @@
       var tmp_4;
       var tmp$ret$4;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$4 = !Companion_getInstance_1().fk(tmp1_takeIf);
+      tmp$ret$4 = !Companion_getInstance_2().fk(tmp1_takeIf);
       if (tmp$ret$4) {
         tmp_4 = tmp1_takeIf;
       } else {
@@ -1439,9 +1440,9 @@
       }
       tmp = trimMargin('\n                    |' + '  ' + '  ' + '  ' + tmp_2 + 'content == null -> Response' + tmp_3 + 'Unit(' + orEmptyString_0(tmp_5) + 'headers)\n                ');
     } else {
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
       var tmp$ret$9;
       // Inline function 'kotlin.takeIf' call
       var tmp2_takeIf = _this__u8e3s4.ni_1;
@@ -1449,7 +1450,7 @@
       var tmp_6;
       var tmp$ret$8;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$8 = Companion_getInstance_1().fk(tmp2_takeIf);
+      tmp$ret$8 = Companion_getInstance_2().fk(tmp2_takeIf);
       if (tmp$ret$8) {
         tmp_6 = tmp2_takeIf;
       } else {
@@ -1471,17 +1472,17 @@
         tmp_7 = tmp$ret$11;
       }
       var tmp_8 = orEmptyString_0(tmp_7);
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      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);
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      var tmp_11 = Companion_getInstance_1().qi(_this__u8e3s4.ni_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$ret$13;
       // Inline function 'kotlin.takeIf' call
@@ -1490,7 +1491,7 @@
       var tmp_13;
       var tmp$ret$12;
       // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emitResponseMapperCondition.<anonymous>' call
-      tmp$ret$12 = !Companion_getInstance_1().fk(tmp3_takeIf);
+      tmp$ret$12 = !Companion_getInstance_2().fk(tmp3_takeIf);
       if (tmp$ret$12) {
         tmp_13 = tmp3_takeIf;
       } else {
@@ -1515,6 +1516,16 @@
     }
     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']);
+  }
+  var Companion_instance;
+  function Companion_getInstance_0() {
+    if (Companion_instance == null)
+      new Companion();
+    return Companion_instance;
+  }
   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           |');
@@ -1522,7 +1533,7 @@
   }
   function KotlinEmitter$emit$lambda$lambda(this$0) {
     return function (it) {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       return '  ' + 'val ' + this$0.yi(it);
     };
   }
@@ -1536,7 +1547,7 @@
       return this$0.dj($this_emit.aj_1) + ': ' + this$0.ei($this_emit.bj_1) + ($this_emit.cj_1 ? '? = null' : '');
     };
   }
-  function KotlinEmitter$emit$lambda_2($this_emit) {
+  function KotlinEmitter$emit$lambda_2(this$0, $this_emit) {
     return function () {
       var tmp$ret$2;
       // Inline function 'kotlin.collections.mapIndexed' call
@@ -1553,12 +1564,12 @@
         var tmp1 = index;
         index = tmp1 + 1 | 0;
         var tmp2__anonymous__z9zvc9 = checkIndexOverflow(tmp1);
-        tmp$ret$0 = tmp2__anonymous__z9zvc9 > 0 ? Companion_getInstance_1().qi(item) : item;
+        tmp$ret$0 = tmp2__anonymous__z9zvc9 > 0 ? Companion_getInstance_2().qi(item) : item;
         tmp0_mapIndexedTo.a(tmp$ret$0);
       }
       tmp$ret$1 = tmp0_mapIndexedTo;
       tmp$ret$2 = tmp$ret$1;
-      return joinToString(tmp$ret$2, '');
+      return this$0.lk(joinToString(tmp$ret$2, ''));
     };
   }
   function KotlinEmitter$emit$lambda_3($this_emit) {
@@ -1609,7 +1620,7 @@
       // 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.kk() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.mk() ? 'Map<String, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -1625,15 +1636,17 @@
     tmp$ret$1 = tmp$ret$0;
     return tmp$ret$1;
   }
-  function KotlinEmitter$emit$lambda$lambda_0(it) {
-    return invoke$sanitize_0(it) + '("' + it + '")';
+  function KotlinEmitter$emit$lambda$lambda_0(this$0) {
+    return function (it) {
+      return this$0.lk(invoke$sanitize_0(it)) + '("' + it + '")';
+    };
   }
-  function KotlinEmitter$emit$lambda_4($this_emit) {
+  function KotlinEmitter$emit$lambda_4($this_emit, this$0) {
     return function () {
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      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) + '\n}\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';
     };
   }
   function KotlinEmitter$emit$lambda_5($this_emit, this$0) {
@@ -1648,7 +1661,7 @@
   }
   function KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
     return function (it) {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp0_safe_receiver = it.wh_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;
@@ -1679,16 +1692,16 @@
     };
   }
   function KotlinEmitter$emit$lambda$lambda_2(it) {
-    Companion_getInstance_1();
+    Companion_getInstance_2();
     return '  ' + 'sealed interface Response' + it + '<T>: Response<T>';
   }
   function KotlinEmitter$emit$lambda$lambda_3(it) {
-    Companion_getInstance_1();
+    Companion_getInstance_2();
     return '  ' + 'sealed interface Response' + it + '<T>: Response' + groupStatus_0(it) + '<T>';
   }
   function KotlinEmitter$emit$lambda$lambda_4(this$0) {
     return function (it) {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp0_safe_receiver = it.oi_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;
@@ -1732,8 +1745,8 @@
   }
   function KotlinEmitter$emit$lambda$lambda_5(this$0) {
     return function (it) {
-      Companion_getInstance_1();
-      var tmp = Companion_getInstance_1().qi(it.ni_1);
+      Companion_getInstance_2();
+      var tmp = Companion_getInstance_2().qi(it.ni_1);
       var tmp0_safe_receiver = it.oi_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;
@@ -1753,7 +1766,7 @@
       }
       var tmp3_elvis_lhs = tmp_1;
       var tmp_2 = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-      var tmp_3 = Companion_getInstance_1().qi(it.ni_1);
+      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);
@@ -1778,9 +1791,9 @@
   }
   function KotlinEmitter$emit$lambda_7($this_emit, this$0) {
     return function () {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp = joinToString($this_emit.li_1, '\n', VOID, VOID, VOID, VOID, KotlinEmitter$emit$lambda$lambda_1(this$0, $this_emit));
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp$ret$2;
       // Inline function 'kotlin.collections.map' call
       var tmp1_map = $this_emit.mi_1;
@@ -1812,7 +1825,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_1().fk(element.ni_1);
+        tmp$ret$3 = Companion_getInstance_2().fk(element.ni_1);
         if (tmp$ret$3) {
           tmp2_filterTo.a(element);
         }
@@ -1848,7 +1861,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_1().fk(element_0.ni_1);
+        tmp$ret$9 = Companion_getInstance_2().fk(element_0.ni_1);
         if (tmp$ret$9) {
           tmp6_filterTo.a(element_0);
         }
@@ -1886,7 +1899,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_1().fk(element_1.ni_1);
+        tmp$ret$14 = !Companion_getInstance_2().fk(element_1.ni_1);
         if (tmp$ret$14) {
           tmp9_filterTo.a(element_1);
         }
@@ -1911,17 +1924,17 @@
       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_1().rj($this_emit.fi_1);
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      var tmp_8 = Companion_getInstance_2().rj($this_emit.fi_1);
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
       var tmp_9 = emitSegment_0($this_emit.hi_1, this$0);
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
       var tmp_10 = emitResponseMapper_0($this_emit.mi_1, this$0);
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      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        |');
     };
   }
@@ -1981,16 +1994,17 @@
     };
   }
   function KotlinEmitter(packageName, logger) {
+    Companion_getInstance_0();
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
     this.ik_1 = packageName;
     var tmp = this;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
+    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    ');
   }
   protoOf(KotlinEmitter).sh = function (ast) {
@@ -2009,7 +2023,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_1().lk(ast) ? this.jk_1 : '') + '\n                    |' + result + '\n            ');
+      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            ');
       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);
@@ -2028,13 +2042,13 @@
     return this.wj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_1(this, _this__u8e3s4));
   };
   protoOf(KotlinEmitter).dj = function (_this__u8e3s4) {
-    return this.xj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_2(_this__u8e3s4));
+    return this.xj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_2(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).yj = function (_this__u8e3s4) {
-    return this.zj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_4(_this__u8e3s4));
+    return this.zj(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_4(_this__u8e3s4, this));
   };
   protoOf(KotlinEmitter).ak = function (_this__u8e3s4) {
     return this.bk(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_5(_this__u8e3s4, this));
@@ -2045,6 +2059,9 @@
   protoOf(KotlinEmitter).dk = function (_this__u8e3s4) {
     return this.ek(_this__u8e3s4, this.qh_1, KotlinEmitter$emit$lambda_7(_this__u8e3s4, this));
   };
+  protoOf(KotlinEmitter).lk = function (_this__u8e3s4) {
+    return Companion_getInstance_0().kk_1.i1(_this__u8e3s4) ? '`' + _this__u8e3s4 + '`' : _this__u8e3s4;
+  };
   function toField(_this__u8e3s4, identifier, isNullable) {
     return new Field(new Identifier(identifier), _this__u8e3s4, isNullable);
   }
@@ -2054,7 +2071,7 @@
   }
   function groupStatus_0(_this__u8e3s4) {
     var tmp;
-    if (Companion_getInstance_1().fk(_this__u8e3s4)) {
+    if (Companion_getInstance_2().fk(_this__u8e3s4)) {
       var tmp$ret$1;
       // Inline function 'kotlin.text.substring' call
       var tmp$ret$0;
@@ -2063,7 +2080,7 @@
       tmp$ret$1 = tmp$ret$0.substring(0, 1);
       tmp = tmp$ret$1 + 'XX';
     } else {
-      tmp = Companion_getInstance_1().qi(_this__u8e3s4);
+      tmp = Companion_getInstance_2().qi(_this__u8e3s4);
     }
     return tmp;
   }
@@ -2072,17 +2089,17 @@
     return tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
   }
   function emitContentType$lambda(it) {
-    return Companion_getInstance_1().qi(it);
+    return Companion_getInstance_2().qi(it);
   }
-  function Companion() {
-    Companion_instance = this;
-    this.mk_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']);
+  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']);
   }
-  var Companion_instance;
-  function Companion_getInstance_0() {
-    if (Companion_instance == null)
-      new Companion();
-    return Companion_instance;
+  var Companion_instance_0;
+  function Companion_getInstance_1() {
+    if (Companion_instance_0 == null)
+      new Companion_0();
+    return Companion_instance_0;
   }
   function ScalaEmitter$emit$lambda($this_emit, this$0) {
     return function () {
@@ -2101,13 +2118,13 @@
   }
   function ScalaEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
-      Companion_getInstance_1();
+      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)) + ',';
     };
   }
   function ScalaEmitter$emit$lambda_2($this_emit) {
     return function () {
-      return Companion_getInstance_0().mk_1.i1($this_emit.ej_1) ? '`' + $this_emit.ej_1 + '`' : $this_emit.ej_1;
+      return Companion_getInstance_1().ok_1.i1($this_emit.ej_1) ? '`' + $this_emit.ej_1 + '`' : $this_emit.ej_1;
     };
   }
   function ScalaEmitter$emit$lambda_3($this_emit) {
@@ -2168,7 +2185,7 @@
   }
   function ScalaEmitter$emit$lambda$lambda_0($this_emit) {
     return function (it) {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp$ret$1;
       // Inline function 'kotlin.text.uppercase' call
       var tmp0_uppercase = invoke$sanitize_1(it);
@@ -2186,18 +2203,18 @@
   }
   function ScalaEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp = this$0.pj($this_emit.oj_1);
-      Companion_getInstance_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            |');
     };
   }
   function ScalaEmitter$emit$lambda_6($this_emit) {
     return function () {
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      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)');
     };
   }
@@ -2205,11 +2222,11 @@
     return '// TODO("Not yet implemented")\n';
   }
   function ScalaEmitter(packageName, logger) {
-    Companion_getInstance_0();
+    Companion_getInstance_1();
     packageName = packageName === VOID ? get_DEFAULT_PACKAGE_NAME() : packageName;
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
-    this.pk_1 = packageName;
+    this.rk_1 = packageName;
   }
   protoOf(ScalaEmitter).sh = function (ast) {
     var tmp$ret$2;
@@ -2225,7 +2242,7 @@
       // 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.pk_1) ? '' : 'package ' + this.pk_1 + '\n\n' + result);
+      tmp$ret$0 = to(name, isBlank(this.rk_1) ? '' : 'package ' + this.rk_1 + '\n\n' + result);
       tmp0_mapTo.a(tmp$ret$0);
     }
     tmp$ret$1 = tmp0_mapTo;
@@ -2271,7 +2288,7 @@
     return 'Request' + (tmp1_elvis_lhs == null ? 'Undefined' : tmp1_elvis_lhs);
   }
   function emitName_0(_this__u8e3s4, $this) {
-    var tmp = 'Response' + Companion_getInstance_1().qi(_this__u8e3s4.ni_1);
+    var tmp = 'Response' + Companion_getInstance_2().qi(_this__u8e3s4.ni_1);
     var tmp0_safe_receiver = _this__u8e3s4.oi_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);
@@ -2302,7 +2319,7 @@
   }
   function TypeScriptEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       return '  ' + this$0.dj($this_emit.aj_1) + ($this_emit.cj_1 ? '?' : '') + ': ' + this$0.ei($this_emit.bj_1);
     };
   }
@@ -2359,7 +2376,7 @@
       // 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.kk() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
+      tmp$ret$2 = $this_emit.mk() ? 'Record<string, ' + tmp1_let + '>' : tmp1_let;
       tmp$ret$3 = tmp$ret$2;
       return tmp$ret$3;
     };
@@ -2374,7 +2391,7 @@
   }
   function TypeScriptEmitter$emit$lambda_5($this_emit, this$0) {
     return function () {
-      Companion_getInstance_1();
+      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            |');
     };
   }
@@ -2385,7 +2402,7 @@
   }
   function TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit) {
     return function (it) {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp = emitName(it, this$0);
       var tmp_0 = emitType($this_emit.hi_1, this$0);
       var tmp$ret$2;
@@ -2447,9 +2464,9 @@
   }
   function TypeScriptEmitter$emit$lambda$lambda_3(this$0) {
     return function (it) {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp = emitName_0(it, this$0);
-      var tmp_0 = Companion_getInstance_1().fk(it.ni_1) ? it.ni_1 : 'number';
+      var tmp_0 = Companion_getInstance_2().fk(it.ni_1) ? it.ni_1 : 'number';
       var tmp0_safe_receiver = it.oi_1;
       var tmp_1;
       if (tmp0_safe_receiver == null) {
@@ -2480,8 +2497,8 @@
   }
   function TypeScriptEmitter$emit$lambda$lambda_5(this$0, $this_emit) {
     return function (it) {
-      var tmp = Companion_getInstance_1().rj(emitName(it, this$0));
-      var tmp_0 = Companion_getInstance_1().tk($this_emit, it.wh_1);
+      var tmp = Companion_getInstance_2().rj(emitName(it, this$0));
+      var tmp_0 = Companion_getInstance_2().vk($this_emit, it.wh_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);
@@ -2508,20 +2525,20 @@
     return function () {
       var tmp = toSet($this_emit.li_1);
       var tmp_0 = joinToString(tmp, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_1(this$0, $this_emit));
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp_1 = toSet($this_emit.li_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_4 = joinToString(tmp_3, '\n', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_3(this$0));
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       var tmp_5 = toSet($this_emit.mi_1);
       var tmp_6 = joinToString(tmp_5, ' | ', VOID, VOID, VOID, VOID, TypeScriptEmitter$emit$lambda$lambda_4(this$0));
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      Companion_getInstance_1();
-      var tmp_7 = Companion_getInstance_1().rj($this_emit.fi_1);
-      Companion_getInstance_1();
-      Companion_getInstance_1();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      Companion_getInstance_2();
+      var tmp_7 = Companion_getInstance_2().rj($this_emit.fi_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        ');
     };
   }
@@ -2576,11 +2593,11 @@
     logger = logger === VOID ? get_noLogger() : logger;
     Emitter.call(this, logger);
     var tmp = this;
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    Companion_getInstance_1();
-    tmp.sk_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    ');
+    Companion_getInstance_2();
+    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    ');
   }
   protoOf(TypeScriptEmitter).sh = function (ast) {
     var tmp$ret$3;
@@ -2598,7 +2615,7 @@
       var result = item.j3();
       var tmp$ret$0;
       // Inline function 'kotlin.text.trimStart' call
-      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_1().lk(ast) ? this.sk_1 : '') + '\n                    |' + result + '\n            ');
+      var tmp0_trimStart = trimMargin('\n                    |' + (Companion_getInstance_2().nk(ast) ? this.uk_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);
@@ -2651,7 +2668,7 @@
   }
   function WirespecEmitter$emit$lambda_1(this$0, $this_emit) {
     return function () {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       return '  ' + this$0.dj($this_emit.aj_1) + ($this_emit.cj_1 ? '?' : '') + ': ' + this$0.ei($this_emit.bj_1) + ',';
     };
   }
@@ -2707,7 +2724,7 @@
   }
   function WirespecEmitter$emit$lambda_4($this_emit) {
     return function () {
-      Companion_getInstance_1();
+      Companion_getInstance_2();
       return 'enum ' + $this_emit.lj_1 + ' {\n' + '  ' + joinToString($this_emit.mj_1, ', ') + '\n}\n';
     };
   }
@@ -2759,11 +2776,11 @@
     return DEFAULT_PACKAGE_NAME;
   }
   var DEFAULT_PACKAGE_NAME;
-  function Companion_0() {
-    Companion_instance_0 = this;
+  function Companion_1() {
+    Companion_instance_1 = this;
     this.pi_1 = '  ';
   }
-  protoOf(Companion_0).qi = function (_this__u8e3s4) {
+  protoOf(Companion_1).qi = function (_this__u8e3s4) {
     var tmp$ret$6;
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
@@ -2797,7 +2814,7 @@
     tmp$ret$6 = tmp;
     return tmp$ret$6;
   };
-  protoOf(Companion_0).rj = function (_this__u8e3s4) {
+  protoOf(Companion_1).rj = function (_this__u8e3s4) {
     var tmp$ret$6;
     // Inline function 'kotlin.text.replaceFirstChar' call
     var tmp;
@@ -2831,7 +2848,7 @@
     tmp$ret$6 = tmp;
     return tmp$ret$6;
   };
-  protoOf(Companion_0).lk = function (_this__u8e3s4) {
+  protoOf(Companion_1).nk = function (_this__u8e3s4) {
     var tmp$ret$0;
     $l$block_0: {
       // Inline function 'kotlin.collections.any' call
@@ -2860,7 +2877,7 @@
     }
     return tmp$ret$0;
   };
-  protoOf(Companion_0).tk = function (_this__u8e3s4, content) {
+  protoOf(Companion_1).vk = function (_this__u8e3s4, content) {
     var tmp$ret$4;
     // Inline function 'kotlin.collections.map' call
     var tmp$ret$1;
@@ -2898,20 +2915,20 @@
     var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.yh_1;
     return filterNotNull(plus_0(parameters, tmp1_safe_receiver == null ? null : toField(tmp1_safe_receiver, 'body', false)));
   };
-  protoOf(Companion_0).fk = function (_this__u8e3s4) {
+  protoOf(Companion_1).fk = function (_this__u8e3s4) {
     return !(toIntOrNull(_this__u8e3s4) == null);
   };
-  var Companion_instance_0;
-  function Companion_getInstance_1() {
-    if (Companion_instance_0 == null)
-      new Companion_0();
-    return Companion_instance_0;
+  var Companion_instance_1;
+  function Companion_getInstance_2() {
+    if (Companion_instance_1 == null)
+      new Companion_1();
+    return Companion_instance_1;
   }
   function Emitter$emit$lambda(it) {
     return it.h3_1;
   }
   function Emitter(logger, split) {
-    Companion_getInstance_1();
+    Companion_getInstance_2();
     split = split === VOID ? false : split;
     this.qh_1 = logger;
     this.rh_1 = split;
@@ -2985,7 +3002,7 @@
     captureStack(this, NextException);
   }
   function WrongTokenException(expected, actual) {
-    ParserException.call(this, actual.zk_1, '' + expected.fc() + ' expected, not: ' + getKClassFromExpression(actual.xk_1).fc() + ' at line ' + actual.zk_1.al_1 + ' and position ' + (actual.zk_1.bl_1 - actual.yk_1.length | 0));
+    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));
     captureStack(this, WrongTokenException);
   }
   function NullTokenException(message, coordinates) {
@@ -3003,7 +3020,7 @@
   function WirespecException(message, coordinates) {
     RuntimeException_init_$Init$(message, this);
     captureStack(this, WirespecException);
-    this.dl_1 = coordinates;
+    this.fl_1 = coordinates;
   }
   function optimize(_this__u8e3s4) {
     var tmp$ret$2;
@@ -3016,10 +3033,10 @@
       var item = tmp0_iterator.e();
       var tmp$ret$0;
       // Inline function 'community.flock.wirespec.compiler.core.optimize.optimize.<anonymous>' call
-      var tmp0_subject = item.xk_1;
+      var tmp0_subject = item.zk_1;
       var tmp;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp = item.el(VOID, '"' + dropLast(drop(item.yk_1, 1), 2) + '"');
+        tmp = item.gl(VOID, '"' + dropLast(drop(item.al_1, 1), 2) + '"');
       } else {
         tmp = item;
       }
@@ -3059,29 +3076,29 @@
   }
   function Any(isIterable, isMap) {
     isMap = isMap === VOID ? false : isMap;
-    this.fl_1 = isIterable;
-    this.gl_1 = isMap;
+    this.hl_1 = isIterable;
+    this.il_1 = isMap;
   }
   protoOf(Any).ri = function () {
-    return this.fl_1;
+    return this.hl_1;
   };
-  protoOf(Any).kk = function () {
-    return this.gl_1;
+  protoOf(Any).mk = function () {
+    return this.il_1;
   };
-  protoOf(Any).hl = function (isIterable, isMap) {
+  protoOf(Any).jl = function (isIterable, isMap) {
     return new Any(isIterable, isMap);
   };
-  protoOf(Any).il = function (isIterable, isMap, $super) {
-    isIterable = isIterable === VOID ? this.fl_1 : isIterable;
-    isMap = isMap === VOID ? this.gl_1 : isMap;
-    return $super === VOID ? this.hl(isIterable, isMap) : $super.hl.call(this, 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).toString = function () {
-    return 'Any(isIterable=' + this.fl_1 + ', isMap=' + this.gl_1 + ')';
+    return 'Any(isIterable=' + this.hl_1 + ', isMap=' + this.il_1 + ')';
   };
   protoOf(Any).hashCode = function () {
-    var result = this.fl_1 | 0;
-    result = imul(result, 31) + (this.gl_1 | 0) | 0;
+    var result = this.hl_1 | 0;
+    result = imul(result, 31) + (this.il_1 | 0) | 0;
     return result;
   };
   protoOf(Any).equals = function (other) {
@@ -3090,9 +3107,9 @@
     if (!(other instanceof Any))
       return false;
     var tmp0_other_with_cast = other instanceof Any ? other : THROW_CCE();
-    if (!(this.fl_1 === tmp0_other_with_cast.fl_1))
+    if (!(this.hl_1 === tmp0_other_with_cast.hl_1))
       return false;
-    if (!(this.gl_1 === tmp0_other_with_cast.gl_1))
+    if (!(this.il_1 === tmp0_other_with_cast.il_1))
       return false;
     return true;
   };
@@ -3105,17 +3122,17 @@
   protoOf(Custom).ri = function () {
     return this.jj_1;
   };
-  protoOf(Custom).kk = function () {
+  protoOf(Custom).mk = function () {
     return this.kj_1;
   };
-  protoOf(Custom).jl = function (value, isIterable, isMap) {
+  protoOf(Custom).ll = function (value, isIterable, isMap) {
     return new Custom(value, isIterable, isMap);
   };
-  protoOf(Custom).kl = function (value, isIterable, isMap, $super) {
+  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.jl(value, isIterable, isMap) : $super.jl.call(this, value, isIterable, isMap);
+    return $super === VOID ? this.ll(value, isIterable, isMap) : $super.ll.call(this, value, isIterable, isMap);
   };
   protoOf(Custom).toString = function () {
     return 'Custom(value=' + this.ij_1 + ', isIterable=' + this.jj_1 + ', isMap=' + this.kj_1 + ')';
@@ -3149,17 +3166,17 @@
   protoOf(Primitive).ri = function () {
     return this.gj_1;
   };
-  protoOf(Primitive).kk = function () {
+  protoOf(Primitive).mk = function () {
     return this.hj_1;
   };
-  protoOf(Primitive).ll = function (type, isIterable, isMap) {
+  protoOf(Primitive).nl = function (type, isIterable, isMap) {
     return new Primitive(type, isIterable, isMap);
   };
-  protoOf(Primitive).ml = function (type, isIterable, isMap, $super) {
+  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.ll(type, isIterable, isMap) : $super.ll.call(this, type, isIterable, isMap);
+    return $super === VOID ? this.nl(type, isIterable, isMap) : $super.nl.call(this, type, isIterable, isMap);
   };
   protoOf(Primitive).toString = function () {
     return 'Primitive(type=' + this.fj_1 + ', isIterable=' + this.gj_1 + ', isMap=' + this.hj_1 + ')';
@@ -3658,8 +3675,8 @@
       // 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.pl_1, $this);
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      log(_this__u8e3s4.rl_1, $this);
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (tmp0_subject instanceof WsTypeDef) {
         tmp_0 = raise.eh(parseTypeDeclaration(_this__u8e3s4, $this));
@@ -3674,10 +3691,10 @@
             // Inline function 'arrow.core.nel' call
             var tmp$ret$0;
             // Inline function 'kotlin.also' call
-            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.pl_1);
+            var tmp0_also = new WrongTokenException(getKClass(WsTypeDef), _this__u8e3s4.rl_1);
             // Inline function 'kotlin.contracts.contract' call
             // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseDefinition.<anonymous>.<anonymous>' call
-            raise.eh(_this__u8e3s4.rl());
+            raise.eh(_this__u8e3s4.tl());
             tmp$ret$0 = tmp0_also;
             var tmp1_nel = tmp$ret$0;
             tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3736,21 +3753,21 @@
       // 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.rl());
-      log(_this__u8e3s4.pl_1, $this);
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.eh(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.pl_1.yk_1));
+        tmp_0 = raise.eh(parseTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.rl_1.al_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.pl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3807,11 +3824,11 @@
       // 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.rl());
-      log(_this__u8e3s4.pl_1, $this);
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Type_0(typeName, raise.eh(parseTypeShape(_this__u8e3s4, $this)));
@@ -3820,10 +3837,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.pl_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeDefinition.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -3832,18 +3849,18 @@
       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.pl_1.xk_1;
+      var tmp0_subject_0 = _this__u8e3s4.rl_1.zk_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
       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.pl_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.rl_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.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -3901,11 +3918,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.rl());
-      log(_this__u8e3s4.pl_1, $this);
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
       var tmp$ret$6;
       // Inline function 'kotlin.let' call
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomValue) {
         var tmp$ret$3;
@@ -3916,21 +3933,21 @@
         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.pl_1.yk_1))));
-        while (equals(_this__u8e3s4.pl_1.xk_1, Comma_getInstance())) {
-          raise.eh(_this__u8e3s4.rl());
-          var tmp0_subject_0 = _this__u8e3s4.pl_1.xk_1;
+        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;
           if (tmp0_subject_0 instanceof CustomValue) {
-            tmp0_apply.a(raise.eh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.pl_1.yk_1))));
+            tmp0_apply.a(raise.eh(parseField(_this__u8e3s4, $this, new Identifier(_this__u8e3s4.rl_1.al_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.pl_1);
+            var tmp0_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.rl_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.rl());
+            raise.eh(_this__u8e3s4.tl());
             tmp$ret$1 = tmp0_also;
             var tmp1_nel = tmp$ret$1;
             tmp$ret$2 = nonEmptyListOf(tmp1_nel, []);
@@ -3944,10 +3961,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$4;
         // Inline function 'kotlin.also' call
-        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.pl_1);
+        var tmp1_also = new WrongTokenException(getKClass(CustomValue), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseTypeShape.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$4 = tmp1_also;
         var tmp2_nel = tmp$ret$4;
         tmp$ret$5 = nonEmptyListOf(tmp2_nel, []);
@@ -4007,37 +4024,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.rl());
-      log(_this__u8e3s4.pl_1, $this);
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       if (tmp0_subject instanceof Colon)
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
       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.pl_1);
+        var tmp0_also = new WrongTokenException(getKClass(Colon), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
         raise.dh(tmp$ret$1);
       }
-      var type = _this__u8e3s4.pl_1.xk_1;
+      var type = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (isInterface(type, WsType)) {
-        var tmp_1 = raise.eh(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.pl_1.yk_1));
+        var tmp_1 = raise.eh(parseFieldValue(_this__u8e3s4, $this, type, _this__u8e3s4.rl_1.al_1));
         var tmp$ret$2;
         // Inline function 'kotlin.also' call
-        var tmp_2 = _this__u8e3s4.pl_1.xk_1;
+        var tmp_2 = _this__u8e3s4.rl_1.zk_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.rl());
+          raise.eh(_this__u8e3s4.tl());
         tmp$ret$2 = tmp2_also;
         tmp_0 = new Field(identifier, tmp_1, tmp$ret$2);
       } else {
@@ -4045,10 +4062,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$3;
         // Inline function 'kotlin.also' call
-        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.pl_1);
+        var tmp3_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseField.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$3 = tmp3_also;
         var tmp4_nel = tmp$ret$3;
         tmp$ret$4 = nonEmptyListOf(tmp4_nel, []);
@@ -4105,16 +4122,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.rl());
-      log(_this__u8e3s4.pl_1, $this);
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
       var tmp$ret$0;
       // Inline function 'kotlin.also' call
-      var tmp_0 = _this__u8e3s4.pl_1.xk_1;
+      var tmp_0 = _this__u8e3s4.rl_1.zk_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.rl());
+        raise.eh(_this__u8e3s4.tl());
       tmp$ret$0 = tmp0_also;
       var isIterable = tmp$ret$0;
       var tmp0_subject = wsType;
@@ -4187,21 +4204,21 @@
       // 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.rl());
-      log(_this__u8e3s4.pl_1, $this);
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.eh(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.pl_1.yk_1));
+        tmp_0 = raise.eh(parseEnumTypeDefinition(_this__u8e3s4, $this, _this__u8e3s4.rl_1.al_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.pl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4258,11 +4275,11 @@
       // 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.rl());
-      log(_this__u8e3s4.pl_1, $this);
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
       var tmp$ret$4;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (tmp0_subject instanceof LeftCurly) {
         tmp_0 = new Enum_0(typeName, raise.eh(parseEnumTypeEntries(_this__u8e3s4, $this)));
@@ -4271,10 +4288,10 @@
         // Inline function 'arrow.core.nel' call
         var tmp$ret$0;
         // Inline function 'kotlin.also' call
-        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.pl_1);
+        var tmp0_also = new WrongTokenException(getKClass(LeftCurly), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeDefinition.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4283,18 +4300,18 @@
       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.pl_1.xk_1;
+      var tmp0_subject_0 = _this__u8e3s4.rl_1.zk_1;
       if (tmp0_subject_0 instanceof RightCurly)
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
       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.pl_1);
+        var tmp0_also_0 = new WrongTokenException(getKClass(RightCurly), _this__u8e3s4.rl_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.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$2 = tmp0_also_0;
         var tmp1_nel_0 = tmp$ret$2;
         tmp$ret$3 = nonEmptyListOf(tmp1_nel_0, []);
@@ -4352,9 +4369,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.rl());
-      log(_this__u8e3s4.pl_1, $this);
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
         var tmp$ret$4;
@@ -4365,28 +4382,28 @@
         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.pl_1.yk_1);
-        raise.eh(_this__u8e3s4.rl());
-        while (equals(_this__u8e3s4.pl_1.xk_1, Comma_getInstance())) {
-          raise.eh(_this__u8e3s4.rl());
-          var tmp0_subject_0 = _this__u8e3s4.pl_1.xk_1;
+        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;
           if (tmp0_subject_0 instanceof CustomType) {
             var tmp$ret$1;
             // Inline function 'kotlin.also' call
-            var tmp0_also = tmp0_apply.a(_this__u8e3s4.pl_1.yk_1);
+            var tmp0_also = tmp0_apply.a(_this__u8e3s4.rl_1.al_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.rl());
+            raise.eh(_this__u8e3s4.tl());
             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.pl_1);
+            var tmp1_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_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.rl());
+            raise.eh(_this__u8e3s4.tl());
             tmp$ret$2 = tmp1_also;
             var tmp2_nel = tmp$ret$2;
             tmp$ret$3 = nonEmptyListOf(tmp2_nel, []);
@@ -4400,10 +4417,10 @@
         // 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.pl_1);
+        var tmp1_also_0 = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseEnumTypeEntries.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$5 = tmp1_also_0;
         var tmp2_nel_0 = tmp$ret$5;
         tmp$ret$6 = nonEmptyListOf(tmp2_nel_0, []);
@@ -4460,21 +4477,21 @@
       // 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.rl());
-      log(_this__u8e3s4.pl_1, $this);
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomType) {
-        tmp_0 = raise.eh(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.pl_1.yk_1));
+        tmp_0 = raise.eh(parseCustomRegex(_this__u8e3s4, $this, _this__u8e3s4.rl_1.al_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.pl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomType), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseRefinedTypeDeclaration.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4531,23 +4548,23 @@
       // 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.rl());
-      log(_this__u8e3s4.pl_1, $this);
+      raise.eh(_this__u8e3s4.tl());
+      log(_this__u8e3s4.rl_1, $this);
       var tmp$ret$2;
       // Inline function 'kotlin.also' call
-      var tmp0_subject = _this__u8e3s4.pl_1.xk_1;
+      var tmp0_subject = _this__u8e3s4.rl_1.zk_1;
       var tmp_0;
       if (tmp0_subject instanceof CustomRegex) {
-        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.pl_1.yk_1));
+        tmp_0 = new Refined(typeName, new Validator(_this__u8e3s4.rl_1.al_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.pl_1);
+        var tmp0_also = new WrongTokenException(getKClass(CustomRegex), _this__u8e3s4.rl_1);
         // Inline function 'kotlin.contracts.contract' call
         // Inline function 'community.flock.wirespec.compiler.core.parse.Parser.parseCustomRegex.<anonymous>.<anonymous>' call
-        raise.eh(_this__u8e3s4.rl());
+        raise.eh(_this__u8e3s4.tl());
         tmp$ret$0 = tmp0_also;
         var tmp1_nel = tmp$ret$0;
         tmp$ret$1 = nonEmptyListOf(tmp1_nel, []);
@@ -4556,7 +4573,7 @@
       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.rl());
+      raise.eh(_this__u8e3s4.tl());
       tmp$ret$2 = tmp2_also;
       tmp$ret$3 = tmp$ret$2;
       tmp$ret$4 = tmp$ret$3;
@@ -4594,7 +4611,7 @@
     return tmp$ret$9;
   }
   function log(_this__u8e3s4, $this) {
-    return $this.oh_1.kh('Parsing ' + _this__u8e3s4.xk_1 + ' at line ' + _this__u8e3s4.zk_1.al_1 + ' position ' + _this__u8e3s4.zk_1.bl_1);
+    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);
   }
   function Parser(logger) {
     this.oh_1 = logger;
@@ -4610,7 +4627,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.xk_1;
+      var tmp = element.zk_1;
       tmp$ret$0 = isInterface(tmp, WhiteSpace);
       if (!tmp$ret$0) {
         tmp0_filterNotTo.a(element);
@@ -4634,7 +4651,7 @@
       // 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.yk_1 + "', ";
+      tmp$ret$0 = "Eating: '" + tmp0_safe_receiver.al_1 + "', ";
       tmp$ret$1 = tmp$ret$0;
       tmp = tmp$ret$1;
     }
@@ -4642,14 +4659,14 @@
     var prev = tmp1_elvis_lhs == null ? '' : tmp1_elvis_lhs;
     var tmp$ret$3;
     // Inline function 'kotlin.run' call
-    var tmp0_run = $this.pl_1;
+    var tmp0_run = $this.rl_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.yk_1 + "'";
+    tmp$ret$2 = "Current: '" + tmp0_run.al_1 + "'";
     tmp$ret$3 = tmp$ret$2;
     var curr = tmp$ret$3;
-    var tmp2_safe_receiver = $this.ql_1;
+    var tmp2_safe_receiver = $this.sl_1;
     var tmp_0;
     if (tmp2_safe_receiver == null) {
       tmp_0 = null;
@@ -4659,13 +4676,13 @@
       // 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.yk_1 + "'";
+      tmp$ret$4 = ", Next: '" + tmp2_safe_receiver.al_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.nl_1.kh(prev + curr + next);
+    $this.pl_1.kh(prev + curr + next);
     tmp$ret$6 = Unit_getInstance();
     return tmp$ret$6;
   }
@@ -4685,7 +4702,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.ol_1.e();
+      tmp$ret$0 = $this.ql_1.e();
       var tmp1_success = tmp$ret$0;
       tmp$ret$1 = _Result___init__impl__xyqfz8(tmp1_success);
       tmp = tmp$ret$1;
@@ -4716,8 +4733,8 @@
     return tmp$ret$4;
   }
   function TokenProvider(logger, tokenIterator) {
-    this.nl_1 = logger;
-    this.ol_1 = tokenIterator;
+    this.pl_1 = logger;
+    this.ql_1 = tokenIterator;
     var tmp = this;
     var tmp0_elvis_lhs = nextToken(this);
     var tmp_0;
@@ -4726,14 +4743,14 @@
     } else {
       tmp_0 = tmp0_elvis_lhs;
     }
-    tmp.pl_1 = tmp_0;
-    this.ql_1 = nextToken(this);
+    tmp.rl_1 = tmp_0;
+    this.sl_1 = nextToken(this);
     printTokens$default(this);
   }
   protoOf(TokenProvider).d = function () {
-    return !(this.ql_1 == null);
+    return !(this.sl_1 == null);
   };
-  protoOf(TokenProvider).rl = function () {
+  protoOf(TokenProvider).tl = function () {
     var tmp$ret$6;
     // Inline function 'arrow.core.raise.either' call
     var tmp$ret$5;
@@ -4747,21 +4764,21 @@
     try {
       var tmp$ret$1;
       // Inline function 'arrow.core.raise.either.<anonymous>' call
-      var previousToken = this.pl_1;
+      var previousToken = this.rl_1;
       var tmp_0 = this;
-      var tmp0_elvis_lhs = this.ql_1;
+      var tmp0_elvis_lhs = this.sl_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.zk_1);
+        var tmp0_nel = new NextException(previousToken.bl_1);
         tmp$ret$0 = nonEmptyListOf(tmp0_nel, []);
         raise.dh(tmp$ret$0);
       } else {
         tmp_1 = tmp0_elvis_lhs;
       }
-      tmp_0.pl_1 = tmp_1;
-      this.ql_1 = nextToken(this);
+      tmp_0.rl_1 = tmp_1;
+      this.sl_1 = nextToken(this);
       printTokens(this, previousToken);
       tmp$ret$1 = Unit_getInstance();
       var res = tmp$ret$1;
@@ -4803,15 +4820,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.sl_1 = idx;
-    this.tl_1 = length;
+    this.ul_1 = idx;
+    this.vl_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.sl_1 + ', length=' + this.tl_1 + ')';
+    return 'IdxAndLength(idx=' + this.ul_1 + ', length=' + this.vl_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.sl_1;
-    result = imul(result, 31) + this.tl_1 | 0;
+    var result = this.ul_1;
+    result = imul(result, 31) + this.vl_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -4820,9 +4837,9 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.sl_1 === tmp0_other_with_cast.sl_1))
+    if (!(this.ul_1 === tmp0_other_with_cast.ul_1))
       return false;
-    if (!(this.tl_1 === tmp0_other_with_cast.tl_1))
+    if (!(this.vl_1 === tmp0_other_with_cast.vl_1))
       return false;
     return true;
   };
@@ -4830,26 +4847,26 @@
     line = line === VOID ? 1 : line;
     position = position === VOID ? 1 : position;
     idxAndLength = idxAndLength === VOID ? new IdxAndLength() : idxAndLength;
-    this.al_1 = line;
-    this.bl_1 = position;
-    this.cl_1 = idxAndLength;
+    this.cl_1 = line;
+    this.dl_1 = position;
+    this.el_1 = idxAndLength;
   }
-  protoOf(Coordinates).ul = function (line, position, idxAndLength) {
+  protoOf(Coordinates).wl = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).vl = function (line, position, idxAndLength, $super) {
-    line = line === VOID ? this.al_1 : line;
-    position = position === VOID ? this.bl_1 : position;
-    idxAndLength = idxAndLength === VOID ? this.cl_1 : idxAndLength;
-    return $super === VOID ? this.ul(line, position, idxAndLength) : $super.ul.call(this, 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).toString = function () {
-    return 'Coordinates(line=' + this.al_1 + ', position=' + this.bl_1 + ', idxAndLength=' + this.cl_1 + ')';
+    return 'Coordinates(line=' + this.cl_1 + ', position=' + this.dl_1 + ', idxAndLength=' + this.el_1 + ')';
   };
   protoOf(Coordinates).hashCode = function () {
-    var result = this.al_1;
-    result = imul(result, 31) + this.bl_1 | 0;
-    result = imul(result, 31) + this.cl_1.hashCode() | 0;
+    var result = this.cl_1;
+    result = imul(result, 31) + this.dl_1 | 0;
+    result = imul(result, 31) + this.el_1.hashCode() | 0;
     return result;
   };
   protoOf(Coordinates).equals = function (other) {
@@ -4858,35 +4875,35 @@
     if (!(other instanceof Coordinates))
       return false;
     var tmp0_other_with_cast = other instanceof Coordinates ? other : THROW_CCE();
-    if (!(this.al_1 === tmp0_other_with_cast.al_1))
+    if (!(this.cl_1 === tmp0_other_with_cast.cl_1))
       return false;
-    if (!(this.bl_1 === tmp0_other_with_cast.bl_1))
+    if (!(this.dl_1 === tmp0_other_with_cast.dl_1))
       return false;
-    if (!this.cl_1.equals(tmp0_other_with_cast.cl_1))
+    if (!this.el_1.equals(tmp0_other_with_cast.el_1))
       return false;
     return true;
   };
   function Token(type, value, coordinates) {
-    this.xk_1 = type;
-    this.yk_1 = value;
-    this.zk_1 = coordinates;
+    this.zk_1 = type;
+    this.al_1 = value;
+    this.bl_1 = coordinates;
   }
-  protoOf(Token).wl = function (type, value, coordinates) {
+  protoOf(Token).yl = function (type, value, coordinates) {
     return new Token(type, value, coordinates);
   };
-  protoOf(Token).el = function (type, value, coordinates, $super) {
-    type = type === VOID ? this.xk_1 : type;
-    value = value === VOID ? this.yk_1 : value;
-    coordinates = coordinates === VOID ? this.zk_1 : coordinates;
-    return $super === VOID ? this.wl(type, value, coordinates) : $super.wl.call(this, 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).toString = function () {
-    return 'Token(type=' + this.xk_1 + ', value=' + this.yk_1 + ', coordinates=' + this.zk_1 + ')';
+    return 'Token(type=' + this.zk_1 + ', value=' + this.al_1 + ', coordinates=' + this.bl_1 + ')';
   };
   protoOf(Token).hashCode = function () {
-    var result = hashCode(this.xk_1);
-    result = imul(result, 31) + getStringHashCode(this.yk_1) | 0;
-    result = imul(result, 31) + this.zk_1.hashCode() | 0;
+    var result = hashCode(this.zk_1);
+    result = imul(result, 31) + getStringHashCode(this.al_1) | 0;
+    result = imul(result, 31) + this.bl_1.hashCode() | 0;
     return result;
   };
   protoOf(Token).equals = function (other) {
@@ -4895,19 +4912,19 @@
     if (!(other instanceof Token))
       return false;
     var tmp0_other_with_cast = other instanceof Token ? other : THROW_CCE();
-    if (!equals(this.xk_1, tmp0_other_with_cast.xk_1))
+    if (!equals(this.zk_1, tmp0_other_with_cast.zk_1))
       return false;
-    if (!(this.yk_1 === tmp0_other_with_cast.yk_1))
+    if (!(this.al_1 === tmp0_other_with_cast.al_1))
       return false;
-    if (!this.zk_1.equals(tmp0_other_with_cast.zk_1))
+    if (!this.bl_1.equals(tmp0_other_with_cast.bl_1))
       return false;
     return true;
   };
   function plus_1(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.sl_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.ul_1 + length | 0, length);
   }
   function plus_2(_this__u8e3s4, length) {
-    return _this__u8e3s4.vl(VOID, _this__u8e3s4.bl_1 + length | 0, plus_1(_this__u8e3s4.cl_1, length));
+    return _this__u8e3s4.xl(VOID, _this__u8e3s4.dl_1 + length | 0, plus_1(_this__u8e3s4.el_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     var tmp$ret$1;
@@ -4929,7 +4946,7 @@
     var tmp0_subject = type;
     var tmp;
     if (tmp0_subject instanceof NewLine) {
-      tmp = new Coordinates(_this__u8e3s4.al_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.cl_1, value.length));
+      tmp = new Coordinates(_this__u8e3s4.cl_1 + 1 | 0, VOID, plus_1(_this__u8e3s4.el_1, value.length));
     } else {
       tmp = plus_2(_this__u8e3s4, value.length);
     }
@@ -4937,7 +4954,7 @@
   }
   function lastCoordinates(_this__u8e3s4) {
     var tmp0_safe_receiver = lastOrNull(_this__u8e3s4);
-    var tmp1_elvis_lhs = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.zk_1;
+    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) {
@@ -4947,7 +4964,7 @@
     $l$1: do {
       $l$0: do {
         var token = findToken($this, lastCoordinates(tokens_0), source_0);
-        var newSource = removePrefix(source_0, token.yk_1);
+        var newSource = removePrefix(source_0, token.al_1);
         var newTokens = plus_0(tokens_0, token);
         var tmp;
         var tmp$ret$0;
@@ -5173,7 +5190,7 @@
   }
   function EndOfProgram() {
     EndOfProgram_instance = this;
-    this.yl_1 = 'EOP';
+    this.am_1 = 'EOP';
   }
   var EndOfProgram_instance;
   function EndOfProgram_getInstance() {
@@ -5206,7 +5223,7 @@
     }
     return tmp;
   };
-  protoOf(Logger).wk = function (s, block) {
+  protoOf(Logger).yk = function (s, block) {
     var tmp$ret$1;
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
@@ -5277,25 +5294,25 @@
   protoOf(WirespecEmitter).bk = withLogging_5;
   protoOf(WirespecEmitter).ck = withLogging_6;
   protoOf(WirespecEmitter).ek = withLogging_7;
-  protoOf(WsTypeDef).xl = name;
-  protoOf(WsEnumTypeDef).xl = name;
-  protoOf(WsRefinedTypeDef).xl = name;
-  protoOf(WhiteSpaceExceptNewLine).xl = name;
-  protoOf(NewLine).xl = name;
-  protoOf(LeftCurly).xl = name;
-  protoOf(Colon).xl = name;
-  protoOf(Comma).xl = name;
-  protoOf(QuestionMark).xl = name;
-  protoOf(Brackets).xl = name;
-  protoOf(WsString).xl = name;
-  protoOf(WsInteger).xl = name;
-  protoOf(WsBoolean).xl = name;
-  protoOf(RightCurly).xl = name;
-  protoOf(CustomValue).xl = name;
-  protoOf(CustomType).xl = name;
-  protoOf(CustomRegex).xl = name;
-  protoOf(Invalid).xl = name;
-  protoOf(EndOfProgram).xl = name;
+  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;
   //endregion
   //region block: init
   DEFAULT_PACKAGE_NAME = 'community.flock.wirespec.generated';
@@ -5330,7 +5347,7 @@
   _.$_$.z = Type_Boolean_getInstance;
   _.$_$.a1 = Type_Integer_getInstance;
   _.$_$.b1 = Type_String_getInstance;
-  _.$_$.c1 = Companion_getInstance_1;
+  _.$_$.c1 = Companion_getInstance_2;
   _.$_$.d1 = Wirespec_getInstance;
   //endregion
   return _;