@guardian/feast-multiplatform-library 17.0.0 → 17.1.0

package/kotlin/feast-multiplatform-library-library.js

@@ -9,9 +9,9 @@
   var getBooleanHashCode = kotlin_kotlin.$_$.z6;
   var equals = kotlin_kotlin.$_$.y6;
   var initMetadataForClass = kotlin_kotlin.$_$.e7;
-  var Regex_init_$Create$ = kotlin_kotlin.$_$.r;
+  var Regex_init_$Create$ = kotlin_kotlin.$_$.k1;
   var numberToInt = kotlin_kotlin.$_$.y7;
-  var Unit_instance = kotlin_kotlin.$_$.n3;
+  var Unit_instance = kotlin_kotlin.$_$.u;
   var round = kotlin_kotlin.$_$.d8;
   var replace = kotlin_kotlin.$_$.z8;
   var initMetadataForObject = kotlin_kotlin.$_$.j7;
@@ -20,8 +20,8 @@
   var noWhenBranchMatchedException = kotlin_kotlin.$_$.cb;
   var isBlank = kotlin_kotlin.$_$.w8;
   var collectionSizeOrDefault = kotlin_kotlin.$_$.d4;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
-  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.d1;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.w;
+  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.w1;
   var charArrayOf = kotlin_kotlin.$_$.s6;
   var indexOfAny = kotlin_kotlin.$_$.t8;
   var THROW_CCE = kotlin_kotlin.$_$.ia;
@@ -31,26 +31,26 @@
   var to = kotlin_kotlin.$_$.gb;
   var take = kotlin_kotlin.$_$.g9;
   var drop = kotlin_kotlin.$_$.r8;
-  var _Result___get_value__impl__bjfvqg = kotlin_kotlin.$_$.k1;
-  var _Result___init__impl__xyqfz8 = kotlin_kotlin.$_$.h1;
-  var Companion_instance = kotlin_kotlin.$_$.i3;
-  var _Result___get_isSuccess__impl__sndoy8 = kotlin_kotlin.$_$.j1;
-  var StringSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.o;
+  var _Result___get_value__impl__bjfvqg = kotlin_kotlin.$_$.d2;
+  var _Result___init__impl__xyqfz8 = kotlin_kotlin.$_$.a2;
+  var Companion_instance = kotlin_kotlin.$_$.p;
+  var _Result___get_isSuccess__impl__sndoy8 = kotlin_kotlin.$_$.c2;
+  var StringSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.m;
   var ArrayListSerializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.o1;
   var JsonElementSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.b;
-  var LazyThreadSafetyMode_PUBLICATION_getInstance = kotlin_kotlin.$_$.c;
+  var LazyThreadSafetyMode_PUBLICATION_getInstance = kotlin_kotlin.$_$.v;
   var lazy = kotlin_kotlin.$_$.ab;
   var initMetadataForCompanion = kotlin_kotlin.$_$.f7;
   var PluginGeneratedSerialDescriptor = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.u1;
-  var UnknownFieldException_init_$Create$ = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.b;
+  var UnknownFieldException_init_$Create$ = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.o;
   var typeParametersSerializers = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.q1;
   var GeneratedSerializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.r1;
   var throwMissingFieldException = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.y1;
   var objectCreate = kotlin_kotlin.$_$.z7;
   var getStringHashCode = kotlin_kotlin.$_$.c7;
   var hashCode = kotlin_kotlin.$_$.d7;
-  var IntSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.n;
-  var FloatSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.m;
+  var IntSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.l;
+  var FloatSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.k;
   var Default_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.a;
   var getKClass = kotlin_kotlin.$_$.m8;
   var arrayOf = kotlin_kotlin.$_$.ta;
@@ -63,17 +63,17 @@
   var get_float = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.d;
   var mapCapacity = kotlin_kotlin.$_$.f5;
   var coerceAtLeast = kotlin_kotlin.$_$.f8;
-  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.m;
-  var Exception_init_$Create$ = kotlin_kotlin.$_$.u;
+  var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.f1;
+  var Exception_init_$Create$ = kotlin_kotlin.$_$.n1;
   var createFailure = kotlin_kotlin.$_$.va;
   var IndexOutOfBoundsException = kotlin_kotlin.$_$.ea;
   var ClassCastException = kotlin_kotlin.$_$.y9;
   var IllegalArgumentException = kotlin_kotlin.$_$.da;
   var SerializationException = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.f2;
   var get_nullable = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.r;
-  var BooleanSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.k;
-  var DoubleSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.l;
-  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.e;
+  var BooleanSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.i;
+  var DoubleSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.j;
+  var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.x;
   var substring = kotlin_kotlin.$_$.f9;
   var charSequenceLength = kotlin_kotlin.$_$.w6;
   var get_jsonObject = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.f;
@@ -90,7 +90,7 @@
   var emptySet = kotlin_kotlin.$_$.t4;
   var listOf_0 = kotlin_kotlin.$_$.d5;
   var contains = kotlin_kotlin.$_$.e4;
-  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.x;
+  var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.q1;
   var throwOnFailure = kotlin_kotlin.$_$.eb;
   //endregion
   //region block: pre-declaration
@@ -153,29 +153,29 @@
     max = max === VOID ? null : max;
     unit = unit === VOID ? null : unit;
     usCust = usCust === VOID ? null : usCust;
-    this.a1d_1 = min;
-    this.b1d_1 = max;
-    this.c1d_1 = unit;
-    this.d1d_1 = usCust;
+    this.x1c_1 = min;
+    this.y1c_1 = max;
+    this.z1c_1 = unit;
+    this.a1d_1 = usCust;
   }
-  protoOf(Amount).e1d = function (min, max, unit, usCust) {
+  protoOf(Amount).b1d = function (min, max, unit, usCust) {
     return new Amount(min, max, unit, usCust);
   };
-  protoOf(Amount).f1d = function (min, max, unit, usCust, $super) {
-    min = min === VOID ? this.a1d_1 : min;
-    max = max === VOID ? this.b1d_1 : max;
-    unit = unit === VOID ? this.c1d_1 : unit;
-    usCust = usCust === VOID ? this.d1d_1 : usCust;
-    return $super === VOID ? this.e1d(min, max, unit, usCust) : $super.e1d.call(this, min, max, unit, usCust);
+  protoOf(Amount).c1d = function (min, max, unit, usCust, $super) {
+    min = min === VOID ? this.x1c_1 : min;
+    max = max === VOID ? this.y1c_1 : max;
+    unit = unit === VOID ? this.z1c_1 : unit;
+    usCust = usCust === VOID ? this.a1d_1 : usCust;
+    return $super === VOID ? this.b1d(min, max, unit, usCust) : $super.b1d.call(this, min, max, unit, usCust);
   };
   protoOf(Amount).toString = function () {
-    return 'Amount(min=' + this.a1d_1 + ', max=' + this.b1d_1 + ', unit=' + toString(this.c1d_1) + ', usCust=' + this.d1d_1 + ')';
+    return 'Amount(min=' + this.x1c_1 + ', max=' + this.y1c_1 + ', unit=' + toString(this.z1c_1) + ', usCust=' + this.a1d_1 + ')';
   };
   protoOf(Amount).hashCode = function () {
-    var result = getNumberHashCode(this.a1d_1);
-    result = imul(result, 31) + (this.b1d_1 == null ? 0 : getNumberHashCode(this.b1d_1)) | 0;
-    result = imul(result, 31) + (this.c1d_1 == null ? 0 : this.c1d_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.d1d_1 == null ? 0 : getBooleanHashCode(this.d1d_1)) | 0;
+    var result = getNumberHashCode(this.x1c_1);
+    result = imul(result, 31) + (this.y1c_1 == null ? 0 : getNumberHashCode(this.y1c_1)) | 0;
+    result = imul(result, 31) + (this.z1c_1 == null ? 0 : this.z1c_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.a1d_1 == null ? 0 : getBooleanHashCode(this.a1d_1)) | 0;
     return result;
   };
   protoOf(Amount).equals = function (other) {
@@ -183,24 +183,24 @@
       return true;
     if (!(other instanceof Amount))
       return false;
-    if (!equals(this.a1d_1, other.a1d_1))
+    if (!equals(this.x1c_1, other.x1c_1))
       return false;
-    if (!equals(this.b1d_1, other.b1d_1))
+    if (!equals(this.y1c_1, other.y1c_1))
       return false;
-    if (!equals(this.c1d_1, other.c1d_1))
+    if (!equals(this.z1c_1, other.z1c_1))
       return false;
-    if (!(this.d1d_1 == other.d1d_1))
+    if (!(this.a1d_1 == other.a1d_1))
       return false;
     return true;
   };
   function FormatUtils$applySmartPunctuation$lambda(matchResult) {
-    return '\u201C' + matchResult.sb().b1(2) + '\u201D';
+    return '\u201C' + matchResult.sb().z(2) + '\u201D';
   }
   function FormatUtils() {
     FormatUtils_instance = this;
-    this.g1d_1 = Regex_init_$Create$('(["])(.*?)(["])');
+    this.d1d_1 = Regex_init_$Create$('(["])(.*?)(["])');
   }
-  protoOf(FormatUtils).h1d = function (number) {
+  protoOf(FormatUtils).e1d = function (number) {
     if (number === 0.0)
       return '0';
     var integerPart = numberToInt(number);
@@ -208,9 +208,9 @@
     var fractionalPart = number - integerPart;
     return (0.0 <= fractionalPart ? fractionalPart <= 0.125 : false) ? integerPartStr : (0.125 <= fractionalPart ? fractionalPart <= 0.291667 : false) ? integerPartStr + '\xBC' : (0.291667 <= fractionalPart ? fractionalPart <= 0.416667 : false) ? integerPartStr + '\u2153' : (0.416667 <= fractionalPart ? fractionalPart <= 0.583333 : false) ? integerPartStr + '\xBD' : (0.583333 <= fractionalPart ? fractionalPart <= 0.708333 : false) ? integerPartStr + '\u2154' : (0.708333 <= fractionalPart ? fractionalPart <= 0.875 : false) ? integerPartStr + '\xBE' : '' + (integerPart + 1 | 0);
   };
-  protoOf(FormatUtils).i1d = function (number, decimals, fraction) {
+  protoOf(FormatUtils).f1d = function (number, decimals, fraction) {
     if (fraction) {
-      return this.h1d(number);
+      return this.e1d(number);
     } else {
       var multiplier = 1.0;
       // Inline function 'kotlin.repeat' call
@@ -232,8 +232,8 @@
       return tmp;
     }
   };
-  protoOf(FormatUtils).j1d = function (text) {
-    var withQuotes = this.g1d_1.xa(text, FormatUtils$applySmartPunctuation$lambda);
+  protoOf(FormatUtils).g1d = function (text) {
+    var withQuotes = this.d1d_1.xa(text, FormatUtils$applySmartPunctuation$lambda);
     return replace(replace(withQuotes, "'", '\u2019'), ' - ', ' \u2013 ');
   };
   var FormatUtils_instance;
@@ -243,9 +243,9 @@
     return FormatUtils_instance;
   }
   function TemplateSession(densityTable) {
-    this.k1d_1 = densityTable;
+    this.h1d_1 = densityTable;
   }
-  protoOf(TemplateSession).l1d = function (element) {
+  protoOf(TemplateSession).i1d = function (element) {
     var tmp;
     if (element.temperatureFanC == null) {
       tmp = null;
@@ -283,11 +283,11 @@
       tmp_5 = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp_5 = '/gas mark ' + FormatUtils_getInstance().h1d(tmp3_safe_receiver);
+      tmp_5 = '/gas mark ' + FormatUtils_getInstance().e1d(tmp3_safe_receiver);
     }
     return joinToString(listOfNotNull([tmp_2, fanTempC, tmp_4, tmp_5]), '');
   };
-  protoOf(TemplateSession).m1d = function (element, factor, measuringSystem) {
+  protoOf(TemplateSession).j1d = function (element, factor, measuringSystem) {
     var tmp = !(element.min === element.max) ? element.max : null;
     var tmp0_safe_receiver = element.unit;
     var tmp_0;
@@ -295,7 +295,7 @@
       tmp_0 = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp_0 = Units_getInstance().m1e(tmp0_safe_receiver);
+      tmp_0 = Units_getInstance().j1e(tmp0_safe_receiver);
     }
     var amount = new Amount(element.min, tmp, tmp_0, element.ingredient === 'butter' ? true : element.usCust);
     var factorToUse = !element.scale ? 1.0 : factor;
@@ -305,7 +305,7 @@
       tmp_1 = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp_1 = this.k1d_1.q1e(tmp1_safe_receiver);
+      tmp_1 = this.h1d_1.n1e(tmp1_safe_receiver);
     }
     var density = tmp_1;
     var tmp_2;
@@ -315,40 +315,40 @@
       tmp_2 = measuringSystem;
     }
     var targetSystem = tmp_2;
-    amount = UnitConversions_getInstance().a1f(amount, targetSystem, factorToUse, density);
-    var tmp2_subject = amount.c1d_1;
-    var decimals = equals(tmp2_subject, Units_getInstance().o1d_1) || (equals(tmp2_subject, Units_getInstance().s1d_1) || equals(tmp2_subject, Units_getInstance().f1e_1)) || (equals(tmp2_subject, Units_getInstance().x1d_1) || equals(tmp2_subject, Units_getInstance().v1d_1) || (equals(tmp2_subject, Units_getInstance().y1d_1) || equals(tmp2_subject, Units_getInstance().w1d_1))) ? 0 : equals(tmp2_subject, Units_getInstance().g1e_1) || equals(tmp2_subject, Units_getInstance().h1e_1) ? 1 : 1;
-    var tmp3_subject = amount.c1d_1;
-    var fraction = equals(tmp3_subject, Units_getInstance().t1d_1) || (equals(tmp3_subject, Units_getInstance().s1d_1) || equals(tmp3_subject, Units_getInstance().g1e_1)) || (equals(tmp3_subject, Units_getInstance().o1d_1) || (equals(tmp3_subject, Units_getInstance().p1d_1) || equals(tmp3_subject, Units_getInstance().f1e_1))) ? false : equals(tmp3_subject, Units_getInstance().v1d_1) || equals(tmp3_subject, Units_getInstance().w1d_1) || (equals(tmp3_subject, Units_getInstance().y1d_1) || equals(tmp3_subject, Units_getInstance().x1d_1)) ? amount.a1d_1 < 1.0 : true;
+    amount = UnitConversions_getInstance().x1e(amount, targetSystem, factorToUse, density);
+    var tmp2_subject = amount.z1c_1;
+    var decimals = equals(tmp2_subject, Units_getInstance().l1d_1) || (equals(tmp2_subject, Units_getInstance().p1d_1) || equals(tmp2_subject, Units_getInstance().c1e_1)) || (equals(tmp2_subject, Units_getInstance().u1d_1) || equals(tmp2_subject, Units_getInstance().s1d_1) || (equals(tmp2_subject, Units_getInstance().v1d_1) || equals(tmp2_subject, Units_getInstance().t1d_1))) ? 0 : equals(tmp2_subject, Units_getInstance().d1e_1) || equals(tmp2_subject, Units_getInstance().e1e_1) ? 1 : 1;
+    var tmp3_subject = amount.z1c_1;
+    var fraction = equals(tmp3_subject, Units_getInstance().q1d_1) || (equals(tmp3_subject, Units_getInstance().p1d_1) || equals(tmp3_subject, Units_getInstance().d1e_1)) || (equals(tmp3_subject, Units_getInstance().l1d_1) || (equals(tmp3_subject, Units_getInstance().m1d_1) || equals(tmp3_subject, Units_getInstance().c1e_1))) ? false : equals(tmp3_subject, Units_getInstance().s1d_1) || equals(tmp3_subject, Units_getInstance().t1d_1) || (equals(tmp3_subject, Units_getInstance().v1d_1) || equals(tmp3_subject, Units_getInstance().u1d_1)) ? amount.x1c_1 < 1.0 : true;
     var tmp_3;
-    if (!(amount.c1d_1 == null)) {
+    if (!(amount.z1c_1 == null)) {
       var tmp_4;
-      var tmp0 = amount.a1d_1;
-      var tmp4_elvis_lhs = amount.b1d_1;
+      var tmp0 = amount.x1c_1;
+      var tmp4_elvis_lhs = amount.y1c_1;
       // Inline function 'kotlin.math.max' call
-      var b = tmp4_elvis_lhs == null ? amount.a1d_1 : tmp4_elvis_lhs;
+      var b = tmp4_elvis_lhs == null ? amount.x1c_1 : tmp4_elvis_lhs;
       if (Math.max(tmp0, b) > 1.1) {
-        tmp_4 = ' ' + amount.c1d_1.e1f_1;
+        tmp_4 = ' ' + amount.z1c_1.b1f_1;
       } else {
-        tmp_4 = ' ' + amount.c1d_1.d1f_1;
+        tmp_4 = ' ' + amount.z1c_1.a1f_1;
       }
       tmp_3 = tmp_4;
     } else {
       tmp_3 = '';
     }
     var unitString = tmp_3;
-    var tmp_5 = FormatUtils_getInstance().i1d(amount.a1d_1, decimals, fraction);
-    var tmp5_safe_receiver = amount.b1d_1;
+    var tmp_5 = FormatUtils_getInstance().f1d(amount.x1c_1, decimals, fraction);
+    var tmp5_safe_receiver = amount.y1c_1;
     var tmp_6;
     if (tmp5_safe_receiver == null) {
       tmp_6 = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp_6 = '-' + FormatUtils_getInstance().i1d(tmp5_safe_receiver, decimals, fraction);
+      tmp_6 = '-' + FormatUtils_getInstance().f1d(tmp5_safe_receiver, decimals, fraction);
     }
     return joinToString(listOfNotNull([tmp_5, tmp_6, unitString]), '');
   };
-  protoOf(TemplateSession).i1f = function (element, factor, measuringSystem) {
+  protoOf(TemplateSession).f1f = function (element, factor, measuringSystem) {
     var tmp;
     if (element instanceof TemplateConst) {
       tmp = element.value;
@@ -374,17 +374,17 @@
           tmp_1 = tmp_3;
         }
         if (tmp_1) {
-          tmp_0 = this.m1d(element, factor, measuringSystem);
+          tmp_0 = this.j1d(element, factor, measuringSystem);
         } else {
           if (measuringSystem instanceof USCustomaryWithMetric) {
             var tmp_4;
             // Inline function 'kotlin.text.isNullOrBlank' call
             var this_0 = element.unit;
             if (this_0 == null || isBlank(this_0)) {
-              tmp_4 = this.m1d(element, factor, USCustomary_instance);
+              tmp_4 = this.j1d(element, factor, USCustomary_instance);
             } else {
-              var cupsPart = this.m1d(element, factor, USCustomary_instance);
-              var metricPart = this.m1d(element, factor, Metric_instance);
+              var cupsPart = this.j1d(element, factor, USCustomary_instance);
+              var metricPart = this.j1d(element, factor, Metric_instance);
               var tmp_5;
               if (cupsPart === metricPart) {
                 tmp_5 = cupsPart;
@@ -400,10 +400,10 @@
               // Inline function 'kotlin.text.isNullOrBlank' call
               var this_1 = element.unit;
               if (this_1 == null || isBlank(this_1)) {
-                tmp_6 = this.m1d(element, factor, USCustomary_instance);
+                tmp_6 = this.j1d(element, factor, USCustomary_instance);
               } else {
-                var cupsPart_0 = this.m1d(element, factor, USCustomary_instance);
-                var imperialPart = this.m1d(element, factor, Imperial_instance);
+                var cupsPart_0 = this.j1d(element, factor, USCustomary_instance);
+                var imperialPart = this.j1d(element, factor, Imperial_instance);
                 var tmp_7;
                 if (cupsPart_0 === imperialPart) {
                   tmp_7 = cupsPart_0;
@@ -421,22 +421,22 @@
                   tmp_8 = null;
                 } else {
                   // Inline function 'kotlin.let' call
-                  tmp_8 = Units_getInstance().m1e(tmp2_safe_receiver);
+                  tmp_8 = Units_getInstance().j1e(tmp2_safe_receiver);
                 }
                 var unit = tmp_8;
                 var tmp_9;
-                if (unit == null || equals(unit, Units_getInstance().v1d_1) || equals(unit, Units_getInstance().w1d_1) || equals(unit, Units_getInstance().x1d_1) || equals(unit, Units_getInstance().y1d_1)) {
-                  tmp_9 = this.m1d(element, factor, USCustomary_instance);
+                if (unit == null || equals(unit, Units_getInstance().s1d_1) || equals(unit, Units_getInstance().t1d_1) || equals(unit, Units_getInstance().u1d_1) || equals(unit, Units_getInstance().v1d_1)) {
+                  tmp_9 = this.j1d(element, factor, USCustomary_instance);
                 } else {
-                  var cupsPart_1 = this.m1d(element, factor, USCustomary_instance);
+                  var cupsPart_1 = this.j1d(element, factor, USCustomary_instance);
                   var tmp_10;
-                  if (equals(unit.f1f_1, UnitType_VOLUME_getInstance())) {
+                  if (equals(unit.c1f_1, UnitType_VOLUME_getInstance())) {
                     tmp_10 = cupsPart_1;
                   } else {
-                    tmp_10 = this.m1d(element, factor, Imperial_instance);
+                    tmp_10 = this.j1d(element, factor, Imperial_instance);
                   }
                   var imperialPart_0 = tmp_10;
-                  var metricPart_0 = this.m1d(element, factor, Metric_instance);
+                  var metricPart_0 = this.j1d(element, factor, Metric_instance);
                   var tmp_11;
                   if (cupsPart_1 === metricPart_0 && cupsPart_1 === imperialPart_0) {
                     tmp_11 = metricPart_0;
@@ -457,7 +457,7 @@
         tmp = tmp_0;
       } else {
         if (element instanceof OvenTemperaturePlaceholder) {
-          tmp = this.l1d(element);
+          tmp = this.i1d(element);
         } else {
           noWhenBranchMatchedException();
         }
@@ -465,22 +465,22 @@
     }
     return tmp;
   };
-  protoOf(TemplateSession).j1f = function (template, factor, measuringSystem) {
+  protoOf(TemplateSession).g1f = function (template, factor, measuringSystem) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = template.k1f_1;
+    var this_0 = template.h1f_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
-    var _iterator__ex2g4s = this_0.s();
-    while (_iterator__ex2g4s.t()) {
-      var item = _iterator__ex2g4s.u();
-      var tmp$ret$0 = this.i1f(item, factor, measuringSystem);
-      destination.w(tmp$ret$0);
+    var _iterator__ex2g4s = this_0.q();
+    while (_iterator__ex2g4s.r()) {
+      var item = _iterator__ex2g4s.s();
+      var tmp$ret$2 = this.f1f(item, factor, measuringSystem);
+      destination.u(tmp$ret$2);
     }
     var renderedParts = destination;
-    return FormatUtils_getInstance().j1d(joinToString(renderedParts, ''));
+    return FormatUtils_getInstance().g1d(joinToString(renderedParts, ''));
   };
   protoOf(TemplateSession).scaleAndConvertUnitRecipe = function (recipe, factor, measuringSystem) {
-    var tmp0_safe_receiver = recipe.x1f_1;
+    var tmp0_safe_receiver = recipe.u1f_1;
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
@@ -488,10 +488,10 @@
       // Inline function 'kotlin.collections.map' call
       // Inline function 'kotlin.collections.mapTo' call
       var destination = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_safe_receiver, 10));
-      var _iterator__ex2g4s = tmp0_safe_receiver.s();
-      while (_iterator__ex2g4s.t()) {
-        var item = _iterator__ex2g4s.u();
-        var tmp0_safe_receiver_0 = item.i1g_1;
+      var _iterator__ex2g4s = tmp0_safe_receiver.q();
+      while (_iterator__ex2g4s.r()) {
+        var item = _iterator__ex2g4s.s();
+        var tmp0_safe_receiver_0 = item.f1g_1;
         var tmp_0;
         if (tmp0_safe_receiver_0 == null) {
           tmp_0 = null;
@@ -499,31 +499,31 @@
           // Inline function 'kotlin.collections.map' call
           // Inline function 'kotlin.collections.mapTo' call
           var destination_0 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp0_safe_receiver_0, 10));
-          var _iterator__ex2g4s_0 = tmp0_safe_receiver_0.s();
-          while (_iterator__ex2g4s_0.t()) {
-            var item_0 = _iterator__ex2g4s_0.u();
-            var tmp0_safe_receiver_1 = item_0.q1g_1;
+          var _iterator__ex2g4s_0 = tmp0_safe_receiver_0.q();
+          while (_iterator__ex2g4s_0.r()) {
+            var item_0 = _iterator__ex2g4s_0.s();
+            var tmp0_safe_receiver_1 = item_0.n1g_1;
             var tmp_1;
             if (tmp0_safe_receiver_1 == null) {
               tmp_1 = null;
             } else {
               // Inline function 'kotlin.let' call
-              tmp_1 = wrapWithStrongTag(this.j1f(parseTemplate(tmp0_safe_receiver_1), factor, measuringSystem));
+              tmp_1 = wrapWithStrongTag(this.g1f(parseTemplate(tmp0_safe_receiver_1), factor, measuringSystem));
             }
             var tmp1_elvis_lhs = tmp_1;
-            var scaledText = tmp1_elvis_lhs == null ? item_0.r1g_1 : tmp1_elvis_lhs;
-            var tmp$ret$2 = item_0.t1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledText);
-            destination_0.w(tmp$ret$2);
+            var scaledText = tmp1_elvis_lhs == null ? item_0.o1g_1 : tmp1_elvis_lhs;
+            var tmp$ret$5 = item_0.q1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledText);
+            destination_0.u(tmp$ret$5);
           }
           tmp_0 = destination_0;
         }
-        var tmp$ret$5 = new IngredientsList(tmp_0, item.j1g_1);
-        destination.w(tmp$ret$5);
+        var tmp$ret$2 = new IngredientsList(tmp_0, item.g1g_1);
+        destination.u(tmp$ret$2);
       }
       tmp = destination;
     }
     var scaledIngredients = tmp;
-    var tmp1_safe_receiver = recipe.y1f_1;
+    var tmp1_safe_receiver = recipe.v1f_1;
     var tmp_2;
     if (tmp1_safe_receiver == null) {
       tmp_2 = null;
@@ -531,25 +531,25 @@
       // Inline function 'kotlin.collections.map' call
       // Inline function 'kotlin.collections.mapTo' call
       var destination_1 = ArrayList_init_$Create$(collectionSizeOrDefault(tmp1_safe_receiver, 10));
-      var _iterator__ex2g4s_1 = tmp1_safe_receiver.s();
-      while (_iterator__ex2g4s_1.t()) {
-        var item_1 = _iterator__ex2g4s_1.u();
-        var tmp0_safe_receiver_2 = item_1.v1g_1;
+      var _iterator__ex2g4s_1 = tmp1_safe_receiver.q();
+      while (_iterator__ex2g4s_1.r()) {
+        var item_1 = _iterator__ex2g4s_1.s();
+        var tmp0_safe_receiver_2 = item_1.s1g_1;
         var tmp_3;
         if (tmp0_safe_receiver_2 == null) {
           tmp_3 = null;
         } else {
           // Inline function 'kotlin.let' call
-          tmp_3 = this.j1f(parseTemplate(tmp0_safe_receiver_2), factor, measuringSystem);
+          tmp_3 = this.g1f(parseTemplate(tmp0_safe_receiver_2), factor, measuringSystem);
         }
         var description = tmp_3;
-        var tmp$ret$10 = item_1.y1g(description == null ? item_1.u1g_1 : description);
-        destination_1.w(tmp$ret$10);
+        var tmp$ret$10 = item_1.v1g(description == null ? item_1.r1g_1 : description);
+        destination_1.u(tmp$ret$10);
       }
       tmp_2 = destination_1;
     }
     var scaledInstructions = tmp_2;
-    return recipe.z1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledIngredients, scaledInstructions);
+    return recipe.w1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledIngredients, scaledInstructions);
   };
   function splitBeforeSuffix(value) {
     // Inline function 'kotlin.charArrayOf' call
@@ -569,8 +569,8 @@
   }
   function wrapWithStrongTag(value) {
     var _destruct__k2r9zo = splitBeforeSuffix(value);
-    var before = _destruct__k2r9zo.hd();
-    var after = _destruct__k2r9zo.id();
+    var before = _destruct__k2r9zo.ed();
+    var after = _destruct__k2r9zo.fd();
     // Inline function 'kotlin.text.orEmpty' call
     return '<strong>' + before + '<\/strong>' + (after == null ? '' : after);
   }
@@ -580,8 +580,7 @@
     // Inline function 'kotlin.map' call
     var tmp;
     if (_Result___get_isSuccess__impl__sndoy8(densityTable)) {
-      var tmp_0 = _Result___get_value__impl__bjfvqg(densityTable);
-      var it = (tmp_0 == null ? true : !(tmp_0 == null)) ? tmp_0 : THROW_CCE();
+      var it = _Result___get_value__impl__bjfvqg(densityTable);
       // Inline function 'kotlin.Companion.success' call
       var value = new TemplateSession(it);
       tmp = _Result___init__impl__xyqfz8(value);
@@ -605,7 +604,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.a1h_1 = [null, tmp_1, lazy(tmp_2, TableSchema$Companion$$childSerializers$_anonymous__48gmsb_0)];
+    tmp.x1g_1 = [null, tmp_1, lazy(tmp_2, TableSchema$Companion$$childSerializers$_anonymous__48gmsb_0)];
   }
   var Companion_instance_0;
   function Companion_getInstance() {
@@ -616,75 +615,75 @@
   function $serializer() {
     $serializer_instance = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.density.TableSchema', this, 3);
-    tmp0_serialDesc.rs('prepared_at', false);
-    tmp0_serialDesc.rs('key', false);
-    tmp0_serialDesc.rs('values', false);
-    this.b1h_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer).c1h = function (encoder, value) {
-    var tmp0_desc = this.b1h_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    var tmp2_cached = Companion_getInstance().a1h_1;
-    tmp1_output.wm(tmp0_desc, 0, value.d1h_1);
-    tmp1_output.ym(tmp0_desc, 1, tmp2_cached[1].h2(), value.e1h_1);
-    tmp1_output.ym(tmp0_desc, 2, tmp2_cached[2].h2(), value.f1h_1);
-    tmp1_output.jl(tmp0_desc);
-  };
-  protoOf($serializer).li = function (encoder, value) {
-    return this.c1h(encoder, value instanceof TableSchema ? value : THROW_CCE());
-  };
-  protoOf($serializer).mi = function (decoder) {
-    var tmp0_desc = this.b1h_1;
+    tmp0_serialDesc.os('prepared_at', false);
+    tmp0_serialDesc.os('key', false);
+    tmp0_serialDesc.os('values', false);
+    this.y1g_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer).z1g = function (encoder, value) {
+    var tmp0_desc = this.y1g_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance().x1g_1;
+    tmp1_output.tm(tmp0_desc, 0, value.a1h_1);
+    tmp1_output.vm(tmp0_desc, 1, tmp2_cached[1].f2(), value.b1h_1);
+    tmp1_output.vm(tmp0_desc, 2, tmp2_cached[2].f2(), value.c1h_1);
+    tmp1_output.gl(tmp0_desc);
+  };
+  protoOf($serializer).ii = function (encoder, value) {
+    return this.z1g(encoder, value instanceof TableSchema ? value : THROW_CCE());
+  };
+  protoOf($serializer).ji = function (decoder) {
+    var tmp0_desc = this.y1g_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
     var tmp4_local0 = null;
     var tmp5_local1 = null;
     var tmp6_local2 = null;
-    var tmp7_input = decoder.il(tmp0_desc);
-    var tmp8_cached = Companion_getInstance().a1h_1;
-    if (tmp7_input.yl()) {
-      tmp4_local0 = tmp7_input.sl(tmp0_desc, 0);
+    var tmp7_input = decoder.fl(tmp0_desc);
+    var tmp8_cached = Companion_getInstance().x1g_1;
+    if (tmp7_input.vl()) {
+      tmp4_local0 = tmp7_input.pl(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.ul(tmp0_desc, 1, tmp8_cached[1].h2(), tmp5_local1);
+      tmp5_local1 = tmp7_input.rl(tmp0_desc, 1, tmp8_cached[1].f2(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.ul(tmp0_desc, 2, tmp8_cached[2].h2(), tmp6_local2);
+      tmp6_local2 = tmp7_input.rl(tmp0_desc, 2, tmp8_cached[2].f2(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.zl(tmp0_desc);
+        tmp2_index = tmp7_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.sl(tmp0_desc, 0);
+            tmp4_local0 = tmp7_input.pl(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.ul(tmp0_desc, 1, tmp8_cached[1].h2(), tmp5_local1);
+            tmp5_local1 = tmp7_input.rl(tmp0_desc, 1, tmp8_cached[1].f2(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.ul(tmp0_desc, 2, tmp8_cached[2].h2(), tmp6_local2);
+            tmp6_local2 = tmp7_input.rl(tmp0_desc, 2, tmp8_cached[2].f2(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.jl(tmp0_desc);
+    tmp7_input.gl(tmp0_desc);
     return TableSchema_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer).ki = function () {
-    return this.b1h_1;
+  protoOf($serializer).hi = function () {
+    return this.y1g_1;
   };
-  protoOf($serializer).ts = function () {
-    var tmp0_cached = Companion_getInstance().a1h_1;
+  protoOf($serializer).qs = function () {
+    var tmp0_cached = Companion_getInstance().x1g_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    return [StringSerializer_getInstance(), tmp0_cached[1].h2(), tmp0_cached[2].h2()];
+    return [StringSerializer_getInstance(), tmp0_cached[1].f2(), tmp0_cached[2].f2()];
   };
   var $serializer_instance;
   function $serializer_getInstance() {
@@ -694,11 +693,11 @@
   }
   function TableSchema_init_$Init$(seen0, preparedAt, key, values, serializationConstructorMarker, $this) {
     if (!(7 === (7 & seen0))) {
-      throwMissingFieldException(seen0, 7, $serializer_getInstance().b1h_1);
+      throwMissingFieldException(seen0, 7, $serializer_getInstance().y1g_1);
     }
-    $this.d1h_1 = preparedAt;
-    $this.e1h_1 = key;
-    $this.f1h_1 = values;
+    $this.a1h_1 = preparedAt;
+    $this.b1h_1 = key;
+    $this.c1h_1 = values;
     return $this;
   }
   function TableSchema_init_$Create$(seen0, preparedAt, key, values, serializationConstructorMarker) {
@@ -706,17 +705,17 @@
   }
   function TableSchema(preparedAt, key, values) {
     Companion_getInstance();
-    this.d1h_1 = preparedAt;
-    this.e1h_1 = key;
-    this.f1h_1 = values;
+    this.a1h_1 = preparedAt;
+    this.b1h_1 = key;
+    this.c1h_1 = values;
   }
   protoOf(TableSchema).toString = function () {
-    return 'TableSchema(preparedAt=' + this.d1h_1 + ', key=' + toString_0(this.e1h_1) + ', values=' + toString_0(this.f1h_1) + ')';
+    return 'TableSchema(preparedAt=' + this.a1h_1 + ', key=' + toString_0(this.b1h_1) + ', values=' + toString_0(this.c1h_1) + ')';
   };
   protoOf(TableSchema).hashCode = function () {
-    var result = getStringHashCode(this.d1h_1);
-    result = imul(result, 31) + hashCode(this.e1h_1) | 0;
-    result = imul(result, 31) + hashCode(this.f1h_1) | 0;
+    var result = getStringHashCode(this.a1h_1);
+    result = imul(result, 31) + hashCode(this.b1h_1) | 0;
+    result = imul(result, 31) + hashCode(this.c1h_1) | 0;
     return result;
   };
   protoOf(TableSchema).equals = function (other) {
@@ -724,11 +723,11 @@
       return true;
     if (!(other instanceof TableSchema))
       return false;
-    if (!(this.d1h_1 === other.d1h_1))
+    if (!(this.a1h_1 === other.a1h_1))
       return false;
-    if (!equals(this.e1h_1, other.e1h_1))
+    if (!equals(this.b1h_1, other.b1h_1))
       return false;
-    if (!equals(this.f1h_1, other.f1h_1))
+    if (!equals(this.c1h_1, other.c1h_1))
       return false;
     return true;
   };
@@ -741,26 +740,26 @@
   function $serializer_0() {
     $serializer_instance_0 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.density.Ingredient', this, 4);
-    tmp0_serialDesc.rs('id', false);
-    tmp0_serialDesc.rs('name', false);
-    tmp0_serialDesc.rs('normalised_name', false);
-    tmp0_serialDesc.rs('density', false);
-    this.g1h_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_0).h1h = function (encoder, value) {
-    var tmp0_desc = this.g1h_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    tmp1_output.rm(tmp0_desc, 0, value.i1h_1);
-    tmp1_output.wm(tmp0_desc, 1, value.j1h_1);
-    tmp1_output.wm(tmp0_desc, 2, value.k1h_1);
-    tmp1_output.tm(tmp0_desc, 3, value.l1h_1);
-    tmp1_output.jl(tmp0_desc);
-  };
-  protoOf($serializer_0).li = function (encoder, value) {
-    return this.h1h(encoder, value instanceof Ingredient ? value : THROW_CCE());
-  };
-  protoOf($serializer_0).mi = function (decoder) {
-    var tmp0_desc = this.g1h_1;
+    tmp0_serialDesc.os('id', false);
+    tmp0_serialDesc.os('name', false);
+    tmp0_serialDesc.os('normalised_name', false);
+    tmp0_serialDesc.os('density', false);
+    this.d1h_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_0).e1h = function (encoder, value) {
+    var tmp0_desc = this.d1h_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    tmp1_output.om(tmp0_desc, 0, value.f1h_1);
+    tmp1_output.tm(tmp0_desc, 1, value.g1h_1);
+    tmp1_output.tm(tmp0_desc, 2, value.h1h_1);
+    tmp1_output.qm(tmp0_desc, 3, value.i1h_1);
+    tmp1_output.gl(tmp0_desc);
+  };
+  protoOf($serializer_0).ii = function (encoder, value) {
+    return this.e1h(encoder, value instanceof Ingredient ? value : THROW_CCE());
+  };
+  protoOf($serializer_0).ji = function (decoder) {
+    var tmp0_desc = this.d1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -768,50 +767,50 @@
     var tmp5_local1 = null;
     var tmp6_local2 = null;
     var tmp7_local3 = 0.0;
-    var tmp8_input = decoder.il(tmp0_desc);
-    if (tmp8_input.yl()) {
-      tmp4_local0 = tmp8_input.nl(tmp0_desc, 0);
+    var tmp8_input = decoder.fl(tmp0_desc);
+    if (tmp8_input.vl()) {
+      tmp4_local0 = tmp8_input.kl(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp8_input.sl(tmp0_desc, 1);
+      tmp5_local1 = tmp8_input.pl(tmp0_desc, 1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp8_input.sl(tmp0_desc, 2);
+      tmp6_local2 = tmp8_input.pl(tmp0_desc, 2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp8_input.pl(tmp0_desc, 3);
+      tmp7_local3 = tmp8_input.ml(tmp0_desc, 3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp8_input.zl(tmp0_desc);
+        tmp2_index = tmp8_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp8_input.nl(tmp0_desc, 0);
+            tmp4_local0 = tmp8_input.kl(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp8_input.sl(tmp0_desc, 1);
+            tmp5_local1 = tmp8_input.pl(tmp0_desc, 1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp8_input.sl(tmp0_desc, 2);
+            tmp6_local2 = tmp8_input.pl(tmp0_desc, 2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp8_input.pl(tmp0_desc, 3);
+            tmp7_local3 = tmp8_input.ml(tmp0_desc, 3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp8_input.jl(tmp0_desc);
+    tmp8_input.gl(tmp0_desc);
     return Ingredient_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
-  protoOf($serializer_0).ki = function () {
-    return this.g1h_1;
+  protoOf($serializer_0).hi = function () {
+    return this.d1h_1;
   };
-  protoOf($serializer_0).ts = function () {
+  protoOf($serializer_0).qs = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -825,31 +824,31 @@
   }
   function Ingredient_init_$Init$(seen0, id, name, normalised_name, density, serializationConstructorMarker, $this) {
     if (!(15 === (15 & seen0))) {
-      throwMissingFieldException(seen0, 15, $serializer_getInstance_0().g1h_1);
+      throwMissingFieldException(seen0, 15, $serializer_getInstance_0().d1h_1);
     }
-    $this.i1h_1 = id;
-    $this.j1h_1 = name;
-    $this.k1h_1 = normalised_name;
-    $this.l1h_1 = density;
+    $this.f1h_1 = id;
+    $this.g1h_1 = name;
+    $this.h1h_1 = normalised_name;
+    $this.i1h_1 = density;
     return $this;
   }
   function Ingredient_init_$Create$(seen0, id, name, normalised_name, density, serializationConstructorMarker) {
     return Ingredient_init_$Init$(seen0, id, name, normalised_name, density, serializationConstructorMarker, objectCreate(protoOf(Ingredient)));
   }
   function Ingredient(id, name, normalised_name, density) {
-    this.i1h_1 = id;
-    this.j1h_1 = name;
-    this.k1h_1 = normalised_name;
-    this.l1h_1 = density;
+    this.f1h_1 = id;
+    this.g1h_1 = name;
+    this.h1h_1 = normalised_name;
+    this.i1h_1 = density;
   }
   protoOf(Ingredient).toString = function () {
-    return 'Ingredient(id=' + this.i1h_1 + ', name=' + this.j1h_1 + ', normalised_name=' + this.k1h_1 + ', density=' + this.l1h_1 + ')';
+    return 'Ingredient(id=' + this.f1h_1 + ', name=' + this.g1h_1 + ', normalised_name=' + this.h1h_1 + ', density=' + this.i1h_1 + ')';
   };
   protoOf(Ingredient).hashCode = function () {
-    var result = this.i1h_1;
-    result = imul(result, 31) + getStringHashCode(this.j1h_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.k1h_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.l1h_1) | 0;
+    var result = this.f1h_1;
+    result = imul(result, 31) + getStringHashCode(this.g1h_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.h1h_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.i1h_1) | 0;
     return result;
   };
   protoOf(Ingredient).equals = function (other) {
@@ -857,29 +856,29 @@
       return true;
     if (!(other instanceof Ingredient))
       return false;
-    if (!(this.i1h_1 === other.i1h_1))
+    if (!(this.f1h_1 === other.f1h_1))
       return false;
-    if (!(this.j1h_1 === other.j1h_1))
+    if (!(this.g1h_1 === other.g1h_1))
       return false;
-    if (!(this.k1h_1 === other.k1h_1))
+    if (!(this.h1h_1 === other.h1h_1))
       return false;
-    if (!equals(this.l1h_1, other.l1h_1))
+    if (!equals(this.i1h_1, other.i1h_1))
       return false;
     return true;
   };
   function DensityTable(preparedAt, normalised_map, name_map) {
-    this.n1e_1 = preparedAt;
-    this.o1e_1 = normalised_map;
-    this.p1e_1 = name_map;
+    this.k1e_1 = preparedAt;
+    this.l1e_1 = normalised_map;
+    this.m1e_1 = name_map;
   }
-  protoOf(DensityTable).q1e = function (name) {
-    var tmp0_safe_receiver = this.o1e_1.k2(name);
+  protoOf(DensityTable).n1e = function (name) {
+    var tmp0_safe_receiver = this.l1e_1.i2(name);
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
     } else {
       // Inline function 'kotlin.let' call
-      return tmp0_safe_receiver.l1h_1;
+      return tmp0_safe_receiver.i1h_1;
     }
     return tmp;
   };
@@ -891,47 +890,47 @@
       // Inline function 'kotlinx.serialization.json.Json.decodeFromString' call
       var this_0 = Default_getInstance();
       // Inline function 'kotlinx.serialization.serializer' call
-      var this_1 = this_0.xl();
+      var this_1 = this_0.ul();
       // Inline function 'kotlinx.serialization.internal.cast' call
       var this_2 = serializer(this_1, createKType(getKClass(TableSchema), arrayOf([]), false));
       var tmp$ret$1 = isInterface(this_2, KSerializer) ? this_2 : THROW_CCE();
-      var data = this_0.u11(tmp$ret$1, raw);
+      var data = this_0.r11(tmp$ret$1, raw);
       // Inline function 'kotlin.collections.map' call
-      var this_3 = data.f1h_1;
+      var this_3 = data.c1h_1;
       // Inline function 'kotlin.collections.mapTo' call
       var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_3, 10));
-      var _iterator__ex2g4s = this_3.s();
-      while (_iterator__ex2g4s.t()) {
-        var item = _iterator__ex2g4s.u();
-        var tmp$ret$3 = new Ingredient(get_int(get_jsonPrimitive(item.b1(0))), get_jsonPrimitive(item.b1(1)).y13(), get_jsonPrimitive(item.b1(2)).y13(), get_float(get_jsonPrimitive(item.b1(3))));
-        destination.w(tmp$ret$3);
+      var _iterator__ex2g4s = this_3.q();
+      while (_iterator__ex2g4s.r()) {
+        var item = _iterator__ex2g4s.s();
+        var tmp$ret$5 = new Ingredient(get_int(get_jsonPrimitive(item.z(0))), get_jsonPrimitive(item.z(1)).v13(), get_jsonPrimitive(item.z(2)).v13(), get_float(get_jsonPrimitive(item.z(3))));
+        destination.u(tmp$ret$5);
       }
       var ingredients = destination;
       // Inline function 'kotlin.collections.associate' call
       var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(ingredients, 10)), 16);
       // Inline function 'kotlin.collections.associateTo' call
       var destination_0 = LinkedHashMap_init_$Create$(capacity);
-      var _iterator__ex2g4s_0 = ingredients.s();
-      while (_iterator__ex2g4s_0.t()) {
-        var element = _iterator__ex2g4s_0.u();
+      var _iterator__ex2g4s_0 = ingredients.q();
+      while (_iterator__ex2g4s_0.r()) {
+        var element = _iterator__ex2g4s_0.s();
         // Inline function 'kotlin.collections.plusAssign' call
-        var pair = to(element.k1h_1, element);
-        destination_0.o2(pair.fd_1, pair.gd_1);
+        var pair = to(element.h1h_1, element);
+        destination_0.m2(pair.cd_1, pair.dd_1);
       }
       var normalised_map = destination_0;
       // Inline function 'kotlin.collections.associate' call
       var capacity_0 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(ingredients, 10)), 16);
       // Inline function 'kotlin.collections.associateTo' call
       var destination_1 = LinkedHashMap_init_$Create$(capacity_0);
-      var _iterator__ex2g4s_1 = ingredients.s();
-      while (_iterator__ex2g4s_1.t()) {
-        var element_0 = _iterator__ex2g4s_1.u();
+      var _iterator__ex2g4s_1 = ingredients.q();
+      while (_iterator__ex2g4s_1.r()) {
+        var element_0 = _iterator__ex2g4s_1.s();
         // Inline function 'kotlin.collections.plusAssign' call
-        var pair_0 = to(element_0.j1h_1, element_0);
-        destination_1.o2(pair_0.fd_1, pair_0.gd_1);
+        var pair_0 = to(element_0.g1h_1, element_0);
+        destination_1.m2(pair_0.cd_1, pair_0.dd_1);
       }
       var name_map = destination_1;
-      var table = new DensityTable(data.d1h_1, normalised_map, name_map);
+      var table = new DensityTable(data.a1h_1, normalised_map, name_map);
       // Inline function 'kotlin.Companion.success' call
       return _Result___init__impl__xyqfz8(table);
     } catch ($p) {
@@ -1039,7 +1038,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.m1h_1 = [null, tmp_1, null, tmp_3, tmp_5, null, tmp_7, tmp_9, null, null, null, null, tmp_11, tmp_13, null, tmp_15, tmp_17, tmp_19, tmp_21, tmp_23, null, lazy(tmp_24, RecipeV3$Companion$$childSerializers$_anonymous__7om4qn_11), null];
+    tmp.j1h_1 = [null, tmp_1, null, tmp_3, tmp_5, null, tmp_7, tmp_9, null, null, null, null, tmp_11, tmp_13, null, tmp_15, tmp_17, tmp_19, tmp_21, tmp_23, null, lazy(tmp_24, RecipeV3$Companion$$childSerializers$_anonymous__7om4qn_11), null];
   }
   var Companion_instance_2;
   function Companion_getInstance_1() {
@@ -1050,109 +1049,109 @@
   function $serializer_1() {
     $serializer_instance_1 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.RecipeV3', this, 23);
-    tmp0_serialDesc.rs('bookCredit', true);
-    tmp0_serialDesc.rs('byline', true);
-    tmp0_serialDesc.rs('canonicalArticle', true);
-    tmp0_serialDesc.rs('celebrationIds', true);
-    tmp0_serialDesc.rs('commerceCtas', true);
-    tmp0_serialDesc.rs('composerId', true);
-    tmp0_serialDesc.rs('contributors', true);
-    tmp0_serialDesc.rs('cuisineIds', true);
-    tmp0_serialDesc.rs('description', true);
-    tmp0_serialDesc.rs('difficultyLevel', true);
-    tmp0_serialDesc.rs('featuredImage', true);
-    tmp0_serialDesc.rs('id', false);
-    tmp0_serialDesc.rs('ingredients', true);
-    tmp0_serialDesc.rs('instructions', true);
-    tmp0_serialDesc.rs('isAppReady', true);
-    tmp0_serialDesc.rs('mealTypeIds', true);
-    tmp0_serialDesc.rs('serves', true);
-    tmp0_serialDesc.rs('suitableForDietIds', true);
-    tmp0_serialDesc.rs('techniquesUsedIds', true);
-    tmp0_serialDesc.rs('timings', true);
-    tmp0_serialDesc.rs('title', true);
-    tmp0_serialDesc.rs('utensilsAndApplianceIds', true);
-    tmp0_serialDesc.rs('webPublicationDate', true);
-    this.n1h_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_1).o1h = function (encoder, value) {
-    var tmp0_desc = this.n1h_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_1().m1h_1;
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.l1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, StringSerializer_getInstance(), value.l1f_1);
+    tmp0_serialDesc.os('bookCredit', true);
+    tmp0_serialDesc.os('byline', true);
+    tmp0_serialDesc.os('canonicalArticle', true);
+    tmp0_serialDesc.os('celebrationIds', true);
+    tmp0_serialDesc.os('commerceCtas', true);
+    tmp0_serialDesc.os('composerId', true);
+    tmp0_serialDesc.os('contributors', true);
+    tmp0_serialDesc.os('cuisineIds', true);
+    tmp0_serialDesc.os('description', true);
+    tmp0_serialDesc.os('difficultyLevel', true);
+    tmp0_serialDesc.os('featuredImage', true);
+    tmp0_serialDesc.os('id', false);
+    tmp0_serialDesc.os('ingredients', true);
+    tmp0_serialDesc.os('instructions', true);
+    tmp0_serialDesc.os('isAppReady', true);
+    tmp0_serialDesc.os('mealTypeIds', true);
+    tmp0_serialDesc.os('serves', true);
+    tmp0_serialDesc.os('suitableForDietIds', true);
+    tmp0_serialDesc.os('techniquesUsedIds', true);
+    tmp0_serialDesc.os('timings', true);
+    tmp0_serialDesc.os('title', true);
+    tmp0_serialDesc.os('utensilsAndApplianceIds', true);
+    tmp0_serialDesc.os('webPublicationDate', true);
+    this.k1h_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_1).l1h = function (encoder, value) {
+    var tmp0_desc = this.k1h_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_1().j1h_1;
+    if (tmp1_output.bn(tmp0_desc, 0) ? true : !(value.i1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 0, StringSerializer_getInstance(), value.i1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.m1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, tmp2_cached[1].h2(), value.m1f_1);
+    if (tmp1_output.bn(tmp0_desc, 1) ? true : !(value.j1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 1, tmp2_cached[1].f2(), value.j1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.n1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.n1f_1);
+    if (tmp1_output.bn(tmp0_desc, 2) ? true : !(value.k1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 2, StringSerializer_getInstance(), value.k1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.o1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 3, tmp2_cached[3].h2(), value.o1f_1);
+    if (tmp1_output.bn(tmp0_desc, 3) ? true : !(value.l1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 3, tmp2_cached[3].f2(), value.l1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 4) ? true : !(value.p1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 4, tmp2_cached[4].h2(), value.p1f_1);
+    if (tmp1_output.bn(tmp0_desc, 4) ? true : !(value.m1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 4, tmp2_cached[4].f2(), value.m1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.q1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 5, StringSerializer_getInstance(), value.q1f_1);
+    if (tmp1_output.bn(tmp0_desc, 5) ? true : !(value.n1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 5, StringSerializer_getInstance(), value.n1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 6) ? true : !(value.r1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 6, tmp2_cached[6].h2(), value.r1f_1);
+    if (tmp1_output.bn(tmp0_desc, 6) ? true : !(value.o1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 6, tmp2_cached[6].f2(), value.o1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 7) ? true : !(value.s1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 7, tmp2_cached[7].h2(), value.s1f_1);
+    if (tmp1_output.bn(tmp0_desc, 7) ? true : !(value.p1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 7, tmp2_cached[7].f2(), value.p1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 8) ? true : !(value.t1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 8, StringSerializer_getInstance(), value.t1f_1);
+    if (tmp1_output.bn(tmp0_desc, 8) ? true : !(value.q1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 8, StringSerializer_getInstance(), value.q1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 9) ? true : !(value.u1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 9, StringSerializer_getInstance(), value.u1f_1);
+    if (tmp1_output.bn(tmp0_desc, 9) ? true : !(value.r1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 9, StringSerializer_getInstance(), value.r1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 10) ? true : !(value.v1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 10, $serializer_getInstance_3(), value.v1f_1);
+    if (tmp1_output.bn(tmp0_desc, 10) ? true : !(value.s1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 10, $serializer_getInstance_3(), value.s1f_1);
     }
-    tmp1_output.wm(tmp0_desc, 11, value.w1f_1);
-    if (tmp1_output.en(tmp0_desc, 12) ? true : !(value.x1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 12, tmp2_cached[12].h2(), value.x1f_1);
+    tmp1_output.tm(tmp0_desc, 11, value.t1f_1);
+    if (tmp1_output.bn(tmp0_desc, 12) ? true : !(value.u1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 12, tmp2_cached[12].f2(), value.u1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 13) ? true : !(value.y1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 13, tmp2_cached[13].h2(), value.y1f_1);
+    if (tmp1_output.bn(tmp0_desc, 13) ? true : !(value.v1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 13, tmp2_cached[13].f2(), value.v1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 14) ? true : !(value.z1f_1 == null)) {
-      tmp1_output.an(tmp0_desc, 14, BooleanSerializer_getInstance(), value.z1f_1);
+    if (tmp1_output.bn(tmp0_desc, 14) ? true : !(value.w1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 14, BooleanSerializer_getInstance(), value.w1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 15) ? true : !(value.a1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 15, tmp2_cached[15].h2(), value.a1g_1);
+    if (tmp1_output.bn(tmp0_desc, 15) ? true : !(value.x1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 15, tmp2_cached[15].f2(), value.x1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 16) ? true : !(value.b1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 16, tmp2_cached[16].h2(), value.b1g_1);
+    if (tmp1_output.bn(tmp0_desc, 16) ? true : !(value.y1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 16, tmp2_cached[16].f2(), value.y1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 17) ? true : !(value.c1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 17, tmp2_cached[17].h2(), value.c1g_1);
+    if (tmp1_output.bn(tmp0_desc, 17) ? true : !(value.z1f_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 17, tmp2_cached[17].f2(), value.z1f_1);
     }
-    if (tmp1_output.en(tmp0_desc, 18) ? true : !(value.d1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 18, tmp2_cached[18].h2(), value.d1g_1);
+    if (tmp1_output.bn(tmp0_desc, 18) ? true : !(value.a1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 18, tmp2_cached[18].f2(), value.a1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 19) ? true : !(value.e1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 19, tmp2_cached[19].h2(), value.e1g_1);
+    if (tmp1_output.bn(tmp0_desc, 19) ? true : !(value.b1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 19, tmp2_cached[19].f2(), value.b1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 20) ? true : !(value.f1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 20, StringSerializer_getInstance(), value.f1g_1);
+    if (tmp1_output.bn(tmp0_desc, 20) ? true : !(value.c1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 20, StringSerializer_getInstance(), value.c1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 21) ? true : !(value.g1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 21, tmp2_cached[21].h2(), value.g1g_1);
+    if (tmp1_output.bn(tmp0_desc, 21) ? true : !(value.d1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 21, tmp2_cached[21].f2(), value.d1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 22) ? true : !(value.h1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 22, StringSerializer_getInstance(), value.h1g_1);
+    if (tmp1_output.bn(tmp0_desc, 22) ? true : !(value.e1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 22, StringSerializer_getInstance(), value.e1g_1);
     }
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_1).li = function (encoder, value) {
-    return this.o1h(encoder, value instanceof RecipeV3 ? value : THROW_CCE());
+  protoOf($serializer_1).ii = function (encoder, value) {
+    return this.l1h(encoder, value instanceof RecipeV3 ? value : THROW_CCE());
   };
-  protoOf($serializer_1).mi = function (decoder) {
-    var tmp0_desc = this.n1h_1;
+  protoOf($serializer_1).ji = function (decoder) {
+    var tmp0_desc = this.k1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -1179,170 +1178,170 @@
     var tmp24_local20 = null;
     var tmp25_local21 = null;
     var tmp26_local22 = null;
-    var tmp27_input = decoder.il(tmp0_desc);
-    var tmp28_cached = Companion_getInstance_1().m1h_1;
-    if (tmp27_input.yl()) {
-      tmp4_local0 = tmp27_input.wl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+    var tmp27_input = decoder.fl(tmp0_desc);
+    var tmp28_cached = Companion_getInstance_1().j1h_1;
+    if (tmp27_input.vl()) {
+      tmp4_local0 = tmp27_input.tl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp27_input.wl(tmp0_desc, 1, tmp28_cached[1].h2(), tmp5_local1);
+      tmp5_local1 = tmp27_input.tl(tmp0_desc, 1, tmp28_cached[1].f2(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp27_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp27_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp27_input.wl(tmp0_desc, 3, tmp28_cached[3].h2(), tmp7_local3);
+      tmp7_local3 = tmp27_input.tl(tmp0_desc, 3, tmp28_cached[3].f2(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp27_input.wl(tmp0_desc, 4, tmp28_cached[4].h2(), tmp8_local4);
+      tmp8_local4 = tmp27_input.tl(tmp0_desc, 4, tmp28_cached[4].f2(), tmp8_local4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp27_input.wl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp27_input.tl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp27_input.wl(tmp0_desc, 6, tmp28_cached[6].h2(), tmp10_local6);
+      tmp10_local6 = tmp27_input.tl(tmp0_desc, 6, tmp28_cached[6].f2(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp27_input.wl(tmp0_desc, 7, tmp28_cached[7].h2(), tmp11_local7);
+      tmp11_local7 = tmp27_input.tl(tmp0_desc, 7, tmp28_cached[7].f2(), tmp11_local7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
-      tmp12_local8 = tmp27_input.wl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+      tmp12_local8 = tmp27_input.tl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
       tmp3_bitMask0 = tmp3_bitMask0 | 256;
-      tmp13_local9 = tmp27_input.wl(tmp0_desc, 9, StringSerializer_getInstance(), tmp13_local9);
+      tmp13_local9 = tmp27_input.tl(tmp0_desc, 9, StringSerializer_getInstance(), tmp13_local9);
       tmp3_bitMask0 = tmp3_bitMask0 | 512;
-      tmp14_local10 = tmp27_input.wl(tmp0_desc, 10, $serializer_getInstance_3(), tmp14_local10);
+      tmp14_local10 = tmp27_input.tl(tmp0_desc, 10, $serializer_getInstance_3(), tmp14_local10);
       tmp3_bitMask0 = tmp3_bitMask0 | 1024;
-      tmp15_local11 = tmp27_input.sl(tmp0_desc, 11);
+      tmp15_local11 = tmp27_input.pl(tmp0_desc, 11);
       tmp3_bitMask0 = tmp3_bitMask0 | 2048;
-      tmp16_local12 = tmp27_input.wl(tmp0_desc, 12, tmp28_cached[12].h2(), tmp16_local12);
+      tmp16_local12 = tmp27_input.tl(tmp0_desc, 12, tmp28_cached[12].f2(), tmp16_local12);
       tmp3_bitMask0 = tmp3_bitMask0 | 4096;
-      tmp17_local13 = tmp27_input.wl(tmp0_desc, 13, tmp28_cached[13].h2(), tmp17_local13);
+      tmp17_local13 = tmp27_input.tl(tmp0_desc, 13, tmp28_cached[13].f2(), tmp17_local13);
       tmp3_bitMask0 = tmp3_bitMask0 | 8192;
-      tmp18_local14 = tmp27_input.wl(tmp0_desc, 14, BooleanSerializer_getInstance(), tmp18_local14);
+      tmp18_local14 = tmp27_input.tl(tmp0_desc, 14, BooleanSerializer_getInstance(), tmp18_local14);
       tmp3_bitMask0 = tmp3_bitMask0 | 16384;
-      tmp19_local15 = tmp27_input.wl(tmp0_desc, 15, tmp28_cached[15].h2(), tmp19_local15);
+      tmp19_local15 = tmp27_input.tl(tmp0_desc, 15, tmp28_cached[15].f2(), tmp19_local15);
       tmp3_bitMask0 = tmp3_bitMask0 | 32768;
-      tmp20_local16 = tmp27_input.wl(tmp0_desc, 16, tmp28_cached[16].h2(), tmp20_local16);
+      tmp20_local16 = tmp27_input.tl(tmp0_desc, 16, tmp28_cached[16].f2(), tmp20_local16);
       tmp3_bitMask0 = tmp3_bitMask0 | 65536;
-      tmp21_local17 = tmp27_input.wl(tmp0_desc, 17, tmp28_cached[17].h2(), tmp21_local17);
+      tmp21_local17 = tmp27_input.tl(tmp0_desc, 17, tmp28_cached[17].f2(), tmp21_local17);
       tmp3_bitMask0 = tmp3_bitMask0 | 131072;
-      tmp22_local18 = tmp27_input.wl(tmp0_desc, 18, tmp28_cached[18].h2(), tmp22_local18);
+      tmp22_local18 = tmp27_input.tl(tmp0_desc, 18, tmp28_cached[18].f2(), tmp22_local18);
       tmp3_bitMask0 = tmp3_bitMask0 | 262144;
-      tmp23_local19 = tmp27_input.wl(tmp0_desc, 19, tmp28_cached[19].h2(), tmp23_local19);
+      tmp23_local19 = tmp27_input.tl(tmp0_desc, 19, tmp28_cached[19].f2(), tmp23_local19);
       tmp3_bitMask0 = tmp3_bitMask0 | 524288;
-      tmp24_local20 = tmp27_input.wl(tmp0_desc, 20, StringSerializer_getInstance(), tmp24_local20);
+      tmp24_local20 = tmp27_input.tl(tmp0_desc, 20, StringSerializer_getInstance(), tmp24_local20);
       tmp3_bitMask0 = tmp3_bitMask0 | 1048576;
-      tmp25_local21 = tmp27_input.wl(tmp0_desc, 21, tmp28_cached[21].h2(), tmp25_local21);
+      tmp25_local21 = tmp27_input.tl(tmp0_desc, 21, tmp28_cached[21].f2(), tmp25_local21);
       tmp3_bitMask0 = tmp3_bitMask0 | 2097152;
-      tmp26_local22 = tmp27_input.wl(tmp0_desc, 22, StringSerializer_getInstance(), tmp26_local22);
+      tmp26_local22 = tmp27_input.tl(tmp0_desc, 22, StringSerializer_getInstance(), tmp26_local22);
       tmp3_bitMask0 = tmp3_bitMask0 | 4194304;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp27_input.zl(tmp0_desc);
+        tmp2_index = tmp27_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp27_input.wl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp27_input.tl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp27_input.wl(tmp0_desc, 1, tmp28_cached[1].h2(), tmp5_local1);
+            tmp5_local1 = tmp27_input.tl(tmp0_desc, 1, tmp28_cached[1].f2(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp27_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp27_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp27_input.wl(tmp0_desc, 3, tmp28_cached[3].h2(), tmp7_local3);
+            tmp7_local3 = tmp27_input.tl(tmp0_desc, 3, tmp28_cached[3].f2(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp27_input.wl(tmp0_desc, 4, tmp28_cached[4].h2(), tmp8_local4);
+            tmp8_local4 = tmp27_input.tl(tmp0_desc, 4, tmp28_cached[4].f2(), tmp8_local4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp27_input.wl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp27_input.tl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp27_input.wl(tmp0_desc, 6, tmp28_cached[6].h2(), tmp10_local6);
+            tmp10_local6 = tmp27_input.tl(tmp0_desc, 6, tmp28_cached[6].f2(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp27_input.wl(tmp0_desc, 7, tmp28_cached[7].h2(), tmp11_local7);
+            tmp11_local7 = tmp27_input.tl(tmp0_desc, 7, tmp28_cached[7].f2(), tmp11_local7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           case 8:
-            tmp12_local8 = tmp27_input.wl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+            tmp12_local8 = tmp27_input.tl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
             tmp3_bitMask0 = tmp3_bitMask0 | 256;
             break;
           case 9:
-            tmp13_local9 = tmp27_input.wl(tmp0_desc, 9, StringSerializer_getInstance(), tmp13_local9);
+            tmp13_local9 = tmp27_input.tl(tmp0_desc, 9, StringSerializer_getInstance(), tmp13_local9);
             tmp3_bitMask0 = tmp3_bitMask0 | 512;
             break;
           case 10:
-            tmp14_local10 = tmp27_input.wl(tmp0_desc, 10, $serializer_getInstance_3(), tmp14_local10);
+            tmp14_local10 = tmp27_input.tl(tmp0_desc, 10, $serializer_getInstance_3(), tmp14_local10);
             tmp3_bitMask0 = tmp3_bitMask0 | 1024;
             break;
           case 11:
-            tmp15_local11 = tmp27_input.sl(tmp0_desc, 11);
+            tmp15_local11 = tmp27_input.pl(tmp0_desc, 11);
             tmp3_bitMask0 = tmp3_bitMask0 | 2048;
             break;
           case 12:
-            tmp16_local12 = tmp27_input.wl(tmp0_desc, 12, tmp28_cached[12].h2(), tmp16_local12);
+            tmp16_local12 = tmp27_input.tl(tmp0_desc, 12, tmp28_cached[12].f2(), tmp16_local12);
             tmp3_bitMask0 = tmp3_bitMask0 | 4096;
             break;
           case 13:
-            tmp17_local13 = tmp27_input.wl(tmp0_desc, 13, tmp28_cached[13].h2(), tmp17_local13);
+            tmp17_local13 = tmp27_input.tl(tmp0_desc, 13, tmp28_cached[13].f2(), tmp17_local13);
             tmp3_bitMask0 = tmp3_bitMask0 | 8192;
             break;
           case 14:
-            tmp18_local14 = tmp27_input.wl(tmp0_desc, 14, BooleanSerializer_getInstance(), tmp18_local14);
+            tmp18_local14 = tmp27_input.tl(tmp0_desc, 14, BooleanSerializer_getInstance(), tmp18_local14);
             tmp3_bitMask0 = tmp3_bitMask0 | 16384;
             break;
           case 15:
-            tmp19_local15 = tmp27_input.wl(tmp0_desc, 15, tmp28_cached[15].h2(), tmp19_local15);
+            tmp19_local15 = tmp27_input.tl(tmp0_desc, 15, tmp28_cached[15].f2(), tmp19_local15);
             tmp3_bitMask0 = tmp3_bitMask0 | 32768;
             break;
           case 16:
-            tmp20_local16 = tmp27_input.wl(tmp0_desc, 16, tmp28_cached[16].h2(), tmp20_local16);
+            tmp20_local16 = tmp27_input.tl(tmp0_desc, 16, tmp28_cached[16].f2(), tmp20_local16);
             tmp3_bitMask0 = tmp3_bitMask0 | 65536;
             break;
           case 17:
-            tmp21_local17 = tmp27_input.wl(tmp0_desc, 17, tmp28_cached[17].h2(), tmp21_local17);
+            tmp21_local17 = tmp27_input.tl(tmp0_desc, 17, tmp28_cached[17].f2(), tmp21_local17);
             tmp3_bitMask0 = tmp3_bitMask0 | 131072;
             break;
           case 18:
-            tmp22_local18 = tmp27_input.wl(tmp0_desc, 18, tmp28_cached[18].h2(), tmp22_local18);
+            tmp22_local18 = tmp27_input.tl(tmp0_desc, 18, tmp28_cached[18].f2(), tmp22_local18);
             tmp3_bitMask0 = tmp3_bitMask0 | 262144;
             break;
           case 19:
-            tmp23_local19 = tmp27_input.wl(tmp0_desc, 19, tmp28_cached[19].h2(), tmp23_local19);
+            tmp23_local19 = tmp27_input.tl(tmp0_desc, 19, tmp28_cached[19].f2(), tmp23_local19);
             tmp3_bitMask0 = tmp3_bitMask0 | 524288;
             break;
           case 20:
-            tmp24_local20 = tmp27_input.wl(tmp0_desc, 20, StringSerializer_getInstance(), tmp24_local20);
+            tmp24_local20 = tmp27_input.tl(tmp0_desc, 20, StringSerializer_getInstance(), tmp24_local20);
             tmp3_bitMask0 = tmp3_bitMask0 | 1048576;
             break;
           case 21:
-            tmp25_local21 = tmp27_input.wl(tmp0_desc, 21, tmp28_cached[21].h2(), tmp25_local21);
+            tmp25_local21 = tmp27_input.tl(tmp0_desc, 21, tmp28_cached[21].f2(), tmp25_local21);
             tmp3_bitMask0 = tmp3_bitMask0 | 2097152;
             break;
           case 22:
-            tmp26_local22 = tmp27_input.wl(tmp0_desc, 22, StringSerializer_getInstance(), tmp26_local22);
+            tmp26_local22 = tmp27_input.tl(tmp0_desc, 22, StringSerializer_getInstance(), tmp26_local22);
             tmp3_bitMask0 = tmp3_bitMask0 | 4194304;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp27_input.jl(tmp0_desc);
+    tmp27_input.gl(tmp0_desc);
     return RecipeV3_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, tmp12_local8, tmp13_local9, tmp14_local10, tmp15_local11, tmp16_local12, tmp17_local13, tmp18_local14, tmp19_local15, tmp20_local16, tmp21_local17, tmp22_local18, tmp23_local19, tmp24_local20, tmp25_local21, tmp26_local22, null);
   };
-  protoOf($serializer_1).ki = function () {
-    return this.n1h_1;
+  protoOf($serializer_1).hi = function () {
+    return this.k1h_1;
   };
-  protoOf($serializer_1).ts = function () {
-    var tmp0_cached = Companion_getInstance_1().m1h_1;
+  protoOf($serializer_1).qs = function () {
+    var tmp0_cached = Companion_getInstance_1().j1h_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    return [get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[1].h2()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[3].h2()), get_nullable(tmp0_cached[4].h2()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[6].h2()), get_nullable(tmp0_cached[7].h2()), get_nullable(StringSerializer_getInstance()), get_nullable(StringSerializer_getInstance()), get_nullable($serializer_getInstance_3()), StringSerializer_getInstance(), get_nullable(tmp0_cached[12].h2()), get_nullable(tmp0_cached[13].h2()), get_nullable(BooleanSerializer_getInstance()), get_nullable(tmp0_cached[15].h2()), get_nullable(tmp0_cached[16].h2()), get_nullable(tmp0_cached[17].h2()), get_nullable(tmp0_cached[18].h2()), get_nullable(tmp0_cached[19].h2()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[21].h2()), get_nullable(StringSerializer_getInstance())];
+    return [get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[1].f2()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[3].f2()), get_nullable(tmp0_cached[4].f2()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[6].f2()), get_nullable(tmp0_cached[7].f2()), get_nullable(StringSerializer_getInstance()), get_nullable(StringSerializer_getInstance()), get_nullable($serializer_getInstance_3()), StringSerializer_getInstance(), get_nullable(tmp0_cached[12].f2()), get_nullable(tmp0_cached[13].f2()), get_nullable(BooleanSerializer_getInstance()), get_nullable(tmp0_cached[15].f2()), get_nullable(tmp0_cached[16].f2()), get_nullable(tmp0_cached[17].f2()), get_nullable(tmp0_cached[18].f2()), get_nullable(tmp0_cached[19].f2()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[21].f2()), get_nullable(StringSerializer_getInstance())];
   };
   var $serializer_instance_1;
   function $serializer_getInstance_1() {
@@ -1352,97 +1351,97 @@
   }
   function RecipeV3_init_$Init$(seen0, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, serializationConstructorMarker, $this) {
     if (!(2048 === (2048 & seen0))) {
-      throwMissingFieldException(seen0, 2048, $serializer_getInstance_1().n1h_1);
+      throwMissingFieldException(seen0, 2048, $serializer_getInstance_1().k1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.l1f_1 = null;
+      $this.i1f_1 = null;
     else
-      $this.l1f_1 = bookCredit;
+      $this.i1f_1 = bookCredit;
     if (0 === (seen0 & 2))
-      $this.m1f_1 = null;
+      $this.j1f_1 = null;
     else
-      $this.m1f_1 = byline;
+      $this.j1f_1 = byline;
     if (0 === (seen0 & 4))
-      $this.n1f_1 = null;
+      $this.k1f_1 = null;
     else
-      $this.n1f_1 = canonicalArticle;
+      $this.k1f_1 = canonicalArticle;
     if (0 === (seen0 & 8))
-      $this.o1f_1 = null;
+      $this.l1f_1 = null;
     else
-      $this.o1f_1 = celebrationIds;
+      $this.l1f_1 = celebrationIds;
     if (0 === (seen0 & 16))
-      $this.p1f_1 = null;
+      $this.m1f_1 = null;
     else
-      $this.p1f_1 = commerceCtas;
+      $this.m1f_1 = commerceCtas;
     if (0 === (seen0 & 32))
-      $this.q1f_1 = null;
+      $this.n1f_1 = null;
     else
-      $this.q1f_1 = composerId;
+      $this.n1f_1 = composerId;
     if (0 === (seen0 & 64))
-      $this.r1f_1 = null;
+      $this.o1f_1 = null;
     else
-      $this.r1f_1 = contributors;
+      $this.o1f_1 = contributors;
     if (0 === (seen0 & 128))
-      $this.s1f_1 = null;
+      $this.p1f_1 = null;
     else
-      $this.s1f_1 = cuisineIds;
+      $this.p1f_1 = cuisineIds;
     if (0 === (seen0 & 256))
-      $this.t1f_1 = null;
+      $this.q1f_1 = null;
     else
-      $this.t1f_1 = description;
+      $this.q1f_1 = description;
     if (0 === (seen0 & 512))
-      $this.u1f_1 = null;
+      $this.r1f_1 = null;
     else
-      $this.u1f_1 = difficultyLevel;
+      $this.r1f_1 = difficultyLevel;
     if (0 === (seen0 & 1024))
-      $this.v1f_1 = null;
+      $this.s1f_1 = null;
     else
-      $this.v1f_1 = featuredImage;
-    $this.w1f_1 = id;
+      $this.s1f_1 = featuredImage;
+    $this.t1f_1 = id;
     if (0 === (seen0 & 4096))
-      $this.x1f_1 = null;
+      $this.u1f_1 = null;
     else
-      $this.x1f_1 = ingredients;
+      $this.u1f_1 = ingredients;
     if (0 === (seen0 & 8192))
-      $this.y1f_1 = null;
+      $this.v1f_1 = null;
     else
-      $this.y1f_1 = instructions;
+      $this.v1f_1 = instructions;
     if (0 === (seen0 & 16384))
-      $this.z1f_1 = null;
+      $this.w1f_1 = null;
     else
-      $this.z1f_1 = isAppReady;
+      $this.w1f_1 = isAppReady;
     if (0 === (seen0 & 32768))
-      $this.a1g_1 = null;
+      $this.x1f_1 = null;
     else
-      $this.a1g_1 = mealTypeIds;
+      $this.x1f_1 = mealTypeIds;
     if (0 === (seen0 & 65536))
-      $this.b1g_1 = null;
+      $this.y1f_1 = null;
     else
-      $this.b1g_1 = serves;
+      $this.y1f_1 = serves;
     if (0 === (seen0 & 131072))
-      $this.c1g_1 = null;
+      $this.z1f_1 = null;
     else
-      $this.c1g_1 = suitableForDietIds;
+      $this.z1f_1 = suitableForDietIds;
     if (0 === (seen0 & 262144))
-      $this.d1g_1 = null;
+      $this.a1g_1 = null;
     else
-      $this.d1g_1 = techniquesUsedIds;
+      $this.a1g_1 = techniquesUsedIds;
     if (0 === (seen0 & 524288))
-      $this.e1g_1 = null;
+      $this.b1g_1 = null;
     else
-      $this.e1g_1 = timings;
+      $this.b1g_1 = timings;
     if (0 === (seen0 & 1048576))
-      $this.f1g_1 = null;
+      $this.c1g_1 = null;
     else
-      $this.f1g_1 = title;
+      $this.c1g_1 = title;
     if (0 === (seen0 & 2097152))
-      $this.g1g_1 = null;
+      $this.d1g_1 = null;
     else
-      $this.g1g_1 = utensilsAndApplianceIds;
+      $this.d1g_1 = utensilsAndApplianceIds;
     if (0 === (seen0 & 4194304))
-      $this.h1g_1 = null;
+      $this.e1g_1 = null;
     else
-      $this.h1g_1 = webPublicationDate;
+      $this.e1g_1 = webPublicationDate;
     return $this;
   }
   function RecipeV3_init_$Create$(seen0, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, serializationConstructorMarker) {
@@ -1472,86 +1471,86 @@
     title = title === VOID ? null : title;
     utensilsAndApplianceIds = utensilsAndApplianceIds === VOID ? null : utensilsAndApplianceIds;
     webPublicationDate = webPublicationDate === VOID ? null : webPublicationDate;
-    this.l1f_1 = bookCredit;
-    this.m1f_1 = byline;
-    this.n1f_1 = canonicalArticle;
-    this.o1f_1 = celebrationIds;
-    this.p1f_1 = commerceCtas;
-    this.q1f_1 = composerId;
-    this.r1f_1 = contributors;
-    this.s1f_1 = cuisineIds;
-    this.t1f_1 = description;
-    this.u1f_1 = difficultyLevel;
-    this.v1f_1 = featuredImage;
-    this.w1f_1 = id;
-    this.x1f_1 = ingredients;
-    this.y1f_1 = instructions;
-    this.z1f_1 = isAppReady;
-    this.a1g_1 = mealTypeIds;
-    this.b1g_1 = serves;
-    this.c1g_1 = suitableForDietIds;
-    this.d1g_1 = techniquesUsedIds;
-    this.e1g_1 = timings;
-    this.f1g_1 = title;
-    this.g1g_1 = utensilsAndApplianceIds;
-    this.h1g_1 = webPublicationDate;
-  }
-  protoOf(RecipeV3).p1h = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) {
+    this.i1f_1 = bookCredit;
+    this.j1f_1 = byline;
+    this.k1f_1 = canonicalArticle;
+    this.l1f_1 = celebrationIds;
+    this.m1f_1 = commerceCtas;
+    this.n1f_1 = composerId;
+    this.o1f_1 = contributors;
+    this.p1f_1 = cuisineIds;
+    this.q1f_1 = description;
+    this.r1f_1 = difficultyLevel;
+    this.s1f_1 = featuredImage;
+    this.t1f_1 = id;
+    this.u1f_1 = ingredients;
+    this.v1f_1 = instructions;
+    this.w1f_1 = isAppReady;
+    this.x1f_1 = mealTypeIds;
+    this.y1f_1 = serves;
+    this.z1f_1 = suitableForDietIds;
+    this.a1g_1 = techniquesUsedIds;
+    this.b1g_1 = timings;
+    this.c1g_1 = title;
+    this.d1g_1 = utensilsAndApplianceIds;
+    this.e1g_1 = webPublicationDate;
+  }
+  protoOf(RecipeV3).m1h = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) {
     return new RecipeV3(bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate);
   };
-  protoOf(RecipeV3).z1g = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, $super) {
-    bookCredit = bookCredit === VOID ? this.l1f_1 : bookCredit;
-    byline = byline === VOID ? this.m1f_1 : byline;
-    canonicalArticle = canonicalArticle === VOID ? this.n1f_1 : canonicalArticle;
-    celebrationIds = celebrationIds === VOID ? this.o1f_1 : celebrationIds;
-    commerceCtas = commerceCtas === VOID ? this.p1f_1 : commerceCtas;
-    composerId = composerId === VOID ? this.q1f_1 : composerId;
-    contributors = contributors === VOID ? this.r1f_1 : contributors;
-    cuisineIds = cuisineIds === VOID ? this.s1f_1 : cuisineIds;
-    description = description === VOID ? this.t1f_1 : description;
-    difficultyLevel = difficultyLevel === VOID ? this.u1f_1 : difficultyLevel;
-    featuredImage = featuredImage === VOID ? this.v1f_1 : featuredImage;
-    id = id === VOID ? this.w1f_1 : id;
-    ingredients = ingredients === VOID ? this.x1f_1 : ingredients;
-    instructions = instructions === VOID ? this.y1f_1 : instructions;
-    isAppReady = isAppReady === VOID ? this.z1f_1 : isAppReady;
-    mealTypeIds = mealTypeIds === VOID ? this.a1g_1 : mealTypeIds;
-    serves = serves === VOID ? this.b1g_1 : serves;
-    suitableForDietIds = suitableForDietIds === VOID ? this.c1g_1 : suitableForDietIds;
-    techniquesUsedIds = techniquesUsedIds === VOID ? this.d1g_1 : techniquesUsedIds;
-    timings = timings === VOID ? this.e1g_1 : timings;
-    title = title === VOID ? this.f1g_1 : title;
-    utensilsAndApplianceIds = utensilsAndApplianceIds === VOID ? this.g1g_1 : utensilsAndApplianceIds;
-    webPublicationDate = webPublicationDate === VOID ? this.h1g_1 : webPublicationDate;
-    return $super === VOID ? this.p1h(bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) : $super.p1h.call(this, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate);
+  protoOf(RecipeV3).w1g = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, $super) {
+    bookCredit = bookCredit === VOID ? this.i1f_1 : bookCredit;
+    byline = byline === VOID ? this.j1f_1 : byline;
+    canonicalArticle = canonicalArticle === VOID ? this.k1f_1 : canonicalArticle;
+    celebrationIds = celebrationIds === VOID ? this.l1f_1 : celebrationIds;
+    commerceCtas = commerceCtas === VOID ? this.m1f_1 : commerceCtas;
+    composerId = composerId === VOID ? this.n1f_1 : composerId;
+    contributors = contributors === VOID ? this.o1f_1 : contributors;
+    cuisineIds = cuisineIds === VOID ? this.p1f_1 : cuisineIds;
+    description = description === VOID ? this.q1f_1 : description;
+    difficultyLevel = difficultyLevel === VOID ? this.r1f_1 : difficultyLevel;
+    featuredImage = featuredImage === VOID ? this.s1f_1 : featuredImage;
+    id = id === VOID ? this.t1f_1 : id;
+    ingredients = ingredients === VOID ? this.u1f_1 : ingredients;
+    instructions = instructions === VOID ? this.v1f_1 : instructions;
+    isAppReady = isAppReady === VOID ? this.w1f_1 : isAppReady;
+    mealTypeIds = mealTypeIds === VOID ? this.x1f_1 : mealTypeIds;
+    serves = serves === VOID ? this.y1f_1 : serves;
+    suitableForDietIds = suitableForDietIds === VOID ? this.z1f_1 : suitableForDietIds;
+    techniquesUsedIds = techniquesUsedIds === VOID ? this.a1g_1 : techniquesUsedIds;
+    timings = timings === VOID ? this.b1g_1 : timings;
+    title = title === VOID ? this.c1g_1 : title;
+    utensilsAndApplianceIds = utensilsAndApplianceIds === VOID ? this.d1g_1 : utensilsAndApplianceIds;
+    webPublicationDate = webPublicationDate === VOID ? this.e1g_1 : webPublicationDate;
+    return $super === VOID ? this.m1h(bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) : $super.m1h.call(this, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate);
   };
   protoOf(RecipeV3).toString = function () {
-    return 'RecipeV3(bookCredit=' + this.l1f_1 + ', byline=' + toString(this.m1f_1) + ', canonicalArticle=' + this.n1f_1 + ', celebrationIds=' + toString(this.o1f_1) + ', commerceCtas=' + toString(this.p1f_1) + ', composerId=' + this.q1f_1 + ', contributors=' + toString(this.r1f_1) + ', cuisineIds=' + toString(this.s1f_1) + ', description=' + this.t1f_1 + ', difficultyLevel=' + this.u1f_1 + ', featuredImage=' + toString(this.v1f_1) + ', id=' + this.w1f_1 + ', ingredients=' + toString(this.x1f_1) + ', instructions=' + toString(this.y1f_1) + ', isAppReady=' + this.z1f_1 + ', mealTypeIds=' + toString(this.a1g_1) + ', serves=' + toString(this.b1g_1) + ', suitableForDietIds=' + toString(this.c1g_1) + ', techniquesUsedIds=' + toString(this.d1g_1) + ', timings=' + toString(this.e1g_1) + ', title=' + this.f1g_1 + ', utensilsAndApplianceIds=' + toString(this.g1g_1) + ', webPublicationDate=' + this.h1g_1 + ')';
+    return 'RecipeV3(bookCredit=' + this.i1f_1 + ', byline=' + toString(this.j1f_1) + ', canonicalArticle=' + this.k1f_1 + ', celebrationIds=' + toString(this.l1f_1) + ', commerceCtas=' + toString(this.m1f_1) + ', composerId=' + this.n1f_1 + ', contributors=' + toString(this.o1f_1) + ', cuisineIds=' + toString(this.p1f_1) + ', description=' + this.q1f_1 + ', difficultyLevel=' + this.r1f_1 + ', featuredImage=' + toString(this.s1f_1) + ', id=' + this.t1f_1 + ', ingredients=' + toString(this.u1f_1) + ', instructions=' + toString(this.v1f_1) + ', isAppReady=' + this.w1f_1 + ', mealTypeIds=' + toString(this.x1f_1) + ', serves=' + toString(this.y1f_1) + ', suitableForDietIds=' + toString(this.z1f_1) + ', techniquesUsedIds=' + toString(this.a1g_1) + ', timings=' + toString(this.b1g_1) + ', title=' + this.c1g_1 + ', utensilsAndApplianceIds=' + toString(this.d1g_1) + ', webPublicationDate=' + this.e1g_1 + ')';
   };
   protoOf(RecipeV3).hashCode = function () {
-    var result = this.l1f_1 == null ? 0 : getStringHashCode(this.l1f_1);
+    var result = this.i1f_1 == null ? 0 : getStringHashCode(this.i1f_1);
+    result = imul(result, 31) + (this.j1f_1 == null ? 0 : hashCode(this.j1f_1)) | 0;
+    result = imul(result, 31) + (this.k1f_1 == null ? 0 : getStringHashCode(this.k1f_1)) | 0;
+    result = imul(result, 31) + (this.l1f_1 == null ? 0 : hashCode(this.l1f_1)) | 0;
     result = imul(result, 31) + (this.m1f_1 == null ? 0 : hashCode(this.m1f_1)) | 0;
     result = imul(result, 31) + (this.n1f_1 == null ? 0 : getStringHashCode(this.n1f_1)) | 0;
     result = imul(result, 31) + (this.o1f_1 == null ? 0 : hashCode(this.o1f_1)) | 0;
     result = imul(result, 31) + (this.p1f_1 == null ? 0 : hashCode(this.p1f_1)) | 0;
     result = imul(result, 31) + (this.q1f_1 == null ? 0 : getStringHashCode(this.q1f_1)) | 0;
-    result = imul(result, 31) + (this.r1f_1 == null ? 0 : hashCode(this.r1f_1)) | 0;
-    result = imul(result, 31) + (this.s1f_1 == null ? 0 : hashCode(this.s1f_1)) | 0;
-    result = imul(result, 31) + (this.t1f_1 == null ? 0 : getStringHashCode(this.t1f_1)) | 0;
-    result = imul(result, 31) + (this.u1f_1 == null ? 0 : getStringHashCode(this.u1f_1)) | 0;
-    result = imul(result, 31) + (this.v1f_1 == null ? 0 : this.v1f_1.hashCode()) | 0;
-    result = imul(result, 31) + getStringHashCode(this.w1f_1) | 0;
+    result = imul(result, 31) + (this.r1f_1 == null ? 0 : getStringHashCode(this.r1f_1)) | 0;
+    result = imul(result, 31) + (this.s1f_1 == null ? 0 : this.s1f_1.hashCode()) | 0;
+    result = imul(result, 31) + getStringHashCode(this.t1f_1) | 0;
+    result = imul(result, 31) + (this.u1f_1 == null ? 0 : hashCode(this.u1f_1)) | 0;
+    result = imul(result, 31) + (this.v1f_1 == null ? 0 : hashCode(this.v1f_1)) | 0;
+    result = imul(result, 31) + (this.w1f_1 == null ? 0 : getBooleanHashCode(this.w1f_1)) | 0;
     result = imul(result, 31) + (this.x1f_1 == null ? 0 : hashCode(this.x1f_1)) | 0;
     result = imul(result, 31) + (this.y1f_1 == null ? 0 : hashCode(this.y1f_1)) | 0;
-    result = imul(result, 31) + (this.z1f_1 == null ? 0 : getBooleanHashCode(this.z1f_1)) | 0;
+    result = imul(result, 31) + (this.z1f_1 == null ? 0 : hashCode(this.z1f_1)) | 0;
     result = imul(result, 31) + (this.a1g_1 == null ? 0 : hashCode(this.a1g_1)) | 0;
     result = imul(result, 31) + (this.b1g_1 == null ? 0 : hashCode(this.b1g_1)) | 0;
-    result = imul(result, 31) + (this.c1g_1 == null ? 0 : hashCode(this.c1g_1)) | 0;
+    result = imul(result, 31) + (this.c1g_1 == null ? 0 : getStringHashCode(this.c1g_1)) | 0;
     result = imul(result, 31) + (this.d1g_1 == null ? 0 : hashCode(this.d1g_1)) | 0;
-    result = imul(result, 31) + (this.e1g_1 == null ? 0 : hashCode(this.e1g_1)) | 0;
-    result = imul(result, 31) + (this.f1g_1 == null ? 0 : getStringHashCode(this.f1g_1)) | 0;
-    result = imul(result, 31) + (this.g1g_1 == null ? 0 : hashCode(this.g1g_1)) | 0;
-    result = imul(result, 31) + (this.h1g_1 == null ? 0 : getStringHashCode(this.h1g_1)) | 0;
+    result = imul(result, 31) + (this.e1g_1 == null ? 0 : getStringHashCode(this.e1g_1)) | 0;
     return result;
   };
   protoOf(RecipeV3).equals = function (other) {
@@ -1559,7 +1558,13 @@
       return true;
     if (!(other instanceof RecipeV3))
       return false;
-    if (!(this.l1f_1 == other.l1f_1))
+    if (!(this.i1f_1 == other.i1f_1))
+      return false;
+    if (!equals(this.j1f_1, other.j1f_1))
+      return false;
+    if (!(this.k1f_1 == other.k1f_1))
+      return false;
+    if (!equals(this.l1f_1, other.l1f_1))
       return false;
     if (!equals(this.m1f_1, other.m1f_1))
       return false;
@@ -1571,107 +1576,101 @@
       return false;
     if (!(this.q1f_1 == other.q1f_1))
       return false;
-    if (!equals(this.r1f_1, other.r1f_1))
+    if (!(this.r1f_1 == other.r1f_1))
       return false;
     if (!equals(this.s1f_1, other.s1f_1))
       return false;
-    if (!(this.t1f_1 == other.t1f_1))
+    if (!(this.t1f_1 === other.t1f_1))
       return false;
-    if (!(this.u1f_1 == other.u1f_1))
+    if (!equals(this.u1f_1, other.u1f_1))
       return false;
     if (!equals(this.v1f_1, other.v1f_1))
       return false;
-    if (!(this.w1f_1 === other.w1f_1))
+    if (!(this.w1f_1 == other.w1f_1))
       return false;
     if (!equals(this.x1f_1, other.x1f_1))
       return false;
     if (!equals(this.y1f_1, other.y1f_1))
       return false;
-    if (!(this.z1f_1 == other.z1f_1))
+    if (!equals(this.z1f_1, other.z1f_1))
       return false;
     if (!equals(this.a1g_1, other.a1g_1))
       return false;
     if (!equals(this.b1g_1, other.b1g_1))
       return false;
-    if (!equals(this.c1g_1, other.c1g_1))
+    if (!(this.c1g_1 == other.c1g_1))
       return false;
     if (!equals(this.d1g_1, other.d1g_1))
       return false;
-    if (!equals(this.e1g_1, other.e1g_1))
-      return false;
-    if (!(this.f1g_1 == other.f1g_1))
-      return false;
-    if (!equals(this.g1g_1, other.g1g_1))
-      return false;
-    if (!(this.h1g_1 == other.h1g_1))
+    if (!(this.e1g_1 == other.e1g_1))
       return false;
     return true;
   };
   function $serializer_2() {
     $serializer_instance_2 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.CommerceCta', this, 3);
-    tmp0_serialDesc.rs('sponsorName', false);
-    tmp0_serialDesc.rs('territory', false);
-    tmp0_serialDesc.rs('url', false);
-    this.q1h_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_2).r1h = function (encoder, value) {
-    var tmp0_desc = this.q1h_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    tmp1_output.wm(tmp0_desc, 0, value.s1h_1);
-    tmp1_output.wm(tmp0_desc, 1, value.t1h_1);
-    tmp1_output.wm(tmp0_desc, 2, value.u1h_1);
-    tmp1_output.jl(tmp0_desc);
-  };
-  protoOf($serializer_2).li = function (encoder, value) {
-    return this.r1h(encoder, value instanceof CommerceCta ? value : THROW_CCE());
-  };
-  protoOf($serializer_2).mi = function (decoder) {
-    var tmp0_desc = this.q1h_1;
+    tmp0_serialDesc.os('sponsorName', false);
+    tmp0_serialDesc.os('territory', false);
+    tmp0_serialDesc.os('url', false);
+    this.n1h_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_2).o1h = function (encoder, value) {
+    var tmp0_desc = this.n1h_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    tmp1_output.tm(tmp0_desc, 0, value.p1h_1);
+    tmp1_output.tm(tmp0_desc, 1, value.q1h_1);
+    tmp1_output.tm(tmp0_desc, 2, value.r1h_1);
+    tmp1_output.gl(tmp0_desc);
+  };
+  protoOf($serializer_2).ii = function (encoder, value) {
+    return this.o1h(encoder, value instanceof CommerceCta ? value : THROW_CCE());
+  };
+  protoOf($serializer_2).ji = function (decoder) {
+    var tmp0_desc = this.n1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
     var tmp4_local0 = null;
     var tmp5_local1 = null;
     var tmp6_local2 = null;
-    var tmp7_input = decoder.il(tmp0_desc);
-    if (tmp7_input.yl()) {
-      tmp4_local0 = tmp7_input.sl(tmp0_desc, 0);
+    var tmp7_input = decoder.fl(tmp0_desc);
+    if (tmp7_input.vl()) {
+      tmp4_local0 = tmp7_input.pl(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.sl(tmp0_desc, 1);
+      tmp5_local1 = tmp7_input.pl(tmp0_desc, 1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.sl(tmp0_desc, 2);
+      tmp6_local2 = tmp7_input.pl(tmp0_desc, 2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.zl(tmp0_desc);
+        tmp2_index = tmp7_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.sl(tmp0_desc, 0);
+            tmp4_local0 = tmp7_input.pl(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.sl(tmp0_desc, 1);
+            tmp5_local1 = tmp7_input.pl(tmp0_desc, 1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.sl(tmp0_desc, 2);
+            tmp6_local2 = tmp7_input.pl(tmp0_desc, 2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.jl(tmp0_desc);
+    tmp7_input.gl(tmp0_desc);
     return CommerceCta_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_2).ki = function () {
-    return this.q1h_1;
+  protoOf($serializer_2).hi = function () {
+    return this.n1h_1;
   };
-  protoOf($serializer_2).ts = function () {
+  protoOf($serializer_2).qs = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1685,11 +1684,11 @@
   }
   function CommerceCta_init_$Init$(seen0, sponsorName, territory, url, serializationConstructorMarker, $this) {
     if (!(7 === (7 & seen0))) {
-      throwMissingFieldException(seen0, 7, $serializer_getInstance_2().q1h_1);
+      throwMissingFieldException(seen0, 7, $serializer_getInstance_2().n1h_1);
     }
-    $this.s1h_1 = sponsorName;
-    $this.t1h_1 = territory;
-    $this.u1h_1 = url;
+    $this.p1h_1 = sponsorName;
+    $this.q1h_1 = territory;
+    $this.r1h_1 = url;
     return $this;
   }
   function CommerceCta_init_$Create$(seen0, sponsorName, territory, url, serializationConstructorMarker) {
@@ -1698,12 +1697,12 @@
   function CommerceCta() {
   }
   protoOf(CommerceCta).toString = function () {
-    return 'CommerceCta(sponsorName=' + this.s1h_1 + ', territory=' + this.t1h_1 + ', url=' + this.u1h_1 + ')';
+    return 'CommerceCta(sponsorName=' + this.p1h_1 + ', territory=' + this.q1h_1 + ', url=' + this.r1h_1 + ')';
   };
   protoOf(CommerceCta).hashCode = function () {
-    var result = getStringHashCode(this.s1h_1);
-    result = imul(result, 31) + getStringHashCode(this.t1h_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.u1h_1) | 0;
+    var result = getStringHashCode(this.p1h_1);
+    result = imul(result, 31) + getStringHashCode(this.q1h_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.r1h_1) | 0;
     return result;
   };
   protoOf(CommerceCta).equals = function (other) {
@@ -1711,55 +1710,55 @@
       return true;
     if (!(other instanceof CommerceCta))
       return false;
-    if (!(this.s1h_1 === other.s1h_1))
+    if (!(this.p1h_1 === other.p1h_1))
       return false;
-    if (!(this.t1h_1 === other.t1h_1))
+    if (!(this.q1h_1 === other.q1h_1))
       return false;
-    if (!(this.u1h_1 === other.u1h_1))
+    if (!(this.r1h_1 === other.r1h_1))
       return false;
     return true;
   };
   function $serializer_3() {
     $serializer_instance_3 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Image', this, 8);
-    tmp0_serialDesc.rs('caption', true);
-    tmp0_serialDesc.rs('cropId', false);
-    tmp0_serialDesc.rs('imageType', true);
-    tmp0_serialDesc.rs('mediaApiUrl', true);
-    tmp0_serialDesc.rs('mediaId', false);
-    tmp0_serialDesc.rs('photographer', true);
-    tmp0_serialDesc.rs('source', true);
-    tmp0_serialDesc.rs('url', false);
-    this.v1h_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_3).w1h = function (encoder, value) {
-    var tmp0_desc = this.v1h_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.x1h_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, StringSerializer_getInstance(), value.x1h_1);
+    tmp0_serialDesc.os('caption', true);
+    tmp0_serialDesc.os('cropId', false);
+    tmp0_serialDesc.os('imageType', true);
+    tmp0_serialDesc.os('mediaApiUrl', true);
+    tmp0_serialDesc.os('mediaId', false);
+    tmp0_serialDesc.os('photographer', true);
+    tmp0_serialDesc.os('source', true);
+    tmp0_serialDesc.os('url', false);
+    this.s1h_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_3).t1h = function (encoder, value) {
+    var tmp0_desc = this.s1h_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    if (tmp1_output.bn(tmp0_desc, 0) ? true : !(value.u1h_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 0, StringSerializer_getInstance(), value.u1h_1);
     }
-    tmp1_output.wm(tmp0_desc, 1, value.y1h_1);
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.z1h_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.z1h_1);
+    tmp1_output.tm(tmp0_desc, 1, value.v1h_1);
+    if (tmp1_output.bn(tmp0_desc, 2) ? true : !(value.w1h_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 2, StringSerializer_getInstance(), value.w1h_1);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.a1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 3, StringSerializer_getInstance(), value.a1i_1);
+    if (tmp1_output.bn(tmp0_desc, 3) ? true : !(value.x1h_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 3, StringSerializer_getInstance(), value.x1h_1);
     }
-    tmp1_output.wm(tmp0_desc, 4, value.b1i_1);
-    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.c1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 5, StringSerializer_getInstance(), value.c1i_1);
+    tmp1_output.tm(tmp0_desc, 4, value.y1h_1);
+    if (tmp1_output.bn(tmp0_desc, 5) ? true : !(value.z1h_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 5, StringSerializer_getInstance(), value.z1h_1);
     }
-    if (tmp1_output.en(tmp0_desc, 6) ? true : !(value.d1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 6, StringSerializer_getInstance(), value.d1i_1);
+    if (tmp1_output.bn(tmp0_desc, 6) ? true : !(value.a1i_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 6, StringSerializer_getInstance(), value.a1i_1);
     }
-    tmp1_output.wm(tmp0_desc, 7, value.e1i_1);
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.tm(tmp0_desc, 7, value.b1i_1);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_3).li = function (encoder, value) {
-    return this.w1h(encoder, value instanceof Image ? value : THROW_CCE());
+  protoOf($serializer_3).ii = function (encoder, value) {
+    return this.t1h(encoder, value instanceof Image ? value : THROW_CCE());
   };
-  protoOf($serializer_3).mi = function (decoder) {
-    var tmp0_desc = this.v1h_1;
+  protoOf($serializer_3).ji = function (decoder) {
+    var tmp0_desc = this.s1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -1771,74 +1770,74 @@
     var tmp9_local5 = null;
     var tmp10_local6 = null;
     var tmp11_local7 = null;
-    var tmp12_input = decoder.il(tmp0_desc);
-    if (tmp12_input.yl()) {
-      tmp4_local0 = tmp12_input.wl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+    var tmp12_input = decoder.fl(tmp0_desc);
+    if (tmp12_input.vl()) {
+      tmp4_local0 = tmp12_input.tl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp12_input.sl(tmp0_desc, 1);
+      tmp5_local1 = tmp12_input.pl(tmp0_desc, 1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp12_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp12_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp12_input.wl(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp12_input.tl(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp12_input.sl(tmp0_desc, 4);
+      tmp8_local4 = tmp12_input.pl(tmp0_desc, 4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp12_input.wl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp12_input.tl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp12_input.wl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+      tmp10_local6 = tmp12_input.tl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp12_input.sl(tmp0_desc, 7);
+      tmp11_local7 = tmp12_input.pl(tmp0_desc, 7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp12_input.zl(tmp0_desc);
+        tmp2_index = tmp12_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp12_input.wl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp12_input.tl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp12_input.sl(tmp0_desc, 1);
+            tmp5_local1 = tmp12_input.pl(tmp0_desc, 1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp12_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp12_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp12_input.wl(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp12_input.tl(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp12_input.sl(tmp0_desc, 4);
+            tmp8_local4 = tmp12_input.pl(tmp0_desc, 4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp12_input.wl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp12_input.tl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp12_input.wl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+            tmp10_local6 = tmp12_input.tl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp12_input.sl(tmp0_desc, 7);
+            tmp11_local7 = tmp12_input.pl(tmp0_desc, 7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp12_input.jl(tmp0_desc);
+    tmp12_input.gl(tmp0_desc);
     return Image_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, null);
   };
-  protoOf($serializer_3).ki = function () {
-    return this.v1h_1;
+  protoOf($serializer_3).hi = function () {
+    return this.s1h_1;
   };
-  protoOf($serializer_3).ts = function () {
+  protoOf($serializer_3).qs = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1852,31 +1851,31 @@
   }
   function Image_init_$Init$(seen0, caption, cropId, imageType, mediaApiUrl, mediaId, photographer, source, url, serializationConstructorMarker, $this) {
     if (!(146 === (146 & seen0))) {
-      throwMissingFieldException(seen0, 146, $serializer_getInstance_3().v1h_1);
+      throwMissingFieldException(seen0, 146, $serializer_getInstance_3().s1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.x1h_1 = null;
+      $this.u1h_1 = null;
     else
-      $this.x1h_1 = caption;
-    $this.y1h_1 = cropId;
+      $this.u1h_1 = caption;
+    $this.v1h_1 = cropId;
     if (0 === (seen0 & 4))
-      $this.z1h_1 = null;
+      $this.w1h_1 = null;
     else
-      $this.z1h_1 = imageType;
+      $this.w1h_1 = imageType;
     if (0 === (seen0 & 8))
-      $this.a1i_1 = null;
+      $this.x1h_1 = null;
     else
-      $this.a1i_1 = mediaApiUrl;
-    $this.b1i_1 = mediaId;
+      $this.x1h_1 = mediaApiUrl;
+    $this.y1h_1 = mediaId;
     if (0 === (seen0 & 32))
-      $this.c1i_1 = null;
+      $this.z1h_1 = null;
     else
-      $this.c1i_1 = photographer;
+      $this.z1h_1 = photographer;
     if (0 === (seen0 & 64))
-      $this.d1i_1 = null;
+      $this.a1i_1 = null;
     else
-      $this.d1i_1 = source;
-    $this.e1i_1 = url;
+      $this.a1i_1 = source;
+    $this.b1i_1 = url;
     return $this;
   }
   function Image_init_$Create$(seen0, caption, cropId, imageType, mediaApiUrl, mediaId, photographer, source, url, serializationConstructorMarker) {
@@ -1885,17 +1884,17 @@
   function Image() {
   }
   protoOf(Image).toString = function () {
-    return 'Image(caption=' + this.x1h_1 + ', cropId=' + this.y1h_1 + ', imageType=' + this.z1h_1 + ', mediaApiUrl=' + this.a1i_1 + ', mediaId=' + this.b1i_1 + ', photographer=' + this.c1i_1 + ', source=' + this.d1i_1 + ', url=' + this.e1i_1 + ')';
+    return 'Image(caption=' + this.u1h_1 + ', cropId=' + this.v1h_1 + ', imageType=' + this.w1h_1 + ', mediaApiUrl=' + this.x1h_1 + ', mediaId=' + this.y1h_1 + ', photographer=' + this.z1h_1 + ', source=' + this.a1i_1 + ', url=' + this.b1i_1 + ')';
   };
   protoOf(Image).hashCode = function () {
-    var result = this.x1h_1 == null ? 0 : getStringHashCode(this.x1h_1);
+    var result = this.u1h_1 == null ? 0 : getStringHashCode(this.u1h_1);
+    result = imul(result, 31) + getStringHashCode(this.v1h_1) | 0;
+    result = imul(result, 31) + (this.w1h_1 == null ? 0 : getStringHashCode(this.w1h_1)) | 0;
+    result = imul(result, 31) + (this.x1h_1 == null ? 0 : getStringHashCode(this.x1h_1)) | 0;
     result = imul(result, 31) + getStringHashCode(this.y1h_1) | 0;
     result = imul(result, 31) + (this.z1h_1 == null ? 0 : getStringHashCode(this.z1h_1)) | 0;
     result = imul(result, 31) + (this.a1i_1 == null ? 0 : getStringHashCode(this.a1i_1)) | 0;
     result = imul(result, 31) + getStringHashCode(this.b1i_1) | 0;
-    result = imul(result, 31) + (this.c1i_1 == null ? 0 : getStringHashCode(this.c1i_1)) | 0;
-    result = imul(result, 31) + (this.d1i_1 == null ? 0 : getStringHashCode(this.d1i_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.e1i_1) | 0;
     return result;
   };
   protoOf(Image).equals = function (other) {
@@ -1903,6 +1902,12 @@
       return true;
     if (!(other instanceof Image))
       return false;
+    if (!(this.u1h_1 == other.u1h_1))
+      return false;
+    if (!(this.v1h_1 === other.v1h_1))
+      return false;
+    if (!(this.w1h_1 == other.w1h_1))
+      return false;
     if (!(this.x1h_1 == other.x1h_1))
       return false;
     if (!(this.y1h_1 === other.y1h_1))
@@ -1913,12 +1918,6 @@
       return false;
     if (!(this.b1i_1 === other.b1i_1))
       return false;
-    if (!(this.c1i_1 == other.c1i_1))
-      return false;
-    if (!(this.d1i_1 == other.d1i_1))
-      return false;
-    if (!(this.e1i_1 === other.e1i_1))
-      return false;
     return true;
   };
   function IngredientsList$Companion$$childSerializers$_anonymous__y7k6ja() {
@@ -1931,7 +1930,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.f1i_1 = [lazy(tmp_0, IngredientsList$Companion$$childSerializers$_anonymous__y7k6ja), null];
+    tmp.c1i_1 = [lazy(tmp_0, IngredientsList$Companion$$childSerializers$_anonymous__y7k6ja), null];
   }
   var Companion_instance_3;
   function Companion_getInstance_2() {
@@ -1942,70 +1941,70 @@
   function $serializer_4() {
     $serializer_instance_4 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.IngredientsList', this, 2);
-    tmp0_serialDesc.rs('ingredientsList', true);
-    tmp0_serialDesc.rs('recipeSection', true);
-    this.g1i_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_4).h1i = function (encoder, value) {
-    var tmp0_desc = this.g1i_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_2().f1i_1;
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.i1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, tmp2_cached[0].h2(), value.i1g_1);
+    tmp0_serialDesc.os('ingredientsList', true);
+    tmp0_serialDesc.os('recipeSection', true);
+    this.d1i_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_4).e1i = function (encoder, value) {
+    var tmp0_desc = this.d1i_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_2().c1i_1;
+    if (tmp1_output.bn(tmp0_desc, 0) ? true : !(value.f1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 0, tmp2_cached[0].f2(), value.f1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.j1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.j1g_1);
+    if (tmp1_output.bn(tmp0_desc, 1) ? true : !(value.g1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 1, StringSerializer_getInstance(), value.g1g_1);
     }
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_4).li = function (encoder, value) {
-    return this.h1i(encoder, value instanceof IngredientsList ? value : THROW_CCE());
+  protoOf($serializer_4).ii = function (encoder, value) {
+    return this.e1i(encoder, value instanceof IngredientsList ? value : THROW_CCE());
   };
-  protoOf($serializer_4).mi = function (decoder) {
-    var tmp0_desc = this.g1i_1;
+  protoOf($serializer_4).ji = function (decoder) {
+    var tmp0_desc = this.d1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
     var tmp4_local0 = null;
     var tmp5_local1 = null;
-    var tmp6_input = decoder.il(tmp0_desc);
-    var tmp7_cached = Companion_getInstance_2().f1i_1;
-    if (tmp6_input.yl()) {
-      tmp4_local0 = tmp6_input.wl(tmp0_desc, 0, tmp7_cached[0].h2(), tmp4_local0);
+    var tmp6_input = decoder.fl(tmp0_desc);
+    var tmp7_cached = Companion_getInstance_2().c1i_1;
+    if (tmp6_input.vl()) {
+      tmp4_local0 = tmp6_input.tl(tmp0_desc, 0, tmp7_cached[0].f2(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp6_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp6_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp6_input.zl(tmp0_desc);
+        tmp2_index = tmp6_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp6_input.wl(tmp0_desc, 0, tmp7_cached[0].h2(), tmp4_local0);
+            tmp4_local0 = tmp6_input.tl(tmp0_desc, 0, tmp7_cached[0].f2(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp6_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp6_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp6_input.jl(tmp0_desc);
+    tmp6_input.gl(tmp0_desc);
     return IngredientsList_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
   };
-  protoOf($serializer_4).ki = function () {
-    return this.g1i_1;
+  protoOf($serializer_4).hi = function () {
+    return this.d1i_1;
   };
-  protoOf($serializer_4).ts = function () {
-    var tmp0_cached = Companion_getInstance_2().f1i_1;
+  protoOf($serializer_4).qs = function () {
+    var tmp0_cached = Companion_getInstance_2().c1i_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    return [get_nullable(tmp0_cached[0].h2()), get_nullable(StringSerializer_getInstance())];
+    return [get_nullable(tmp0_cached[0].f2()), get_nullable(StringSerializer_getInstance())];
   };
   var $serializer_instance_4;
   function $serializer_getInstance_4() {
@@ -2015,16 +2014,16 @@
   }
   function IngredientsList_init_$Init$(seen0, ingredientsList, recipeSection, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_4().g1i_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_4().d1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.i1g_1 = null;
+      $this.f1g_1 = null;
     else
-      $this.i1g_1 = ingredientsList;
+      $this.f1g_1 = ingredientsList;
     if (0 === (seen0 & 2))
-      $this.j1g_1 = null;
+      $this.g1g_1 = null;
     else
-      $this.j1g_1 = recipeSection;
+      $this.g1g_1 = recipeSection;
     return $this;
   }
   function IngredientsList_init_$Create$(seen0, ingredientsList, recipeSection, serializationConstructorMarker) {
@@ -2034,15 +2033,15 @@
     Companion_getInstance_2();
     ingredientsList = ingredientsList === VOID ? null : ingredientsList;
     recipeSection = recipeSection === VOID ? null : recipeSection;
-    this.i1g_1 = ingredientsList;
-    this.j1g_1 = recipeSection;
+    this.f1g_1 = ingredientsList;
+    this.g1g_1 = recipeSection;
   }
   protoOf(IngredientsList).toString = function () {
-    return 'IngredientsList(ingredientsList=' + toString(this.i1g_1) + ', recipeSection=' + this.j1g_1 + ')';
+    return 'IngredientsList(ingredientsList=' + toString(this.f1g_1) + ', recipeSection=' + this.g1g_1 + ')';
   };
   protoOf(IngredientsList).hashCode = function () {
-    var result = this.i1g_1 == null ? 0 : hashCode(this.i1g_1);
-    result = imul(result, 31) + (this.j1g_1 == null ? 0 : getStringHashCode(this.j1g_1)) | 0;
+    var result = this.f1g_1 == null ? 0 : hashCode(this.f1g_1);
+    result = imul(result, 31) + (this.g1g_1 == null ? 0 : getStringHashCode(this.g1g_1)) | 0;
     return result;
   };
   protoOf(IngredientsList).equals = function (other) {
@@ -2050,9 +2049,9 @@
       return true;
     if (!(other instanceof IngredientsList))
       return false;
-    if (!equals(this.i1g_1, other.i1g_1))
+    if (!equals(this.f1g_1, other.f1g_1))
       return false;
-    if (!(this.j1g_1 == other.j1g_1))
+    if (!(this.g1g_1 == other.g1g_1))
       return false;
     return true;
   };
@@ -2065,54 +2064,54 @@
   function $serializer_5() {
     $serializer_instance_5 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.IngredientItem', this, 9);
-    tmp0_serialDesc.rs('amount', true);
-    tmp0_serialDesc.rs('ingredientId', true);
-    tmp0_serialDesc.rs('name', true);
-    tmp0_serialDesc.rs('optional', true);
-    tmp0_serialDesc.rs('prefix', true);
-    tmp0_serialDesc.rs('suffix', true);
-    tmp0_serialDesc.rs('template', true);
-    tmp0_serialDesc.rs('text', true);
-    tmp0_serialDesc.rs('unit', true);
-    this.i1i_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_5).j1i = function (encoder, value) {
-    var tmp0_desc = this.i1i_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.k1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, $serializer_getInstance_6(), value.k1g_1);
+    tmp0_serialDesc.os('amount', true);
+    tmp0_serialDesc.os('ingredientId', true);
+    tmp0_serialDesc.os('name', true);
+    tmp0_serialDesc.os('optional', true);
+    tmp0_serialDesc.os('prefix', true);
+    tmp0_serialDesc.os('suffix', true);
+    tmp0_serialDesc.os('template', true);
+    tmp0_serialDesc.os('text', true);
+    tmp0_serialDesc.os('unit', true);
+    this.f1i_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_5).g1i = function (encoder, value) {
+    var tmp0_desc = this.f1i_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    if (tmp1_output.bn(tmp0_desc, 0) ? true : !(value.h1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 0, $serializer_getInstance_6(), value.h1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.l1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.l1g_1);
+    if (tmp1_output.bn(tmp0_desc, 1) ? true : !(value.i1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 1, StringSerializer_getInstance(), value.i1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.m1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.m1g_1);
+    if (tmp1_output.bn(tmp0_desc, 2) ? true : !(value.j1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 2, StringSerializer_getInstance(), value.j1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.n1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 3, BooleanSerializer_getInstance(), value.n1g_1);
+    if (tmp1_output.bn(tmp0_desc, 3) ? true : !(value.k1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 3, BooleanSerializer_getInstance(), value.k1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 4) ? true : !(value.o1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 4, StringSerializer_getInstance(), value.o1g_1);
+    if (tmp1_output.bn(tmp0_desc, 4) ? true : !(value.l1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 4, StringSerializer_getInstance(), value.l1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.p1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 5, StringSerializer_getInstance(), value.p1g_1);
+    if (tmp1_output.bn(tmp0_desc, 5) ? true : !(value.m1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 5, StringSerializer_getInstance(), value.m1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 6) ? true : !(value.q1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 6, StringSerializer_getInstance(), value.q1g_1);
+    if (tmp1_output.bn(tmp0_desc, 6) ? true : !(value.n1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 6, StringSerializer_getInstance(), value.n1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 7) ? true : !(value.r1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 7, StringSerializer_getInstance(), value.r1g_1);
+    if (tmp1_output.bn(tmp0_desc, 7) ? true : !(value.o1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 7, StringSerializer_getInstance(), value.o1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 8) ? true : !(value.s1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 8, StringSerializer_getInstance(), value.s1g_1);
+    if (tmp1_output.bn(tmp0_desc, 8) ? true : !(value.p1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 8, StringSerializer_getInstance(), value.p1g_1);
     }
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_5).li = function (encoder, value) {
-    return this.j1i(encoder, value instanceof IngredientItem ? value : THROW_CCE());
+  protoOf($serializer_5).ii = function (encoder, value) {
+    return this.g1i(encoder, value instanceof IngredientItem ? value : THROW_CCE());
   };
-  protoOf($serializer_5).mi = function (decoder) {
-    var tmp0_desc = this.i1i_1;
+  protoOf($serializer_5).ji = function (decoder) {
+    var tmp0_desc = this.f1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2125,80 +2124,80 @@
     var tmp10_local6 = null;
     var tmp11_local7 = null;
     var tmp12_local8 = null;
-    var tmp13_input = decoder.il(tmp0_desc);
-    if (tmp13_input.yl()) {
-      tmp4_local0 = tmp13_input.wl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
+    var tmp13_input = decoder.fl(tmp0_desc);
+    if (tmp13_input.vl()) {
+      tmp4_local0 = tmp13_input.tl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp13_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp13_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp13_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp13_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp13_input.wl(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp13_input.tl(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp13_input.wl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+      tmp8_local4 = tmp13_input.tl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp13_input.wl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp13_input.tl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp13_input.wl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+      tmp10_local6 = tmp13_input.tl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp13_input.wl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+      tmp11_local7 = tmp13_input.tl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
-      tmp12_local8 = tmp13_input.wl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+      tmp12_local8 = tmp13_input.tl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
       tmp3_bitMask0 = tmp3_bitMask0 | 256;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp13_input.zl(tmp0_desc);
+        tmp2_index = tmp13_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp13_input.wl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
+            tmp4_local0 = tmp13_input.tl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp13_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp13_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp13_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp13_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp13_input.wl(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp13_input.tl(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp13_input.wl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+            tmp8_local4 = tmp13_input.tl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp13_input.wl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp13_input.tl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp13_input.wl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+            tmp10_local6 = tmp13_input.tl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp13_input.wl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+            tmp11_local7 = tmp13_input.tl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           case 8:
-            tmp12_local8 = tmp13_input.wl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+            tmp12_local8 = tmp13_input.tl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
             tmp3_bitMask0 = tmp3_bitMask0 | 256;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp13_input.jl(tmp0_desc);
+    tmp13_input.gl(tmp0_desc);
     return IngredientItem_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, tmp12_local8, null);
   };
-  protoOf($serializer_5).ki = function () {
-    return this.i1i_1;
+  protoOf($serializer_5).hi = function () {
+    return this.f1i_1;
   };
-  protoOf($serializer_5).ts = function () {
+  protoOf($serializer_5).qs = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2212,44 +2211,44 @@
   }
   function IngredientItem_init_$Init$(seen0, amount, ingredientId, name, optional, prefix, suffix, template, text, unit, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_5().i1i_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_5().f1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.k1g_1 = null;
+      $this.h1g_1 = null;
     else
-      $this.k1g_1 = amount;
+      $this.h1g_1 = amount;
     if (0 === (seen0 & 2))
-      $this.l1g_1 = null;
+      $this.i1g_1 = null;
     else
-      $this.l1g_1 = ingredientId;
+      $this.i1g_1 = ingredientId;
     if (0 === (seen0 & 4))
-      $this.m1g_1 = null;
+      $this.j1g_1 = null;
     else
-      $this.m1g_1 = name;
+      $this.j1g_1 = name;
     if (0 === (seen0 & 8))
-      $this.n1g_1 = null;
+      $this.k1g_1 = null;
     else
-      $this.n1g_1 = optional;
+      $this.k1g_1 = optional;
     if (0 === (seen0 & 16))
-      $this.o1g_1 = null;
+      $this.l1g_1 = null;
     else
-      $this.o1g_1 = prefix;
+      $this.l1g_1 = prefix;
     if (0 === (seen0 & 32))
-      $this.p1g_1 = null;
+      $this.m1g_1 = null;
     else
-      $this.p1g_1 = suffix;
+      $this.m1g_1 = suffix;
     if (0 === (seen0 & 64))
-      $this.q1g_1 = null;
+      $this.n1g_1 = null;
     else
-      $this.q1g_1 = template;
+      $this.n1g_1 = template;
     if (0 === (seen0 & 128))
-      $this.r1g_1 = null;
+      $this.o1g_1 = null;
     else
-      $this.r1g_1 = text;
+      $this.o1g_1 = text;
     if (0 === (seen0 & 256))
-      $this.s1g_1 = null;
+      $this.p1g_1 = null;
     else
-      $this.s1g_1 = unit;
+      $this.p1g_1 = unit;
     return $this;
   }
   function IngredientItem_init_$Create$(seen0, amount, ingredientId, name, optional, prefix, suffix, template, text, unit, serializationConstructorMarker) {
@@ -2265,44 +2264,44 @@
     template = template === VOID ? null : template;
     text = text === VOID ? null : text;
     unit = unit === VOID ? null : unit;
-    this.k1g_1 = amount;
-    this.l1g_1 = ingredientId;
-    this.m1g_1 = name;
-    this.n1g_1 = optional;
-    this.o1g_1 = prefix;
-    this.p1g_1 = suffix;
-    this.q1g_1 = template;
-    this.r1g_1 = text;
-    this.s1g_1 = unit;
-  }
-  protoOf(IngredientItem).k1i = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit) {
+    this.h1g_1 = amount;
+    this.i1g_1 = ingredientId;
+    this.j1g_1 = name;
+    this.k1g_1 = optional;
+    this.l1g_1 = prefix;
+    this.m1g_1 = suffix;
+    this.n1g_1 = template;
+    this.o1g_1 = text;
+    this.p1g_1 = unit;
+  }
+  protoOf(IngredientItem).h1i = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit) {
     return new IngredientItem(amount, ingredientId, name, optional, prefix, suffix, template, text, unit);
   };
-  protoOf(IngredientItem).t1g = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit, $super) {
-    amount = amount === VOID ? this.k1g_1 : amount;
-    ingredientId = ingredientId === VOID ? this.l1g_1 : ingredientId;
-    name = name === VOID ? this.m1g_1 : name;
-    optional = optional === VOID ? this.n1g_1 : optional;
-    prefix = prefix === VOID ? this.o1g_1 : prefix;
-    suffix = suffix === VOID ? this.p1g_1 : suffix;
-    template = template === VOID ? this.q1g_1 : template;
-    text = text === VOID ? this.r1g_1 : text;
-    unit = unit === VOID ? this.s1g_1 : unit;
-    return $super === VOID ? this.k1i(amount, ingredientId, name, optional, prefix, suffix, template, text, unit) : $super.k1i.call(this, amount, ingredientId, name, optional, prefix, suffix, template, text, unit);
+  protoOf(IngredientItem).q1g = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit, $super) {
+    amount = amount === VOID ? this.h1g_1 : amount;
+    ingredientId = ingredientId === VOID ? this.i1g_1 : ingredientId;
+    name = name === VOID ? this.j1g_1 : name;
+    optional = optional === VOID ? this.k1g_1 : optional;
+    prefix = prefix === VOID ? this.l1g_1 : prefix;
+    suffix = suffix === VOID ? this.m1g_1 : suffix;
+    template = template === VOID ? this.n1g_1 : template;
+    text = text === VOID ? this.o1g_1 : text;
+    unit = unit === VOID ? this.p1g_1 : unit;
+    return $super === VOID ? this.h1i(amount, ingredientId, name, optional, prefix, suffix, template, text, unit) : $super.h1i.call(this, amount, ingredientId, name, optional, prefix, suffix, template, text, unit);
   };
   protoOf(IngredientItem).toString = function () {
-    return 'IngredientItem(amount=' + toString(this.k1g_1) + ', ingredientId=' + this.l1g_1 + ', name=' + this.m1g_1 + ', optional=' + this.n1g_1 + ', prefix=' + this.o1g_1 + ', suffix=' + this.p1g_1 + ', template=' + this.q1g_1 + ', text=' + this.r1g_1 + ', unit=' + this.s1g_1 + ')';
+    return 'IngredientItem(amount=' + toString(this.h1g_1) + ', ingredientId=' + this.i1g_1 + ', name=' + this.j1g_1 + ', optional=' + this.k1g_1 + ', prefix=' + this.l1g_1 + ', suffix=' + this.m1g_1 + ', template=' + this.n1g_1 + ', text=' + this.o1g_1 + ', unit=' + this.p1g_1 + ')';
   };
   protoOf(IngredientItem).hashCode = function () {
-    var result = this.k1g_1 == null ? 0 : this.k1g_1.hashCode();
+    var result = this.h1g_1 == null ? 0 : this.h1g_1.hashCode();
+    result = imul(result, 31) + (this.i1g_1 == null ? 0 : getStringHashCode(this.i1g_1)) | 0;
+    result = imul(result, 31) + (this.j1g_1 == null ? 0 : getStringHashCode(this.j1g_1)) | 0;
+    result = imul(result, 31) + (this.k1g_1 == null ? 0 : getBooleanHashCode(this.k1g_1)) | 0;
     result = imul(result, 31) + (this.l1g_1 == null ? 0 : getStringHashCode(this.l1g_1)) | 0;
     result = imul(result, 31) + (this.m1g_1 == null ? 0 : getStringHashCode(this.m1g_1)) | 0;
-    result = imul(result, 31) + (this.n1g_1 == null ? 0 : getBooleanHashCode(this.n1g_1)) | 0;
+    result = imul(result, 31) + (this.n1g_1 == null ? 0 : getStringHashCode(this.n1g_1)) | 0;
     result = imul(result, 31) + (this.o1g_1 == null ? 0 : getStringHashCode(this.o1g_1)) | 0;
     result = imul(result, 31) + (this.p1g_1 == null ? 0 : getStringHashCode(this.p1g_1)) | 0;
-    result = imul(result, 31) + (this.q1g_1 == null ? 0 : getStringHashCode(this.q1g_1)) | 0;
-    result = imul(result, 31) + (this.r1g_1 == null ? 0 : getStringHashCode(this.r1g_1)) | 0;
-    result = imul(result, 31) + (this.s1g_1 == null ? 0 : getStringHashCode(this.s1g_1)) | 0;
     return result;
   };
   protoOf(IngredientItem).equals = function (other) {
@@ -2310,7 +2309,13 @@
       return true;
     if (!(other instanceof IngredientItem))
       return false;
-    if (!equals(this.k1g_1, other.k1g_1))
+    if (!equals(this.h1g_1, other.h1g_1))
+      return false;
+    if (!(this.i1g_1 == other.i1g_1))
+      return false;
+    if (!(this.j1g_1 == other.j1g_1))
+      return false;
+    if (!(this.k1g_1 == other.k1g_1))
       return false;
     if (!(this.l1g_1 == other.l1g_1))
       return false;
@@ -2322,12 +2327,6 @@
       return false;
     if (!(this.p1g_1 == other.p1g_1))
       return false;
-    if (!(this.q1g_1 == other.q1g_1))
-      return false;
-    if (!(this.r1g_1 == other.r1g_1))
-      return false;
-    if (!(this.s1g_1 == other.s1g_1))
-      return false;
     return true;
   };
   function Companion_4() {
@@ -2339,63 +2338,63 @@
   function $serializer_6() {
     $serializer_instance_6 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Range', this, 2);
-    tmp0_serialDesc.rs('max', true);
-    tmp0_serialDesc.rs('min', true);
-    this.l1i_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_6).m1i = function (encoder, value) {
-    var tmp0_desc = this.l1i_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.n1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, DoubleSerializer_getInstance(), value.n1i_1);
+    tmp0_serialDesc.os('max', true);
+    tmp0_serialDesc.os('min', true);
+    this.i1i_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_6).j1i = function (encoder, value) {
+    var tmp0_desc = this.i1i_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    if (tmp1_output.bn(tmp0_desc, 0) ? true : !(value.k1i_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 0, DoubleSerializer_getInstance(), value.k1i_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.o1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, DoubleSerializer_getInstance(), value.o1i_1);
+    if (tmp1_output.bn(tmp0_desc, 1) ? true : !(value.l1i_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 1, DoubleSerializer_getInstance(), value.l1i_1);
     }
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_6).li = function (encoder, value) {
-    return this.m1i(encoder, value instanceof Range ? value : THROW_CCE());
+  protoOf($serializer_6).ii = function (encoder, value) {
+    return this.j1i(encoder, value instanceof Range ? value : THROW_CCE());
   };
-  protoOf($serializer_6).mi = function (decoder) {
-    var tmp0_desc = this.l1i_1;
+  protoOf($serializer_6).ji = function (decoder) {
+    var tmp0_desc = this.i1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
     var tmp4_local0 = null;
     var tmp5_local1 = null;
-    var tmp6_input = decoder.il(tmp0_desc);
-    if (tmp6_input.yl()) {
-      tmp4_local0 = tmp6_input.wl(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
+    var tmp6_input = decoder.fl(tmp0_desc);
+    if (tmp6_input.vl()) {
+      tmp4_local0 = tmp6_input.tl(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp6_input.wl(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp6_input.tl(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp6_input.zl(tmp0_desc);
+        tmp2_index = tmp6_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp6_input.wl(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp6_input.tl(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp6_input.wl(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp6_input.tl(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp6_input.jl(tmp0_desc);
+    tmp6_input.gl(tmp0_desc);
     return Range_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
   };
-  protoOf($serializer_6).ki = function () {
-    return this.l1i_1;
+  protoOf($serializer_6).hi = function () {
+    return this.i1i_1;
   };
-  protoOf($serializer_6).ts = function () {
+  protoOf($serializer_6).qs = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2409,16 +2408,16 @@
   }
   function Range_init_$Init$(seen0, max, min, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_6().l1i_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_6().i1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.n1i_1 = null;
+      $this.k1i_1 = null;
     else
-      $this.n1i_1 = max;
+      $this.k1i_1 = max;
     if (0 === (seen0 & 2))
-      $this.o1i_1 = null;
+      $this.l1i_1 = null;
     else
-      $this.o1i_1 = min;
+      $this.l1i_1 = min;
     return $this;
   }
   function Range_init_$Create$(seen0, max, min, serializationConstructorMarker) {
@@ -2427,15 +2426,15 @@
   function Range(max, min) {
     max = max === VOID ? null : max;
     min = min === VOID ? null : min;
-    this.n1i_1 = max;
-    this.o1i_1 = min;
+    this.k1i_1 = max;
+    this.l1i_1 = min;
   }
   protoOf(Range).toString = function () {
-    return 'Range(max=' + this.n1i_1 + ', min=' + this.o1i_1 + ')';
+    return 'Range(max=' + this.k1i_1 + ', min=' + this.l1i_1 + ')';
   };
   protoOf(Range).hashCode = function () {
-    var result = this.n1i_1 == null ? 0 : getNumberHashCode(this.n1i_1);
-    result = imul(result, 31) + (this.o1i_1 == null ? 0 : getNumberHashCode(this.o1i_1)) | 0;
+    var result = this.k1i_1 == null ? 0 : getNumberHashCode(this.k1i_1);
+    result = imul(result, 31) + (this.l1i_1 == null ? 0 : getNumberHashCode(this.l1i_1)) | 0;
     return result;
   };
   protoOf(Range).equals = function (other) {
@@ -2443,9 +2442,9 @@
       return true;
     if (!(other instanceof Range))
       return false;
-    if (!equals(this.n1i_1, other.n1i_1))
+    if (!equals(this.k1i_1, other.k1i_1))
       return false;
-    if (!equals(this.o1i_1, other.o1i_1))
+    if (!equals(this.l1i_1, other.l1i_1))
       return false;
     return true;
   };
@@ -2459,7 +2458,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.p1i_1 = [null, null, lazy(tmp_0, Instruction$Companion$$childSerializers$_anonymous__sbbefw), null];
+    tmp.m1i_1 = [null, null, lazy(tmp_0, Instruction$Companion$$childSerializers$_anonymous__sbbefw), null];
   }
   var Companion_instance_6;
   function Companion_getInstance_5() {
@@ -2470,33 +2469,33 @@
   function $serializer_7() {
     $serializer_instance_7 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Instruction', this, 4);
-    tmp0_serialDesc.rs('description', false);
-    tmp0_serialDesc.rs('descriptionTemplate', true);
-    tmp0_serialDesc.rs('images', true);
-    tmp0_serialDesc.rs('stepNumber', true);
-    this.q1i_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_7).r1i = function (encoder, value) {
-    var tmp0_desc = this.q1i_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_5().p1i_1;
-    tmp1_output.wm(tmp0_desc, 0, value.u1g_1);
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.v1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.v1g_1);
+    tmp0_serialDesc.os('description', false);
+    tmp0_serialDesc.os('descriptionTemplate', true);
+    tmp0_serialDesc.os('images', true);
+    tmp0_serialDesc.os('stepNumber', true);
+    this.n1i_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_7).o1i = function (encoder, value) {
+    var tmp0_desc = this.n1i_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_5().m1i_1;
+    tmp1_output.tm(tmp0_desc, 0, value.r1g_1);
+    if (tmp1_output.bn(tmp0_desc, 1) ? true : !(value.s1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 1, StringSerializer_getInstance(), value.s1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.w1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, tmp2_cached[2].h2(), value.w1g_1);
+    if (tmp1_output.bn(tmp0_desc, 2) ? true : !(value.t1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 2, tmp2_cached[2].f2(), value.t1g_1);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.x1g_1 == null)) {
-      tmp1_output.an(tmp0_desc, 3, DoubleSerializer_getInstance(), value.x1g_1);
+    if (tmp1_output.bn(tmp0_desc, 3) ? true : !(value.u1g_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 3, DoubleSerializer_getInstance(), value.u1g_1);
     }
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_7).li = function (encoder, value) {
-    return this.r1i(encoder, value instanceof Instruction ? value : THROW_CCE());
+  protoOf($serializer_7).ii = function (encoder, value) {
+    return this.o1i(encoder, value instanceof Instruction ? value : THROW_CCE());
   };
-  protoOf($serializer_7).mi = function (decoder) {
-    var tmp0_desc = this.q1i_1;
+  protoOf($serializer_7).ji = function (decoder) {
+    var tmp0_desc = this.n1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2504,56 +2503,56 @@
     var tmp5_local1 = null;
     var tmp6_local2 = null;
     var tmp7_local3 = null;
-    var tmp8_input = decoder.il(tmp0_desc);
-    var tmp9_cached = Companion_getInstance_5().p1i_1;
-    if (tmp8_input.yl()) {
-      tmp4_local0 = tmp8_input.sl(tmp0_desc, 0);
+    var tmp8_input = decoder.fl(tmp0_desc);
+    var tmp9_cached = Companion_getInstance_5().m1i_1;
+    if (tmp8_input.vl()) {
+      tmp4_local0 = tmp8_input.pl(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp8_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp8_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp8_input.wl(tmp0_desc, 2, tmp9_cached[2].h2(), tmp6_local2);
+      tmp6_local2 = tmp8_input.tl(tmp0_desc, 2, tmp9_cached[2].f2(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp8_input.wl(tmp0_desc, 3, DoubleSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp8_input.tl(tmp0_desc, 3, DoubleSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp8_input.zl(tmp0_desc);
+        tmp2_index = tmp8_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp8_input.sl(tmp0_desc, 0);
+            tmp4_local0 = tmp8_input.pl(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp8_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp8_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp8_input.wl(tmp0_desc, 2, tmp9_cached[2].h2(), tmp6_local2);
+            tmp6_local2 = tmp8_input.tl(tmp0_desc, 2, tmp9_cached[2].f2(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp8_input.wl(tmp0_desc, 3, DoubleSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp8_input.tl(tmp0_desc, 3, DoubleSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp8_input.jl(tmp0_desc);
+    tmp8_input.gl(tmp0_desc);
     return Instruction_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
-  protoOf($serializer_7).ki = function () {
-    return this.q1i_1;
+  protoOf($serializer_7).hi = function () {
+    return this.n1i_1;
   };
-  protoOf($serializer_7).ts = function () {
-    var tmp0_cached = Companion_getInstance_5().p1i_1;
+  protoOf($serializer_7).qs = function () {
+    var tmp0_cached = Companion_getInstance_5().m1i_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    return [StringSerializer_getInstance(), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[2].h2()), get_nullable(DoubleSerializer_getInstance())];
+    return [StringSerializer_getInstance(), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[2].f2()), get_nullable(DoubleSerializer_getInstance())];
   };
   var $serializer_instance_7;
   function $serializer_getInstance_7() {
@@ -2563,21 +2562,21 @@
   }
   function Instruction_init_$Init$(seen0, description, descriptionTemplate, images, stepNumber, serializationConstructorMarker, $this) {
     if (!(1 === (1 & seen0))) {
-      throwMissingFieldException(seen0, 1, $serializer_getInstance_7().q1i_1);
+      throwMissingFieldException(seen0, 1, $serializer_getInstance_7().n1i_1);
     }
-    $this.u1g_1 = description;
+    $this.r1g_1 = description;
     if (0 === (seen0 & 2))
-      $this.v1g_1 = null;
+      $this.s1g_1 = null;
     else
-      $this.v1g_1 = descriptionTemplate;
+      $this.s1g_1 = descriptionTemplate;
     if (0 === (seen0 & 4))
-      $this.w1g_1 = null;
+      $this.t1g_1 = null;
     else
-      $this.w1g_1 = images;
+      $this.t1g_1 = images;
     if (0 === (seen0 & 8))
-      $this.x1g_1 = null;
+      $this.u1g_1 = null;
     else
-      $this.x1g_1 = stepNumber;
+      $this.u1g_1 = stepNumber;
     return $this;
   }
   function Instruction_init_$Create$(seen0, description, descriptionTemplate, images, stepNumber, serializationConstructorMarker) {
@@ -2588,29 +2587,29 @@
     descriptionTemplate = descriptionTemplate === VOID ? null : descriptionTemplate;
     images = images === VOID ? null : images;
     stepNumber = stepNumber === VOID ? null : stepNumber;
-    this.u1g_1 = description;
-    this.v1g_1 = descriptionTemplate;
-    this.w1g_1 = images;
-    this.x1g_1 = stepNumber;
+    this.r1g_1 = description;
+    this.s1g_1 = descriptionTemplate;
+    this.t1g_1 = images;
+    this.u1g_1 = stepNumber;
   }
-  protoOf(Instruction).s1i = function (description, descriptionTemplate, images, stepNumber) {
+  protoOf(Instruction).p1i = function (description, descriptionTemplate, images, stepNumber) {
     return new Instruction(description, descriptionTemplate, images, stepNumber);
   };
-  protoOf(Instruction).y1g = function (description, descriptionTemplate, images, stepNumber, $super) {
-    description = description === VOID ? this.u1g_1 : description;
-    descriptionTemplate = descriptionTemplate === VOID ? this.v1g_1 : descriptionTemplate;
-    images = images === VOID ? this.w1g_1 : images;
-    stepNumber = stepNumber === VOID ? this.x1g_1 : stepNumber;
-    return $super === VOID ? this.s1i(description, descriptionTemplate, images, stepNumber) : $super.s1i.call(this, description, descriptionTemplate, images, stepNumber);
+  protoOf(Instruction).v1g = function (description, descriptionTemplate, images, stepNumber, $super) {
+    description = description === VOID ? this.r1g_1 : description;
+    descriptionTemplate = descriptionTemplate === VOID ? this.s1g_1 : descriptionTemplate;
+    images = images === VOID ? this.t1g_1 : images;
+    stepNumber = stepNumber === VOID ? this.u1g_1 : stepNumber;
+    return $super === VOID ? this.p1i(description, descriptionTemplate, images, stepNumber) : $super.p1i.call(this, description, descriptionTemplate, images, stepNumber);
   };
   protoOf(Instruction).toString = function () {
-    return 'Instruction(description=' + this.u1g_1 + ', descriptionTemplate=' + this.v1g_1 + ', images=' + toString(this.w1g_1) + ', stepNumber=' + this.x1g_1 + ')';
+    return 'Instruction(description=' + this.r1g_1 + ', descriptionTemplate=' + this.s1g_1 + ', images=' + toString(this.t1g_1) + ', stepNumber=' + this.u1g_1 + ')';
   };
   protoOf(Instruction).hashCode = function () {
-    var result = getStringHashCode(this.u1g_1);
-    result = imul(result, 31) + (this.v1g_1 == null ? 0 : getStringHashCode(this.v1g_1)) | 0;
-    result = imul(result, 31) + (this.w1g_1 == null ? 0 : hashCode(this.w1g_1)) | 0;
-    result = imul(result, 31) + (this.x1g_1 == null ? 0 : getNumberHashCode(this.x1g_1)) | 0;
+    var result = getStringHashCode(this.r1g_1);
+    result = imul(result, 31) + (this.s1g_1 == null ? 0 : getStringHashCode(this.s1g_1)) | 0;
+    result = imul(result, 31) + (this.t1g_1 == null ? 0 : hashCode(this.t1g_1)) | 0;
+    result = imul(result, 31) + (this.u1g_1 == null ? 0 : getNumberHashCode(this.u1g_1)) | 0;
     return result;
   };
   protoOf(Instruction).equals = function (other) {
@@ -2618,85 +2617,85 @@
       return true;
     if (!(other instanceof Instruction))
       return false;
-    if (!(this.u1g_1 === other.u1g_1))
+    if (!(this.r1g_1 === other.r1g_1))
       return false;
-    if (!(this.v1g_1 == other.v1g_1))
+    if (!(this.s1g_1 == other.s1g_1))
       return false;
-    if (!equals(this.w1g_1, other.w1g_1))
+    if (!equals(this.t1g_1, other.t1g_1))
       return false;
-    if (!equals(this.x1g_1, other.x1g_1))
+    if (!equals(this.u1g_1, other.u1g_1))
       return false;
     return true;
   };
   function $serializer_8() {
     $serializer_instance_8 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Serves', this, 3);
-    tmp0_serialDesc.rs('amount', true);
-    tmp0_serialDesc.rs('text', true);
-    tmp0_serialDesc.rs('unit', false);
-    this.t1i_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_8).u1i = function (encoder, value) {
-    var tmp0_desc = this.t1i_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.v1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, $serializer_getInstance_6(), value.v1i_1);
+    tmp0_serialDesc.os('amount', true);
+    tmp0_serialDesc.os('text', true);
+    tmp0_serialDesc.os('unit', false);
+    this.q1i_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_8).r1i = function (encoder, value) {
+    var tmp0_desc = this.q1i_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    if (tmp1_output.bn(tmp0_desc, 0) ? true : !(value.s1i_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 0, $serializer_getInstance_6(), value.s1i_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.w1i_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.w1i_1);
+    if (tmp1_output.bn(tmp0_desc, 1) ? true : !(value.t1i_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 1, StringSerializer_getInstance(), value.t1i_1);
     }
-    tmp1_output.wm(tmp0_desc, 2, value.x1i_1);
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.tm(tmp0_desc, 2, value.u1i_1);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_8).li = function (encoder, value) {
-    return this.u1i(encoder, value instanceof Serves ? value : THROW_CCE());
+  protoOf($serializer_8).ii = function (encoder, value) {
+    return this.r1i(encoder, value instanceof Serves ? value : THROW_CCE());
   };
-  protoOf($serializer_8).mi = function (decoder) {
-    var tmp0_desc = this.t1i_1;
+  protoOf($serializer_8).ji = function (decoder) {
+    var tmp0_desc = this.q1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
     var tmp4_local0 = null;
     var tmp5_local1 = null;
     var tmp6_local2 = null;
-    var tmp7_input = decoder.il(tmp0_desc);
-    if (tmp7_input.yl()) {
-      tmp4_local0 = tmp7_input.wl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
+    var tmp7_input = decoder.fl(tmp0_desc);
+    if (tmp7_input.vl()) {
+      tmp4_local0 = tmp7_input.tl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp7_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.sl(tmp0_desc, 2);
+      tmp6_local2 = tmp7_input.pl(tmp0_desc, 2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.zl(tmp0_desc);
+        tmp2_index = tmp7_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.wl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
+            tmp4_local0 = tmp7_input.tl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp7_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.sl(tmp0_desc, 2);
+            tmp6_local2 = tmp7_input.pl(tmp0_desc, 2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.jl(tmp0_desc);
+    tmp7_input.gl(tmp0_desc);
     return Serves_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_8).ki = function () {
-    return this.t1i_1;
+  protoOf($serializer_8).hi = function () {
+    return this.q1i_1;
   };
-  protoOf($serializer_8).ts = function () {
+  protoOf($serializer_8).qs = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2710,17 +2709,17 @@
   }
   function Serves_init_$Init$(seen0, amount, text, unit, serializationConstructorMarker, $this) {
     if (!(4 === (4 & seen0))) {
-      throwMissingFieldException(seen0, 4, $serializer_getInstance_8().t1i_1);
+      throwMissingFieldException(seen0, 4, $serializer_getInstance_8().q1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.v1i_1 = null;
+      $this.s1i_1 = null;
     else
-      $this.v1i_1 = amount;
+      $this.s1i_1 = amount;
     if (0 === (seen0 & 2))
-      $this.w1i_1 = null;
+      $this.t1i_1 = null;
     else
-      $this.w1i_1 = text;
-    $this.x1i_1 = unit;
+      $this.t1i_1 = text;
+    $this.u1i_1 = unit;
     return $this;
   }
   function Serves_init_$Create$(seen0, amount, text, unit, serializationConstructorMarker) {
@@ -2729,12 +2728,12 @@
   function Serves() {
   }
   protoOf(Serves).toString = function () {
-    return 'Serves(amount=' + toString(this.v1i_1) + ', text=' + this.w1i_1 + ', unit=' + this.x1i_1 + ')';
+    return 'Serves(amount=' + toString(this.s1i_1) + ', text=' + this.t1i_1 + ', unit=' + this.u1i_1 + ')';
   };
   protoOf(Serves).hashCode = function () {
-    var result = this.v1i_1 == null ? 0 : this.v1i_1.hashCode();
-    result = imul(result, 31) + (this.w1i_1 == null ? 0 : getStringHashCode(this.w1i_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.x1i_1) | 0;
+    var result = this.s1i_1 == null ? 0 : this.s1i_1.hashCode();
+    result = imul(result, 31) + (this.t1i_1 == null ? 0 : getStringHashCode(this.t1i_1)) | 0;
+    result = imul(result, 31) + getStringHashCode(this.u1i_1) | 0;
     return result;
   };
   protoOf(Serves).equals = function (other) {
@@ -2742,11 +2741,11 @@
       return true;
     if (!(other instanceof Serves))
       return false;
-    if (!equals(this.v1i_1, other.v1i_1))
+    if (!equals(this.s1i_1, other.s1i_1))
       return false;
-    if (!(this.w1i_1 == other.w1i_1))
+    if (!(this.t1i_1 == other.t1i_1))
       return false;
-    if (!(this.x1i_1 === other.x1i_1))
+    if (!(this.u1i_1 === other.u1i_1))
       return false;
     return true;
   };
@@ -2759,74 +2758,74 @@
   function $serializer_9() {
     $serializer_instance_9 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Timing', this, 3);
-    tmp0_serialDesc.rs('durationInMins', true);
-    tmp0_serialDesc.rs('qualifier', true);
-    tmp0_serialDesc.rs('text', true);
-    this.y1i_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_9).z1i = function (encoder, value) {
-    var tmp0_desc = this.y1i_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.a1j_1 == null)) {
-      tmp1_output.an(tmp0_desc, 0, $serializer_getInstance_6(), value.a1j_1);
+    tmp0_serialDesc.os('durationInMins', true);
+    tmp0_serialDesc.os('qualifier', true);
+    tmp0_serialDesc.os('text', true);
+    this.v1i_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_9).w1i = function (encoder, value) {
+    var tmp0_desc = this.v1i_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    if (tmp1_output.bn(tmp0_desc, 0) ? true : !(value.x1i_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 0, $serializer_getInstance_6(), value.x1i_1);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.b1j_1 == null)) {
-      tmp1_output.an(tmp0_desc, 1, StringSerializer_getInstance(), value.b1j_1);
+    if (tmp1_output.bn(tmp0_desc, 1) ? true : !(value.y1i_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 1, StringSerializer_getInstance(), value.y1i_1);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.c1j_1 == null)) {
-      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.c1j_1);
+    if (tmp1_output.bn(tmp0_desc, 2) ? true : !(value.z1i_1 == null)) {
+      tmp1_output.xm(tmp0_desc, 2, StringSerializer_getInstance(), value.z1i_1);
     }
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_9).li = function (encoder, value) {
-    return this.z1i(encoder, value instanceof Timing ? value : THROW_CCE());
+  protoOf($serializer_9).ii = function (encoder, value) {
+    return this.w1i(encoder, value instanceof Timing ? value : THROW_CCE());
   };
-  protoOf($serializer_9).mi = function (decoder) {
-    var tmp0_desc = this.y1i_1;
+  protoOf($serializer_9).ji = function (decoder) {
+    var tmp0_desc = this.v1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
     var tmp4_local0 = null;
     var tmp5_local1 = null;
     var tmp6_local2 = null;
-    var tmp7_input = decoder.il(tmp0_desc);
-    if (tmp7_input.yl()) {
-      tmp4_local0 = tmp7_input.wl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
+    var tmp7_input = decoder.fl(tmp0_desc);
+    if (tmp7_input.vl()) {
+      tmp4_local0 = tmp7_input.tl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp7_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp7_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.zl(tmp0_desc);
+        tmp2_index = tmp7_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.wl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
+            tmp4_local0 = tmp7_input.tl(tmp0_desc, 0, $serializer_getInstance_6(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.wl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp7_input.tl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp7_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.jl(tmp0_desc);
+    tmp7_input.gl(tmp0_desc);
     return Timing_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_9).ki = function () {
-    return this.y1i_1;
+  protoOf($serializer_9).hi = function () {
+    return this.v1i_1;
   };
-  protoOf($serializer_9).ts = function () {
+  protoOf($serializer_9).qs = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2840,20 +2839,20 @@
   }
   function Timing_init_$Init$(seen0, durationInMins, qualifier, text, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_9().y1i_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_9().v1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.a1j_1 = null;
+      $this.x1i_1 = null;
     else
-      $this.a1j_1 = durationInMins;
+      $this.x1i_1 = durationInMins;
     if (0 === (seen0 & 2))
-      $this.b1j_1 = null;
+      $this.y1i_1 = null;
     else
-      $this.b1j_1 = qualifier;
+      $this.y1i_1 = qualifier;
     if (0 === (seen0 & 4))
-      $this.c1j_1 = null;
+      $this.z1i_1 = null;
     else
-      $this.c1j_1 = text;
+      $this.z1i_1 = text;
     return $this;
   }
   function Timing_init_$Create$(seen0, durationInMins, qualifier, text, serializationConstructorMarker) {
@@ -2863,17 +2862,17 @@
     durationInMins = durationInMins === VOID ? null : durationInMins;
     qualifier = qualifier === VOID ? null : qualifier;
     text = text === VOID ? null : text;
-    this.a1j_1 = durationInMins;
-    this.b1j_1 = qualifier;
-    this.c1j_1 = text;
+    this.x1i_1 = durationInMins;
+    this.y1i_1 = qualifier;
+    this.z1i_1 = text;
   }
   protoOf(Timing).toString = function () {
-    return 'Timing(durationInMins=' + toString(this.a1j_1) + ', qualifier=' + this.b1j_1 + ', text=' + this.c1j_1 + ')';
+    return 'Timing(durationInMins=' + toString(this.x1i_1) + ', qualifier=' + this.y1i_1 + ', text=' + this.z1i_1 + ')';
   };
   protoOf(Timing).hashCode = function () {
-    var result = this.a1j_1 == null ? 0 : this.a1j_1.hashCode();
-    result = imul(result, 31) + (this.b1j_1 == null ? 0 : getStringHashCode(this.b1j_1)) | 0;
-    result = imul(result, 31) + (this.c1j_1 == null ? 0 : getStringHashCode(this.c1j_1)) | 0;
+    var result = this.x1i_1 == null ? 0 : this.x1i_1.hashCode();
+    result = imul(result, 31) + (this.y1i_1 == null ? 0 : getStringHashCode(this.y1i_1)) | 0;
+    result = imul(result, 31) + (this.z1i_1 == null ? 0 : getStringHashCode(this.z1i_1)) | 0;
     return result;
   };
   protoOf(Timing).equals = function (other) {
@@ -2881,29 +2880,29 @@
       return true;
     if (!(other instanceof Timing))
       return false;
-    if (!equals(this.a1j_1, other.a1j_1))
+    if (!equals(this.x1i_1, other.x1i_1))
       return false;
-    if (!(this.b1j_1 == other.b1j_1))
+    if (!(this.y1i_1 == other.y1i_1))
       return false;
-    if (!(this.c1j_1 == other.c1j_1))
+    if (!(this.z1i_1 == other.z1i_1))
       return false;
     return true;
   };
   function ParsedTemplate(elements) {
-    this.k1f_1 = elements;
+    this.h1f_1 = elements;
   }
   protoOf(ParsedTemplate).toString = function () {
-    return 'ParsedTemplate(elements=' + toString_0(this.k1f_1) + ')';
+    return 'ParsedTemplate(elements=' + toString_0(this.h1f_1) + ')';
   };
   protoOf(ParsedTemplate).hashCode = function () {
-    return hashCode(this.k1f_1);
+    return hashCode(this.h1f_1);
   };
   protoOf(ParsedTemplate).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof ParsedTemplate))
       return false;
-    if (!equals(this.k1f_1, other.k1f_1))
+    if (!equals(this.h1f_1, other.h1f_1))
       return false;
     return true;
   };
@@ -2919,64 +2918,64 @@
     var parts = ArrayList_init_$Create$_0();
     var lastEnd = 0;
     // Inline function 'kotlin.sequences.forEach' call
-    var _iterator__ex2g4s = pattern.wa(template).s();
-    while (_iterator__ex2g4s.t()) {
-      var element = _iterator__ex2g4s.u();
-      if (element.ya().e1_1 > lastEnd) {
-        var textPart = substring(template, lastEnd, element.ya().e1_1);
+    var _iterator__ex2g4s = pattern.wa(template).q();
+    while (_iterator__ex2g4s.r()) {
+      var element = _iterator__ex2g4s.s();
+      if (element.ya().d1_1 > lastEnd) {
+        var textPart = substring(template, lastEnd, element.ya().d1_1);
         // Inline function 'kotlin.text.isNotEmpty' call
         if (charSequenceLength(textPart) > 0) {
-          parts.w(new TemplateConst(textPart));
+          parts.u(new TemplateConst(textPart));
         }
       }
       try {
-        var jsonObj = get_jsonObject(Default_getInstance().w11(element.h2()));
-        if (jsonObj.l2().z('min')) {
+        var jsonObj = get_jsonObject(Default_getInstance().t11(element.f2()));
+        if (jsonObj.j2().x('min')) {
           // Inline function 'kotlinx.serialization.json.decodeFromJsonElement' call
           var this_0 = get_tolerantJson();
           // Inline function 'kotlinx.serialization.serializer' call
-          var this_1 = this_0.xl();
+          var this_1 = this_0.ul();
           // Inline function 'kotlinx.serialization.internal.cast' call
           var this_2 = serializer(this_1, createKType(getKClass(QuantityPlaceholder), arrayOf([]), false));
-          var tmp$ret$3 = isInterface(this_2, KSerializer) ? this_2 : THROW_CCE();
+          var tmp$ret$5 = isInterface(this_2, KSerializer) ? this_2 : THROW_CCE();
           // Inline function 'kotlin.let' call
-          var it = this_0.v11(tmp$ret$3, jsonObj);
-          parts.w(it);
+          var it = this_0.s11(tmp$ret$5, jsonObj);
+          parts.u(it);
         } else {
           // Inline function 'kotlinx.serialization.json.decodeFromJsonElement' call
           var this_3 = get_tolerantJson();
           // Inline function 'kotlinx.serialization.serializer' call
-          var this_4 = this_3.xl();
+          var this_4 = this_3.ul();
           // Inline function 'kotlinx.serialization.internal.cast' call
           var this_5 = serializer(this_4, createKType(getKClass(OvenTemperaturePlaceholder), arrayOf([]), false));
-          var tmp$ret$8 = isInterface(this_5, KSerializer) ? this_5 : THROW_CCE();
+          var tmp$ret$10 = isInterface(this_5, KSerializer) ? this_5 : THROW_CCE();
           // Inline function 'kotlin.let' call
-          var it_0 = this_3.v11(tmp$ret$8, jsonObj);
-          parts.w(it_0);
+          var it_0 = this_3.s11(tmp$ret$10, jsonObj);
+          parts.u(it_0);
         }
       } catch ($p) {
         if ($p instanceof Exception) {
           var e = $p;
-          print('Failed to parse JSON: ' + element.h2() + ', error: ' + e.message);
-          parts.w(new TemplateConst(element.h2()));
+          print('Failed to parse JSON: ' + element.f2() + ', error: ' + e.message);
+          parts.u(new TemplateConst(element.f2()));
         } else {
           throw $p;
         }
       }
-      lastEnd = element.ya().f1_1 + 1 | 0;
+      lastEnd = element.ya().e1_1 + 1 | 0;
     }
     if (lastEnd < template.length) {
       var remaining = substring_0(template, lastEnd);
       // Inline function 'kotlin.text.isNotBlank' call
       if (!isBlank(remaining)) {
-        parts.w(new TemplateConst(remaining));
+        parts.u(new TemplateConst(remaining));
       }
     }
     return new ParsedTemplate(parts);
   }
   function tolerantJson$lambda($this$Json) {
     _init_properties_Parser_kt__o3jwn5();
-    $this$Json.o12_1 = true;
+    $this$Json.l12_1 = true;
     return Unit_instance;
   }
   var properties_initialized_Parser_kt_5uifb3;
@@ -2991,18 +2990,18 @@
   function TemplateConst(value) {
     this.value = value;
   }
-  protoOf(TemplateConst).h2 = function () {
+  protoOf(TemplateConst).f2 = function () {
     return this.value;
   };
-  protoOf(TemplateConst).hd = function () {
+  protoOf(TemplateConst).ed = function () {
     return this.value;
   };
-  protoOf(TemplateConst).d1j = function (value) {
+  protoOf(TemplateConst).a1j = function (value) {
     return new TemplateConst(value);
   };
   protoOf(TemplateConst).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return $super === VOID ? this.d1j(value) : $super.d1j.call(this, value);
+    return $super === VOID ? this.a1j(value) : $super.a1j.call(this, value);
   };
   protoOf(TemplateConst).toString = function () {
     return 'TemplateConst(value=' + this.value + ')';
@@ -3028,40 +3027,40 @@
   function $serializer_10() {
     $serializer_instance_10 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.template.QuantityPlaceholder', this, 6);
-    tmp0_serialDesc.rs('min', false);
-    tmp0_serialDesc.rs('max', true);
-    tmp0_serialDesc.rs('unit', true);
-    tmp0_serialDesc.rs('scale', true);
-    tmp0_serialDesc.rs('ingredient', true);
-    tmp0_serialDesc.rs('usCust', true);
-    this.e1j_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_10).f1j = function (encoder, value) {
-    var tmp0_desc = this.e1j_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    tmp1_output.tm(tmp0_desc, 0, value.min);
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.max == null)) {
-      tmp1_output.an(tmp0_desc, 1, FloatSerializer_getInstance(), value.max);
+    tmp0_serialDesc.os('min', false);
+    tmp0_serialDesc.os('max', true);
+    tmp0_serialDesc.os('unit', true);
+    tmp0_serialDesc.os('scale', true);
+    tmp0_serialDesc.os('ingredient', true);
+    tmp0_serialDesc.os('usCust', true);
+    this.b1j_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_10).c1j = function (encoder, value) {
+    var tmp0_desc = this.b1j_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    tmp1_output.qm(tmp0_desc, 0, value.min);
+    if (tmp1_output.bn(tmp0_desc, 1) ? true : !(value.max == null)) {
+      tmp1_output.xm(tmp0_desc, 1, FloatSerializer_getInstance(), value.max);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.unit == null)) {
-      tmp1_output.an(tmp0_desc, 2, StringSerializer_getInstance(), value.unit);
+    if (tmp1_output.bn(tmp0_desc, 2) ? true : !(value.unit == null)) {
+      tmp1_output.xm(tmp0_desc, 2, StringSerializer_getInstance(), value.unit);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.scale === false)) {
-      tmp1_output.om(tmp0_desc, 3, value.scale);
+    if (tmp1_output.bn(tmp0_desc, 3) ? true : !(value.scale === false)) {
+      tmp1_output.lm(tmp0_desc, 3, value.scale);
     }
-    if (tmp1_output.en(tmp0_desc, 4) ? true : !(value.ingredient == null)) {
-      tmp1_output.an(tmp0_desc, 4, StringSerializer_getInstance(), value.ingredient);
+    if (tmp1_output.bn(tmp0_desc, 4) ? true : !(value.ingredient == null)) {
+      tmp1_output.xm(tmp0_desc, 4, StringSerializer_getInstance(), value.ingredient);
     }
-    if (tmp1_output.en(tmp0_desc, 5) ? true : !(value.usCust == null)) {
-      tmp1_output.an(tmp0_desc, 5, BooleanSerializer_getInstance(), value.usCust);
+    if (tmp1_output.bn(tmp0_desc, 5) ? true : !(value.usCust == null)) {
+      tmp1_output.xm(tmp0_desc, 5, BooleanSerializer_getInstance(), value.usCust);
     }
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_10).li = function (encoder, value) {
-    return this.f1j(encoder, value instanceof QuantityPlaceholder ? value : THROW_CCE());
+  protoOf($serializer_10).ii = function (encoder, value) {
+    return this.c1j(encoder, value instanceof QuantityPlaceholder ? value : THROW_CCE());
   };
-  protoOf($serializer_10).mi = function (decoder) {
-    var tmp0_desc = this.e1j_1;
+  protoOf($serializer_10).ji = function (decoder) {
+    var tmp0_desc = this.b1j_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -3071,62 +3070,62 @@
     var tmp7_local3 = false;
     var tmp8_local4 = null;
     var tmp9_local5 = null;
-    var tmp10_input = decoder.il(tmp0_desc);
-    if (tmp10_input.yl()) {
-      tmp4_local0 = tmp10_input.pl(tmp0_desc, 0);
+    var tmp10_input = decoder.fl(tmp0_desc);
+    if (tmp10_input.vl()) {
+      tmp4_local0 = tmp10_input.ml(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp10_input.wl(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp10_input.tl(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp10_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp10_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp10_input.kl(tmp0_desc, 3);
+      tmp7_local3 = tmp10_input.hl(tmp0_desc, 3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp10_input.wl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+      tmp8_local4 = tmp10_input.tl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp10_input.wl(tmp0_desc, 5, BooleanSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp10_input.tl(tmp0_desc, 5, BooleanSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp10_input.zl(tmp0_desc);
+        tmp2_index = tmp10_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp10_input.pl(tmp0_desc, 0);
+            tmp4_local0 = tmp10_input.ml(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp10_input.wl(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp10_input.tl(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp10_input.wl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp10_input.tl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp10_input.kl(tmp0_desc, 3);
+            tmp7_local3 = tmp10_input.hl(tmp0_desc, 3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp10_input.wl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+            tmp8_local4 = tmp10_input.tl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp10_input.wl(tmp0_desc, 5, BooleanSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp10_input.tl(tmp0_desc, 5, BooleanSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp10_input.jl(tmp0_desc);
+    tmp10_input.gl(tmp0_desc);
     return QuantityPlaceholder_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, null);
   };
-  protoOf($serializer_10).ki = function () {
-    return this.e1j_1;
+  protoOf($serializer_10).hi = function () {
+    return this.b1j_1;
   };
-  protoOf($serializer_10).ts = function () {
+  protoOf($serializer_10).qs = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -3140,7 +3139,7 @@
   }
   function QuantityPlaceholder_init_$Init$(seen0, min, max, unit, scale, ingredient, usCust, serializationConstructorMarker, $this) {
     if (!(1 === (1 & seen0))) {
-      throwMissingFieldException(seen0, 1, $serializer_getInstance_10().e1j_1);
+      throwMissingFieldException(seen0, 1, $serializer_getInstance_10().b1j_1);
     }
     $this.min = min;
     if (0 === (seen0 & 2))
@@ -3181,43 +3180,43 @@
     this.ingredient = ingredient;
     this.usCust = usCust;
   }
-  protoOf(QuantityPlaceholder).g1j = function () {
+  protoOf(QuantityPlaceholder).d1j = function () {
     return this.min;
   };
-  protoOf(QuantityPlaceholder).h1j = function () {
+  protoOf(QuantityPlaceholder).e1j = function () {
     return this.max;
   };
-  protoOf(QuantityPlaceholder).i1j = function () {
+  protoOf(QuantityPlaceholder).f1j = function () {
     return this.unit;
   };
-  protoOf(QuantityPlaceholder).j1j = function () {
+  protoOf(QuantityPlaceholder).g1j = function () {
     return this.scale;
   };
-  protoOf(QuantityPlaceholder).k1j = function () {
+  protoOf(QuantityPlaceholder).h1j = function () {
     return this.ingredient;
   };
-  protoOf(QuantityPlaceholder).l1j = function () {
+  protoOf(QuantityPlaceholder).i1j = function () {
     return this.usCust;
   };
-  protoOf(QuantityPlaceholder).hd = function () {
+  protoOf(QuantityPlaceholder).ed = function () {
     return this.min;
   };
-  protoOf(QuantityPlaceholder).id = function () {
+  protoOf(QuantityPlaceholder).fd = function () {
     return this.max;
   };
-  protoOf(QuantityPlaceholder).m1j = function () {
+  protoOf(QuantityPlaceholder).j1j = function () {
     return this.unit;
   };
-  protoOf(QuantityPlaceholder).n1j = function () {
+  protoOf(QuantityPlaceholder).k1j = function () {
     return this.scale;
   };
-  protoOf(QuantityPlaceholder).o1j = function () {
+  protoOf(QuantityPlaceholder).l1j = function () {
     return this.ingredient;
   };
-  protoOf(QuantityPlaceholder).p1j = function () {
+  protoOf(QuantityPlaceholder).m1j = function () {
     return this.usCust;
   };
-  protoOf(QuantityPlaceholder).q1j = function (min, max, unit, scale, ingredient, usCust) {
+  protoOf(QuantityPlaceholder).n1j = function (min, max, unit, scale, ingredient, usCust) {
     return new QuantityPlaceholder(min, max, unit, scale, ingredient, usCust);
   };
   protoOf(QuantityPlaceholder).copy = function (min, max, unit, scale, ingredient, usCust, $super) {
@@ -3227,7 +3226,7 @@
     scale = scale === VOID ? this.scale : scale;
     ingredient = ingredient === VOID ? this.ingredient : ingredient;
     usCust = usCust === VOID ? this.usCust : usCust;
-    return $super === VOID ? this.q1j(min, max, unit, scale, ingredient, usCust) : $super.q1j.call(this, min, max, unit, scale, ingredient, usCust);
+    return $super === VOID ? this.n1j(min, max, unit, scale, ingredient, usCust) : $super.n1j.call(this, min, max, unit, scale, ingredient, usCust);
   };
   protoOf(QuantityPlaceholder).toString = function () {
     return 'QuantityPlaceholder(min=' + this.min + ', max=' + this.max + ', unit=' + this.unit + ', scale=' + this.scale + ', ingredient=' + this.ingredient + ', usCust=' + this.usCust + ')';
@@ -3269,34 +3268,34 @@
   function $serializer_11() {
     $serializer_instance_11 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.template.OvenTemperaturePlaceholder', this, 4);
-    tmp0_serialDesc.rs('temperatureC', true);
-    tmp0_serialDesc.rs('temperatureFanC', true);
-    tmp0_serialDesc.rs('temperatureF', true);
-    tmp0_serialDesc.rs('gasMark', true);
-    this.r1j_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_11).s1j = function (encoder, value) {
-    var tmp0_desc = this.r1j_1;
-    var tmp1_output = encoder.il(tmp0_desc);
-    if (tmp1_output.en(tmp0_desc, 0) ? true : !(value.temperatureC == null)) {
-      tmp1_output.an(tmp0_desc, 0, IntSerializer_getInstance(), value.temperatureC);
+    tmp0_serialDesc.os('temperatureC', true);
+    tmp0_serialDesc.os('temperatureFanC', true);
+    tmp0_serialDesc.os('temperatureF', true);
+    tmp0_serialDesc.os('gasMark', true);
+    this.o1j_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_11).p1j = function (encoder, value) {
+    var tmp0_desc = this.o1j_1;
+    var tmp1_output = encoder.fl(tmp0_desc);
+    if (tmp1_output.bn(tmp0_desc, 0) ? true : !(value.temperatureC == null)) {
+      tmp1_output.xm(tmp0_desc, 0, IntSerializer_getInstance(), value.temperatureC);
     }
-    if (tmp1_output.en(tmp0_desc, 1) ? true : !(value.temperatureFanC == null)) {
-      tmp1_output.an(tmp0_desc, 1, IntSerializer_getInstance(), value.temperatureFanC);
+    if (tmp1_output.bn(tmp0_desc, 1) ? true : !(value.temperatureFanC == null)) {
+      tmp1_output.xm(tmp0_desc, 1, IntSerializer_getInstance(), value.temperatureFanC);
     }
-    if (tmp1_output.en(tmp0_desc, 2) ? true : !(value.temperatureF == null)) {
-      tmp1_output.an(tmp0_desc, 2, IntSerializer_getInstance(), value.temperatureF);
+    if (tmp1_output.bn(tmp0_desc, 2) ? true : !(value.temperatureF == null)) {
+      tmp1_output.xm(tmp0_desc, 2, IntSerializer_getInstance(), value.temperatureF);
     }
-    if (tmp1_output.en(tmp0_desc, 3) ? true : !(value.gasMark == null)) {
-      tmp1_output.an(tmp0_desc, 3, FloatSerializer_getInstance(), value.gasMark);
+    if (tmp1_output.bn(tmp0_desc, 3) ? true : !(value.gasMark == null)) {
+      tmp1_output.xm(tmp0_desc, 3, FloatSerializer_getInstance(), value.gasMark);
     }
-    tmp1_output.jl(tmp0_desc);
+    tmp1_output.gl(tmp0_desc);
   };
-  protoOf($serializer_11).li = function (encoder, value) {
-    return this.s1j(encoder, value instanceof OvenTemperaturePlaceholder ? value : THROW_CCE());
+  protoOf($serializer_11).ii = function (encoder, value) {
+    return this.p1j(encoder, value instanceof OvenTemperaturePlaceholder ? value : THROW_CCE());
   };
-  protoOf($serializer_11).mi = function (decoder) {
-    var tmp0_desc = this.r1j_1;
+  protoOf($serializer_11).ji = function (decoder) {
+    var tmp0_desc = this.o1j_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -3304,50 +3303,50 @@
     var tmp5_local1 = null;
     var tmp6_local2 = null;
     var tmp7_local3 = null;
-    var tmp8_input = decoder.il(tmp0_desc);
-    if (tmp8_input.yl()) {
-      tmp4_local0 = tmp8_input.wl(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
+    var tmp8_input = decoder.fl(tmp0_desc);
+    if (tmp8_input.vl()) {
+      tmp4_local0 = tmp8_input.tl(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp8_input.wl(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp8_input.tl(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp8_input.wl(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp8_input.tl(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp8_input.wl(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp8_input.tl(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp8_input.zl(tmp0_desc);
+        tmp2_index = tmp8_input.wl(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp8_input.wl(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp8_input.tl(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp8_input.wl(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp8_input.tl(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp8_input.wl(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp8_input.tl(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp8_input.wl(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp8_input.tl(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp8_input.jl(tmp0_desc);
+    tmp8_input.gl(tmp0_desc);
     return OvenTemperaturePlaceholder_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
-  protoOf($serializer_11).ki = function () {
-    return this.r1j_1;
+  protoOf($serializer_11).hi = function () {
+    return this.o1j_1;
   };
-  protoOf($serializer_11).ts = function () {
+  protoOf($serializer_11).qs = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -3361,7 +3360,7 @@
   }
   function OvenTemperaturePlaceholder_init_$Init$(seen0, temperatureC, temperatureFanC, temperatureF, gasMark, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_11().r1j_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_11().o1j_1);
     }
     if (0 === (seen0 & 1))
       $this.temperatureC = null;
@@ -3394,31 +3393,31 @@
     this.temperatureF = temperatureF;
     this.gasMark = gasMark;
   }
-  protoOf(OvenTemperaturePlaceholder).t1j = function () {
+  protoOf(OvenTemperaturePlaceholder).q1j = function () {
     return this.temperatureC;
   };
-  protoOf(OvenTemperaturePlaceholder).u1j = function () {
+  protoOf(OvenTemperaturePlaceholder).r1j = function () {
     return this.temperatureFanC;
   };
-  protoOf(OvenTemperaturePlaceholder).v1j = function () {
+  protoOf(OvenTemperaturePlaceholder).s1j = function () {
     return this.temperatureF;
   };
-  protoOf(OvenTemperaturePlaceholder).w1j = function () {
+  protoOf(OvenTemperaturePlaceholder).t1j = function () {
     return this.gasMark;
   };
-  protoOf(OvenTemperaturePlaceholder).hd = function () {
+  protoOf(OvenTemperaturePlaceholder).ed = function () {
     return this.temperatureC;
   };
-  protoOf(OvenTemperaturePlaceholder).id = function () {
+  protoOf(OvenTemperaturePlaceholder).fd = function () {
     return this.temperatureFanC;
   };
-  protoOf(OvenTemperaturePlaceholder).m1j = function () {
+  protoOf(OvenTemperaturePlaceholder).j1j = function () {
     return this.temperatureF;
   };
-  protoOf(OvenTemperaturePlaceholder).n1j = function () {
+  protoOf(OvenTemperaturePlaceholder).k1j = function () {
     return this.gasMark;
   };
-  protoOf(OvenTemperaturePlaceholder).x1j = function (temperatureC, temperatureFanC, temperatureF, gasMark) {
+  protoOf(OvenTemperaturePlaceholder).u1j = function (temperatureC, temperatureFanC, temperatureF, gasMark) {
     return new OvenTemperaturePlaceholder(temperatureC, temperatureFanC, temperatureF, gasMark);
   };
   protoOf(OvenTemperaturePlaceholder).copy = function (temperatureC, temperatureFanC, temperatureF, gasMark, $super) {
@@ -3426,7 +3425,7 @@
     temperatureFanC = temperatureFanC === VOID ? this.temperatureFanC : temperatureFanC;
     temperatureF = temperatureF === VOID ? this.temperatureF : temperatureF;
     gasMark = gasMark === VOID ? this.gasMark : gasMark;
-    return $super === VOID ? this.x1j(temperatureC, temperatureFanC, temperatureF, gasMark) : $super.x1j.call(this, temperatureC, temperatureFanC, temperatureF, gasMark);
+    return $super === VOID ? this.u1j(temperatureC, temperatureFanC, temperatureF, gasMark) : $super.u1j.call(this, temperatureC, temperatureFanC, temperatureF, gasMark);
   };
   protoOf(OvenTemperaturePlaceholder).toString = function () {
     return 'OvenTemperaturePlaceholder(temperatureC=' + this.temperatureC + ', temperatureFanC=' + this.temperatureFanC + ', temperatureF=' + this.temperatureF + ', gasMark=' + this.gasMark + ')';
@@ -3511,25 +3510,25 @@
     Enum.call(this, name, ordinal);
   }
   function MeasurementUnit(singular, plural, symbol, symbolPlural, unitType, measuringSystems, quantity) {
-    this.b1f_1 = singular;
-    this.c1f_1 = plural;
-    this.d1f_1 = symbol;
-    this.e1f_1 = symbolPlural;
-    this.f1f_1 = unitType;
-    this.g1f_1 = measuringSystems;
-    this.h1f_1 = quantity;
+    this.y1e_1 = singular;
+    this.z1e_1 = plural;
+    this.a1f_1 = symbol;
+    this.b1f_1 = symbolPlural;
+    this.c1f_1 = unitType;
+    this.d1f_1 = measuringSystems;
+    this.e1f_1 = quantity;
   }
   protoOf(MeasurementUnit).toString = function () {
-    return 'MeasurementUnit(singular=' + this.b1f_1 + ', plural=' + this.c1f_1 + ', symbol=' + this.d1f_1 + ', symbolPlural=' + this.e1f_1 + ', unitType=' + toString(this.f1f_1) + ', measuringSystems=' + toString_0(this.g1f_1) + ', quantity=' + this.h1f_1 + ')';
+    return 'MeasurementUnit(singular=' + this.y1e_1 + ', plural=' + this.z1e_1 + ', symbol=' + this.a1f_1 + ', symbolPlural=' + this.b1f_1 + ', unitType=' + toString(this.c1f_1) + ', measuringSystems=' + toString_0(this.d1f_1) + ', quantity=' + this.e1f_1 + ')';
   };
   protoOf(MeasurementUnit).hashCode = function () {
-    var result = getStringHashCode(this.b1f_1);
-    result = imul(result, 31) + getStringHashCode(this.c1f_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.d1f_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.e1f_1) | 0;
-    result = imul(result, 31) + (this.f1f_1 == null ? 0 : this.f1f_1.hashCode()) | 0;
-    result = imul(result, 31) + hashCode(this.g1f_1) | 0;
-    result = imul(result, 31) + getNumberHashCode(this.h1f_1) | 0;
+    var result = getStringHashCode(this.y1e_1);
+    result = imul(result, 31) + getStringHashCode(this.z1e_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.a1f_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.b1f_1) | 0;
+    result = imul(result, 31) + (this.c1f_1 == null ? 0 : this.c1f_1.hashCode()) | 0;
+    result = imul(result, 31) + hashCode(this.d1f_1) | 0;
+    result = imul(result, 31) + getNumberHashCode(this.e1f_1) | 0;
     return result;
   };
   protoOf(MeasurementUnit).equals = function (other) {
@@ -3537,19 +3536,19 @@
       return true;
     if (!(other instanceof MeasurementUnit))
       return false;
-    if (!(this.b1f_1 === other.b1f_1))
+    if (!(this.y1e_1 === other.y1e_1))
       return false;
-    if (!(this.c1f_1 === other.c1f_1))
+    if (!(this.z1e_1 === other.z1e_1))
       return false;
-    if (!(this.d1f_1 === other.d1f_1))
+    if (!(this.a1f_1 === other.a1f_1))
       return false;
-    if (!(this.e1f_1 === other.e1f_1))
+    if (!(this.b1f_1 === other.b1f_1))
       return false;
-    if (!equals(this.f1f_1, other.f1f_1))
+    if (!equals(this.c1f_1, other.c1f_1))
       return false;
-    if (!equals(this.g1f_1, other.g1f_1))
+    if (!equals(this.d1f_1, other.d1f_1))
       return false;
-    if (!equals(this.h1f_1, other.h1f_1))
+    if (!equals(this.e1f_1, other.e1f_1))
       return false;
     return true;
   };
@@ -3558,38 +3557,38 @@
     var tmp = this;
     var tmp0_unitType = UnitType_VOLUME_getInstance();
     var tmp1_measuringSystems = setOf([USCustomary_instance, Imperial_instance]);
-    tmp.n1d_1 = new MeasurementUnit('stick', 'sticks', 'sticks', 'sticks', tmp0_unitType, tmp1_measuringSystems, 118.294);
-    this.o1d_1 = new MeasurementUnit('gram', 'grams', 'g', 'g', UnitType_WEIGHT_getInstance(), setOf_0(Metric_instance), 1.0);
-    this.p1d_1 = new MeasurementUnit('kilogram', 'kilograms', 'kg', 'kg', UnitType_WEIGHT_getInstance(), setOf_0(Metric_instance), 1000.0);
-    this.q1d_1 = new MeasurementUnit('ounce', 'ounces', 'oz', 'oz', UnitType_WEIGHT_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 28.3495);
-    this.r1d_1 = new MeasurementUnit('pound', 'pounds', 'lb', 'lbs', UnitType_WEIGHT_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 16 * this.q1d_1.h1f_1);
-    this.s1d_1 = new MeasurementUnit('millilitre', 'millilitres', 'ml', 'ml', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 1.0);
-    this.t1d_1 = new MeasurementUnit('centilitre', 'centilitres', 'cl', 'cl', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 10.0);
-    this.u1d_1 = new MeasurementUnit('litre', 'litres', 'l', 'l', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 1000.0);
-    this.v1d_1 = new MeasurementUnit('teaspoon', 'teaspoons', 'tsp', 'tsp', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 5.0);
-    this.w1d_1 = new MeasurementUnit('tablespoon', 'tablespoons', 'tbsp', 'tbsp', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 15.0);
-    this.x1d_1 = new MeasurementUnit('teaspoon', 'teaspoons', 'tsp', 'tsp', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 4.9289);
-    this.y1d_1 = new MeasurementUnit('tablespoon', 'tablespoons', 'tbsp', 'tbsp', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 3 * this.x1d_1.h1f_1);
-    this.z1d_1 = new MeasurementUnit('fluid ounce', 'fluid ounces', 'fl oz', 'fl oz', UnitType_VOLUME_getInstance(), setOf_0(Imperial_instance), 6 * this.x1d_1.h1f_1);
-    this.a1e_1 = new MeasurementUnit('cup', 'cups', 'cup', 'cups', UnitType_VOLUME_getInstance(), setOf_0(USCustomary_instance), 48 * this.x1d_1.h1f_1);
-    this.b1e_1 = new MeasurementUnit('cup', 'cups', 'cup', 'cups', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 250.0);
-    this.c1e_1 = new MeasurementUnit('pint', 'pints', 'pt', 'pts', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 2 * this.a1e_1.h1f_1);
-    this.d1e_1 = new MeasurementUnit('quart', 'quarts', 'qt', 'qts', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 2 * this.c1e_1.h1f_1);
-    this.e1e_1 = new MeasurementUnit('gallon', 'gallons', 'gal', 'gals', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 4 * this.d1e_1.h1f_1);
-    this.f1e_1 = new MeasurementUnit('millimetre', 'millimetres', 'mm', 'mm', UnitType_LENGTH_getInstance(), setOf_0(Metric_instance), 1.0);
-    this.g1e_1 = new MeasurementUnit('centimetre', 'centimetres', 'cm', 'cm', UnitType_LENGTH_getInstance(), setOf_0(Metric_instance), 10.0);
-    this.h1e_1 = new MeasurementUnit('inch', 'inches', 'in', 'in', UnitType_LENGTH_getInstance(), setOf_0(Imperial_instance), 25.4);
-    this.i1e_1 = listOf([this.n1d_1, this.o1d_1, this.p1d_1, this.q1d_1, this.r1d_1, this.s1d_1, this.t1d_1, this.u1d_1, this.v1d_1, this.w1d_1, this.x1d_1, this.y1d_1, this.z1d_1, this.a1e_1, this.b1e_1, this.c1e_1, this.d1e_1, this.e1e_1, this.f1e_1, this.g1e_1, this.h1e_1]);
+    tmp.k1d_1 = new MeasurementUnit('stick', 'sticks', 'stick', 'sticks', tmp0_unitType, tmp1_measuringSystems, 118.294);
+    this.l1d_1 = new MeasurementUnit('gram', 'grams', 'g', 'g', UnitType_WEIGHT_getInstance(), setOf_0(Metric_instance), 1.0);
+    this.m1d_1 = new MeasurementUnit('kilogram', 'kilograms', 'kg', 'kg', UnitType_WEIGHT_getInstance(), setOf_0(Metric_instance), 1000.0);
+    this.n1d_1 = new MeasurementUnit('ounce', 'ounces', 'oz', 'oz', UnitType_WEIGHT_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 28.3495);
+    this.o1d_1 = new MeasurementUnit('pound', 'pounds', 'lb', 'lbs', UnitType_WEIGHT_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 16 * this.n1d_1.e1f_1);
+    this.p1d_1 = new MeasurementUnit('millilitre', 'millilitres', 'ml', 'ml', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 1.0);
+    this.q1d_1 = new MeasurementUnit('centilitre', 'centilitres', 'cl', 'cl', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 10.0);
+    this.r1d_1 = new MeasurementUnit('litre', 'litres', 'l', 'l', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 1000.0);
+    this.s1d_1 = new MeasurementUnit('teaspoon', 'teaspoons', 'tsp', 'tsp', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 5.0);
+    this.t1d_1 = new MeasurementUnit('tablespoon', 'tablespoons', 'tbsp', 'tbsp', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 15.0);
+    this.u1d_1 = new MeasurementUnit('teaspoon', 'teaspoons', 'tsp', 'tsp', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 4.9289);
+    this.v1d_1 = new MeasurementUnit('tablespoon', 'tablespoons', 'tbsp', 'tbsp', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 3 * this.u1d_1.e1f_1);
+    this.w1d_1 = new MeasurementUnit('fluid ounce', 'fluid ounces', 'fl oz', 'fl oz', UnitType_VOLUME_getInstance(), setOf_0(Imperial_instance), 6 * this.u1d_1.e1f_1);
+    this.x1d_1 = new MeasurementUnit('cup', 'cups', 'cup', 'cups', UnitType_VOLUME_getInstance(), setOf_0(USCustomary_instance), 48 * this.u1d_1.e1f_1);
+    this.y1d_1 = new MeasurementUnit('cup', 'cups', 'cup', 'cups', UnitType_VOLUME_getInstance(), setOf_0(Metric_instance), 250.0);
+    this.z1d_1 = new MeasurementUnit('pint', 'pints', 'pt', 'pts', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 2 * this.x1d_1.e1f_1);
+    this.a1e_1 = new MeasurementUnit('quart', 'quarts', 'qt', 'qts', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 2 * this.z1d_1.e1f_1);
+    this.b1e_1 = new MeasurementUnit('gallon', 'gallons', 'gal', 'gals', UnitType_VOLUME_getInstance(), setOf([Imperial_instance, USCustomary_instance]), 4 * this.a1e_1.e1f_1);
+    this.c1e_1 = new MeasurementUnit('millimetre', 'millimetres', 'mm', 'mm', UnitType_LENGTH_getInstance(), setOf_0(Metric_instance), 1.0);
+    this.d1e_1 = new MeasurementUnit('centimetre', 'centimetres', 'cm', 'cm', UnitType_LENGTH_getInstance(), setOf_0(Metric_instance), 10.0);
+    this.e1e_1 = new MeasurementUnit('inch', 'inches', 'in', 'in', UnitType_LENGTH_getInstance(), setOf_0(Imperial_instance), 25.4);
+    this.f1e_1 = listOf([this.k1d_1, this.l1d_1, this.m1d_1, this.n1d_1, this.o1d_1, this.p1d_1, this.q1d_1, this.r1d_1, this.s1d_1, this.t1d_1, this.u1d_1, this.v1d_1, this.w1d_1, this.x1d_1, this.y1d_1, this.z1d_1, this.a1e_1, this.b1e_1, this.c1e_1, this.d1e_1, this.e1e_1]);
     var tmp_0 = this;
     // Inline function 'kotlin.collections.filter' call
-    var tmp0 = this.i1e_1;
+    var tmp0 = this.f1e_1;
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$_0();
-    var _iterator__ex2g4s = tmp0.s();
-    while (_iterator__ex2g4s.t()) {
-      var element = _iterator__ex2g4s.u();
-      if (element.g1f_1.z(Metric_instance)) {
-        destination.w(element);
+    var _iterator__ex2g4s = tmp0.q();
+    while (_iterator__ex2g4s.r()) {
+      var element = _iterator__ex2g4s.s();
+      if (element.d1f_1.x(Metric_instance)) {
+        destination.u(element);
       }
     }
     // Inline function 'kotlin.let' call
@@ -3597,56 +3596,56 @@
     var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_0 = LinkedHashMap_init_$Create$(capacity);
-    var _iterator__ex2g4s_0 = destination.s();
-    while (_iterator__ex2g4s_0.t()) {
-      var element_0 = _iterator__ex2g4s_0.u();
-      var tmp$ret$3 = element_0.d1f_1;
-      destination_0.o2(tmp$ret$3, element_0);
+    var _iterator__ex2g4s_0 = destination.q();
+    while (_iterator__ex2g4s_0.r()) {
+      var element_0 = _iterator__ex2g4s_0.s();
+      var tmp$ret$7 = element_0.a1f_1;
+      destination_0.m2(tmp$ret$7, element_0);
     }
     var tmp_1 = destination_0;
     // Inline function 'kotlin.collections.associateBy' call
     var capacity_0 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_1 = LinkedHashMap_init_$Create$(capacity_0);
-    var _iterator__ex2g4s_1 = destination.s();
-    while (_iterator__ex2g4s_1.t()) {
-      var element_1 = _iterator__ex2g4s_1.u();
-      var tmp$ret$6 = element_1.e1f_1;
-      destination_1.o2(tmp$ret$6, element_1);
+    var _iterator__ex2g4s_1 = destination.q();
+    while (_iterator__ex2g4s_1.r()) {
+      var element_1 = _iterator__ex2g4s_1.s();
+      var tmp$ret$10 = element_1.b1f_1;
+      destination_1.m2(tmp$ret$10, element_1);
     }
     var tmp_2 = plus(tmp_1, destination_1);
     // Inline function 'kotlin.collections.associateBy' call
     var capacity_1 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_2 = LinkedHashMap_init_$Create$(capacity_1);
-    var _iterator__ex2g4s_2 = destination.s();
-    while (_iterator__ex2g4s_2.t()) {
-      var element_2 = _iterator__ex2g4s_2.u();
-      var tmp$ret$9 = element_2.b1f_1;
-      destination_2.o2(tmp$ret$9, element_2);
+    var _iterator__ex2g4s_2 = destination.q();
+    while (_iterator__ex2g4s_2.r()) {
+      var element_2 = _iterator__ex2g4s_2.s();
+      var tmp$ret$13 = element_2.y1e_1;
+      destination_2.m2(tmp$ret$13, element_2);
     }
     var tmp_3 = plus(tmp_2, destination_2);
     // Inline function 'kotlin.collections.associateBy' call
     var capacity_2 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_3 = LinkedHashMap_init_$Create$(capacity_2);
-    var _iterator__ex2g4s_3 = destination.s();
-    while (_iterator__ex2g4s_3.t()) {
-      var element_3 = _iterator__ex2g4s_3.u();
-      var tmp$ret$12 = element_3.c1f_1;
-      destination_3.o2(tmp$ret$12, element_3);
+    var _iterator__ex2g4s_3 = destination.q();
+    while (_iterator__ex2g4s_3.r()) {
+      var element_3 = _iterator__ex2g4s_3.s();
+      var tmp$ret$16 = element_3.z1e_1;
+      destination_3.m2(tmp$ret$16, element_3);
     }
-    tmp_0.j1e_1 = plus(tmp_3, destination_3);
+    tmp_0.g1e_1 = plus(tmp_3, destination_3);
     var tmp_4 = this;
     // Inline function 'kotlin.collections.filter' call
-    var tmp0_0 = this.i1e_1;
+    var tmp0_0 = this.f1e_1;
     // Inline function 'kotlin.collections.filterTo' call
     var destination_4 = ArrayList_init_$Create$_0();
-    var _iterator__ex2g4s_4 = tmp0_0.s();
-    while (_iterator__ex2g4s_4.t()) {
-      var element_4 = _iterator__ex2g4s_4.u();
-      if (element_4.g1f_1.z(Imperial_instance)) {
-        destination_4.w(element_4);
+    var _iterator__ex2g4s_4 = tmp0_0.q();
+    while (_iterator__ex2g4s_4.r()) {
+      var element_4 = _iterator__ex2g4s_4.s();
+      if (element_4.d1f_1.x(Imperial_instance)) {
+        destination_4.u(element_4);
       }
     }
     // Inline function 'kotlin.let' call
@@ -3654,56 +3653,56 @@
     var capacity_3 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination_4, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_5 = LinkedHashMap_init_$Create$(capacity_3);
-    var _iterator__ex2g4s_5 = destination_4.s();
-    while (_iterator__ex2g4s_5.t()) {
-      var element_5 = _iterator__ex2g4s_5.u();
-      var tmp$ret$20 = element_5.d1f_1;
-      destination_5.o2(tmp$ret$20, element_5);
+    var _iterator__ex2g4s_5 = destination_4.q();
+    while (_iterator__ex2g4s_5.r()) {
+      var element_5 = _iterator__ex2g4s_5.s();
+      var tmp$ret$24 = element_5.a1f_1;
+      destination_5.m2(tmp$ret$24, element_5);
     }
     var tmp_5 = destination_5;
     // Inline function 'kotlin.collections.associateBy' call
     var capacity_4 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination_4, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_6 = LinkedHashMap_init_$Create$(capacity_4);
-    var _iterator__ex2g4s_6 = destination_4.s();
-    while (_iterator__ex2g4s_6.t()) {
-      var element_6 = _iterator__ex2g4s_6.u();
-      var tmp$ret$23 = element_6.e1f_1;
-      destination_6.o2(tmp$ret$23, element_6);
+    var _iterator__ex2g4s_6 = destination_4.q();
+    while (_iterator__ex2g4s_6.r()) {
+      var element_6 = _iterator__ex2g4s_6.s();
+      var tmp$ret$27 = element_6.b1f_1;
+      destination_6.m2(tmp$ret$27, element_6);
     }
     var tmp_6 = plus(tmp_5, destination_6);
     // Inline function 'kotlin.collections.associateBy' call
     var capacity_5 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination_4, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_7 = LinkedHashMap_init_$Create$(capacity_5);
-    var _iterator__ex2g4s_7 = destination_4.s();
-    while (_iterator__ex2g4s_7.t()) {
-      var element_7 = _iterator__ex2g4s_7.u();
-      var tmp$ret$26 = element_7.b1f_1;
-      destination_7.o2(tmp$ret$26, element_7);
+    var _iterator__ex2g4s_7 = destination_4.q();
+    while (_iterator__ex2g4s_7.r()) {
+      var element_7 = _iterator__ex2g4s_7.s();
+      var tmp$ret$30 = element_7.y1e_1;
+      destination_7.m2(tmp$ret$30, element_7);
     }
     var tmp_7 = plus(tmp_6, destination_7);
     // Inline function 'kotlin.collections.associateBy' call
     var capacity_6 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination_4, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_8 = LinkedHashMap_init_$Create$(capacity_6);
-    var _iterator__ex2g4s_8 = destination_4.s();
-    while (_iterator__ex2g4s_8.t()) {
-      var element_8 = _iterator__ex2g4s_8.u();
-      var tmp$ret$29 = element_8.c1f_1;
-      destination_8.o2(tmp$ret$29, element_8);
+    var _iterator__ex2g4s_8 = destination_4.q();
+    while (_iterator__ex2g4s_8.r()) {
+      var element_8 = _iterator__ex2g4s_8.s();
+      var tmp$ret$33 = element_8.z1e_1;
+      destination_8.m2(tmp$ret$33, element_8);
     }
-    tmp_4.k1e_1 = plus(tmp_7, destination_8);
+    tmp_4.h1e_1 = plus(tmp_7, destination_8);
     var tmp_8 = this;
     // Inline function 'kotlin.collections.filter' call
-    var tmp0_1 = this.i1e_1;
+    var tmp0_1 = this.f1e_1;
     // Inline function 'kotlin.collections.filterTo' call
     var destination_9 = ArrayList_init_$Create$_0();
-    var _iterator__ex2g4s_9 = tmp0_1.s();
-    while (_iterator__ex2g4s_9.t()) {
-      var element_9 = _iterator__ex2g4s_9.u();
-      if (element_9.g1f_1.z(USCustomary_instance)) {
-        destination_9.w(element_9);
+    var _iterator__ex2g4s_9 = tmp0_1.q();
+    while (_iterator__ex2g4s_9.r()) {
+      var element_9 = _iterator__ex2g4s_9.s();
+      if (element_9.d1f_1.x(USCustomary_instance)) {
+        destination_9.u(element_9);
       }
     }
     // Inline function 'kotlin.let' call
@@ -3711,51 +3710,51 @@
     var capacity_7 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination_9, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_10 = LinkedHashMap_init_$Create$(capacity_7);
-    var _iterator__ex2g4s_10 = destination_9.s();
-    while (_iterator__ex2g4s_10.t()) {
-      var element_10 = _iterator__ex2g4s_10.u();
-      var tmp$ret$37 = element_10.d1f_1;
-      destination_10.o2(tmp$ret$37, element_10);
+    var _iterator__ex2g4s_10 = destination_9.q();
+    while (_iterator__ex2g4s_10.r()) {
+      var element_10 = _iterator__ex2g4s_10.s();
+      var tmp$ret$41 = element_10.a1f_1;
+      destination_10.m2(tmp$ret$41, element_10);
     }
     var tmp_9 = destination_10;
     // Inline function 'kotlin.collections.associateBy' call
     var capacity_8 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination_9, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_11 = LinkedHashMap_init_$Create$(capacity_8);
-    var _iterator__ex2g4s_11 = destination_9.s();
-    while (_iterator__ex2g4s_11.t()) {
-      var element_11 = _iterator__ex2g4s_11.u();
-      var tmp$ret$40 = element_11.e1f_1;
-      destination_11.o2(tmp$ret$40, element_11);
+    var _iterator__ex2g4s_11 = destination_9.q();
+    while (_iterator__ex2g4s_11.r()) {
+      var element_11 = _iterator__ex2g4s_11.s();
+      var tmp$ret$44 = element_11.b1f_1;
+      destination_11.m2(tmp$ret$44, element_11);
     }
     var tmp_10 = plus(tmp_9, destination_11);
     // Inline function 'kotlin.collections.associateBy' call
     var capacity_9 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination_9, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_12 = LinkedHashMap_init_$Create$(capacity_9);
-    var _iterator__ex2g4s_12 = destination_9.s();
-    while (_iterator__ex2g4s_12.t()) {
-      var element_12 = _iterator__ex2g4s_12.u();
-      var tmp$ret$43 = element_12.b1f_1;
-      destination_12.o2(tmp$ret$43, element_12);
+    var _iterator__ex2g4s_12 = destination_9.q();
+    while (_iterator__ex2g4s_12.r()) {
+      var element_12 = _iterator__ex2g4s_12.s();
+      var tmp$ret$47 = element_12.y1e_1;
+      destination_12.m2(tmp$ret$47, element_12);
     }
     var tmp_11 = plus(tmp_10, destination_12);
     // Inline function 'kotlin.collections.associateBy' call
     var capacity_10 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(destination_9, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_13 = LinkedHashMap_init_$Create$(capacity_10);
-    var _iterator__ex2g4s_13 = destination_9.s();
-    while (_iterator__ex2g4s_13.t()) {
-      var element_13 = _iterator__ex2g4s_13.u();
-      var tmp$ret$46 = element_13.c1f_1;
-      destination_13.o2(tmp$ret$46, element_13);
+    var _iterator__ex2g4s_13 = destination_9.q();
+    while (_iterator__ex2g4s_13.r()) {
+      var element_13 = _iterator__ex2g4s_13.s();
+      var tmp$ret$50 = element_13.z1e_1;
+      destination_13.m2(tmp$ret$50, element_13);
     }
-    tmp_8.l1e_1 = plus(tmp_11, destination_13);
+    tmp_8.i1e_1 = plus(tmp_11, destination_13);
   }
-  protoOf(Units).m1e = function (name) {
-    var tmp0_elvis_lhs = this.j1e_1.k2(name);
-    var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this.k1e_1.k2(name) : tmp0_elvis_lhs;
-    var unit = tmp1_elvis_lhs == null ? this.l1e_1.k2(name) : tmp1_elvis_lhs;
+  protoOf(Units).j1e = function (name) {
+    var tmp0_elvis_lhs = this.g1e_1.i2(name);
+    var tmp1_elvis_lhs = tmp0_elvis_lhs == null ? this.h1e_1.i2(name) : tmp0_elvis_lhs;
+    var unit = tmp1_elvis_lhs == null ? this.i1e_1.i2(name) : tmp1_elvis_lhs;
     if (!(unit == null)) {
       return unit;
     } else {
@@ -3784,40 +3783,40 @@
   }
   function UnitConversions() {
     UnitConversions_instance = this;
-    this.r1e_1 = 0.00422675;
-    this.s1e_1 = 0.202884;
-    this.t1e_1 = setOf([Units_getInstance().v1d_1, Units_getInstance().w1d_1, Units_getInstance().b1e_1]);
-    this.u1e_1 = listOf([to(0.0, Units_getInstance().o1d_1), to(1000.0, Units_getInstance().p1d_1), to(0.0, Units_getInstance().s1d_1), to(2.5, Units_getInstance().v1d_1), to(15.0, Units_getInstance().w1d_1), to(125.0, Units_getInstance().b1e_1), to(1000.0, Units_getInstance().u1d_1), to(0.0, Units_getInstance().f1e_1), to(10.0, Units_getInstance().g1e_1)]);
-    this.v1e_1 = listOf([to(0.0, Units_getInstance().o1d_1), to(1000.0, Units_getInstance().p1d_1), to(0.0, Units_getInstance().s1d_1), to(1000.0, Units_getInstance().u1d_1), to(0.0, Units_getInstance().f1e_1), to(10.0, Units_getInstance().g1e_1)]);
-    this.w1e_1 = listOf_0(to(0.0, Units_getInstance().n1d_1));
-    this.x1e_1 = listOf([to(0.0, Units_getInstance().q1d_1), to(16.0 * Units_getInstance().q1d_1.h1f_1, Units_getInstance().r1d_1), to(0.0, Units_getInstance().x1d_1), to(3.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().y1d_1), to(4.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().x1d_1), to(6.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().y1d_1), to(7.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().x1d_1), to(9.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().y1d_1), to(10.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().x1d_1), to(12.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().a1e_1), to(768.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().e1e_1), to(0.0, Units_getInstance().h1e_1)]);
-    this.y1e_1 = listOf([to(0.0, Units_getInstance().q1d_1), to(16.0 * Units_getInstance().q1d_1.h1f_1, Units_getInstance().r1d_1), to(0.0, Units_getInstance().x1d_1), to(3.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().y1d_1), to(12.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().a1e_1), to(0.0, Units_getInstance().h1e_1)]);
-    this.z1e_1 = listOf([to(0.0, Units_getInstance().q1d_1), to(16.0 * Units_getInstance().q1d_1.h1f_1, Units_getInstance().r1d_1), to(0.0, Units_getInstance().x1d_1), to(3.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().y1d_1), to(6.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().z1d_1), to(768.0 * Units_getInstance().x1d_1.h1f_1, Units_getInstance().e1e_1), to(0.0, Units_getInstance().h1e_1)]);
-  }
-  protoOf(UnitConversions).y1j = function (amount) {
+    this.o1e_1 = 0.00422675;
+    this.p1e_1 = 0.202884;
+    this.q1e_1 = setOf([Units_getInstance().s1d_1, Units_getInstance().t1d_1, Units_getInstance().y1d_1]);
+    this.r1e_1 = listOf([to(0.0, Units_getInstance().l1d_1), to(1000.0, Units_getInstance().m1d_1), to(0.0, Units_getInstance().p1d_1), to(2.5, Units_getInstance().s1d_1), to(15.0, Units_getInstance().t1d_1), to(125.0, Units_getInstance().y1d_1), to(1000.0, Units_getInstance().r1d_1), to(0.0, Units_getInstance().c1e_1), to(10.0, Units_getInstance().d1e_1)]);
+    this.s1e_1 = listOf([to(0.0, Units_getInstance().l1d_1), to(1000.0, Units_getInstance().m1d_1), to(0.0, Units_getInstance().p1d_1), to(1000.0, Units_getInstance().r1d_1), to(0.0, Units_getInstance().c1e_1), to(10.0, Units_getInstance().d1e_1)]);
+    this.t1e_1 = listOf_0(to(0.0, Units_getInstance().k1d_1));
+    this.u1e_1 = listOf([to(0.0, Units_getInstance().n1d_1), to(16.0 * Units_getInstance().n1d_1.e1f_1, Units_getInstance().o1d_1), to(0.0, Units_getInstance().u1d_1), to(3.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().v1d_1), to(4.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().u1d_1), to(6.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().v1d_1), to(7.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().u1d_1), to(9.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().v1d_1), to(10.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().u1d_1), to(12.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().x1d_1), to(768.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().b1e_1), to(0.0, Units_getInstance().e1e_1)]);
+    this.v1e_1 = listOf([to(0.0, Units_getInstance().n1d_1), to(16.0 * Units_getInstance().n1d_1.e1f_1, Units_getInstance().o1d_1), to(0.0, Units_getInstance().u1d_1), to(3.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().v1d_1), to(12.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().x1d_1), to(0.0, Units_getInstance().e1e_1)]);
+    this.w1e_1 = listOf([to(0.0, Units_getInstance().n1d_1), to(16.0 * Units_getInstance().n1d_1.e1f_1, Units_getInstance().o1d_1), to(0.0, Units_getInstance().u1d_1), to(3.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().v1d_1), to(6.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().w1d_1), to(768.0 * Units_getInstance().u1d_1.e1f_1, Units_getInstance().b1e_1), to(0.0, Units_getInstance().e1e_1)]);
+  }
+  protoOf(UnitConversions).v1j = function (amount) {
     var tmp;
-    if (!(amount.c1d_1 == null)) {
-      var tmp_0 = amount.a1d_1 * amount.c1d_1.h1f_1;
-      var tmp0_safe_receiver = amount.b1d_1;
+    if (!(amount.z1c_1 == null)) {
+      var tmp_0 = amount.x1c_1 * amount.z1c_1.e1f_1;
+      var tmp0_safe_receiver = amount.y1c_1;
       var tmp_1;
       if (tmp0_safe_receiver == null) {
         tmp_1 = null;
       } else {
         // Inline function 'kotlin.let' call
-        tmp_1 = tmp0_safe_receiver * amount.c1d_1.h1f_1;
+        tmp_1 = tmp0_safe_receiver * amount.z1c_1.e1f_1;
       }
       var tmp_2 = tmp_1;
-      var tmp1_subject = amount.c1d_1.f1f_1;
-      var tmp0 = tmp1_subject == null ? -1 : tmp1_subject.s2_1;
-      tmp = amount.f1d(tmp_0, tmp_2, tmp0 === 2 ? Units_getInstance().f1e_1 : tmp0 === 1 ? Units_getInstance().s1d_1 : tmp0 === 0 ? Units_getInstance().o1d_1 : amount.c1d_1);
+      var tmp1_subject = amount.z1c_1.c1f_1;
+      var tmp0 = tmp1_subject == null ? -1 : tmp1_subject.q2_1;
+      tmp = amount.c1d(tmp_0, tmp_2, tmp0 === 2 ? Units_getInstance().c1e_1 : tmp0 === 1 ? Units_getInstance().p1d_1 : tmp0 === 0 ? Units_getInstance().l1d_1 : amount.z1c_1);
     } else {
       tmp = amount;
     }
     return tmp;
   };
-  protoOf(UnitConversions).a1f = function (amount, target, factor, density) {
-    var tmp = amount.a1d_1 * factor;
-    var tmp0_safe_receiver = amount.b1d_1;
+  protoOf(UnitConversions).x1e = function (amount, target, factor, density) {
+    var tmp = amount.x1c_1 * factor;
+    var tmp0_safe_receiver = amount.y1c_1;
     var tmp_0;
     if (tmp0_safe_receiver == null) {
       tmp_0 = null;
@@ -3825,33 +3824,33 @@
       // Inline function 'kotlin.let' call
       tmp_0 = tmp0_safe_receiver * factor;
     }
-    var scaledAmount = amount.f1d(tmp, tmp_0);
-    if (scaledAmount.c1d_1 == null || (equals(target, Metric_instance) && factor === 1.0)) {
+    var scaledAmount = amount.c1d(tmp, tmp_0);
+    if (scaledAmount.z1c_1 == null || (equals(target, Metric_instance) && factor === 1.0)) {
       return scaledAmount;
     }
-    var smallestUnitAmount = this.y1j(scaledAmount);
+    var smallestUnitAmount = this.v1j(scaledAmount);
     var tmp_1;
     if (equals(target, Metric_instance)) {
-      tmp_1 = contains(this.t1e_1, amount.c1d_1) ? this.u1e_1 : this.v1e_1;
+      tmp_1 = contains(this.q1e_1, amount.z1c_1) ? this.r1e_1 : this.s1e_1;
     } else if (equals(target, USCustomary_instance)) {
       var tmp_2;
       var tmp_3;
-      if (amount.d1d_1 === true) {
-        var tmp2_safe_receiver = amount.c1d_1;
-        tmp_3 = equals(tmp2_safe_receiver == null ? null : tmp2_safe_receiver.f1f_1, UnitType_WEIGHT_getInstance());
+      if (amount.a1d_1 === true) {
+        var tmp2_safe_receiver = amount.z1c_1;
+        tmp_3 = equals(tmp2_safe_receiver == null ? null : tmp2_safe_receiver.c1f_1, UnitType_WEIGHT_getInstance());
       } else {
         tmp_3 = false;
       }
       if (tmp_3) {
-        tmp_2 = this.y1e_1;
+        tmp_2 = this.v1e_1;
       } else {
-        tmp_2 = this.x1e_1;
+        tmp_2 = this.u1e_1;
       }
       tmp_1 = tmp_2;
     } else if (equals(target, Imperial_instance)) {
-      tmp_1 = this.z1e_1;
-    } else if (equals(target, Butter_instance)) {
       tmp_1 = this.w1e_1;
+    } else if (equals(target, Butter_instance)) {
+      tmp_1 = this.t1e_1;
     } else {
       noWhenBranchMatchedException();
     }
@@ -3862,17 +3861,17 @@
       tmp_5 = true;
     } else {
       var tmp_6;
-      if (amount.d1d_1 === true && equals(target, USCustomary_instance) && !(density == null)) {
-        var tmp4_safe_receiver = amount.c1d_1;
-        tmp_6 = equals(tmp4_safe_receiver == null ? null : tmp4_safe_receiver.f1f_1, UnitType_WEIGHT_getInstance());
+      if (amount.a1d_1 === true && equals(target, USCustomary_instance) && !(density == null)) {
+        var tmp4_safe_receiver = amount.z1c_1;
+        tmp_6 = equals(tmp4_safe_receiver == null ? null : tmp4_safe_receiver.c1f_1, UnitType_WEIGHT_getInstance());
       } else {
         tmp_6 = false;
       }
       tmp_5 = tmp_6;
     }
     if (tmp_5) {
-      var tmp_7 = smallestUnitAmount.a1d_1 / density;
-      var tmp3_safe_receiver = smallestUnitAmount.b1d_1;
+      var tmp_7 = smallestUnitAmount.x1c_1 / density;
+      var tmp3_safe_receiver = smallestUnitAmount.y1c_1;
       var tmp_8;
       if (tmp3_safe_receiver == null) {
         tmp_8 = null;
@@ -3880,7 +3879,7 @@
         // Inline function 'kotlin.let' call
         tmp_8 = tmp3_safe_receiver / density;
       }
-      tmp_4 = new Amount(tmp_7, tmp_8, Units_getInstance().s1d_1);
+      tmp_4 = new Amount(tmp_7, tmp_8, Units_getInstance().p1d_1);
     } else {
       tmp_4 = smallestUnitAmount;
     }
@@ -3888,42 +3887,42 @@
     // Inline function 'kotlin.collections.filter' call
     // Inline function 'kotlin.collections.filterTo' call
     var destination = ArrayList_init_$Create$_0();
-    var _iterator__ex2g4s = ladder.s();
-    while (_iterator__ex2g4s.t()) {
-      var element = _iterator__ex2g4s.u();
-      var tmp0_safe_receiver_0 = amountToConvert.c1d_1;
-      if (equals(element.gd_1.f1f_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.f1f_1)) {
-        destination.w(element);
+    var _iterator__ex2g4s = ladder.q();
+    while (_iterator__ex2g4s.r()) {
+      var element = _iterator__ex2g4s.s();
+      var tmp0_safe_receiver_0 = amountToConvert.z1c_1;
+      if (equals(element.dd_1.c1f_1, tmp0_safe_receiver_0 == null ? null : tmp0_safe_receiver_0.c1f_1)) {
+        destination.u(element);
       }
     }
-    var tmp$ret$8;
+    var tmp$ret$7;
     $l$block: {
       // Inline function 'kotlin.collections.lastOrNull' call
-      var iterator = destination.e2(destination.y());
-      while (iterator.y3()) {
-        var element_0 = iterator.a4();
-        if (amountToConvert.a1d_1 >= element_0.fd_1) {
-          tmp$ret$8 = element_0;
+      var iterator = destination.c2(destination.w());
+      while (iterator.w3()) {
+        var element_0 = iterator.y3();
+        if (amountToConvert.x1c_1 >= element_0.cd_1) {
+          tmp$ret$7 = element_0;
           break $l$block;
         }
       }
-      tmp$ret$8 = null;
+      tmp$ret$7 = null;
     }
-    var tmp5_safe_receiver = tmp$ret$8;
-    var mostRelevantUnit = tmp5_safe_receiver == null ? null : tmp5_safe_receiver.gd_1;
+    var tmp5_safe_receiver = tmp$ret$7;
+    var mostRelevantUnit = tmp5_safe_receiver == null ? null : tmp5_safe_receiver.dd_1;
     var tmp_9;
     if (mostRelevantUnit == null) {
       tmp_9 = null;
     } else {
       // Inline function 'kotlin.let' call
-      var tmp_10 = amountToConvert.a1d_1 / mostRelevantUnit.h1f_1;
-      var tmp0_safe_receiver_1 = amountToConvert.b1d_1;
+      var tmp_10 = amountToConvert.x1c_1 / mostRelevantUnit.e1f_1;
+      var tmp0_safe_receiver_1 = amountToConvert.y1c_1;
       var tmp_11;
       if (tmp0_safe_receiver_1 == null) {
         tmp_11 = null;
       } else {
         // Inline function 'kotlin.let' call
-        tmp_11 = tmp0_safe_receiver_1 / mostRelevantUnit.h1f_1;
+        tmp_11 = tmp0_safe_receiver_1 / mostRelevantUnit.e1f_1;
       }
       tmp_9 = new Amount(tmp_10, tmp_11, mostRelevantUnit);
     }
@@ -3946,11 +3945,11 @@
     // Inline function 'kotlinx.serialization.json.Json.decodeFromString' call
     var this_0 = get_tolerantJson_0();
     // Inline function 'kotlinx.serialization.serializer' call
-    var this_1 = this_0.xl();
+    var this_1 = this_0.ul();
     // Inline function 'kotlinx.serialization.internal.cast' call
     var this_2 = serializer(this_1, createKType(getKClass(RecipeV3), arrayOf([]), false));
     var tmp$ret$1 = isInterface(this_2, KSerializer) ? this_2 : THROW_CCE();
-    var parsedRecipe = this_0.u11(tmp$ret$1, recipe);
+    var parsedRecipe = this_0.r11(tmp$ret$1, recipe);
     var tmp;
     switch (unit) {
       case 'Imperial':
@@ -3979,16 +3978,16 @@
     // Inline function 'kotlinx.serialization.json.Json.encodeToString' call
     var this_3 = Default_getInstance();
     // Inline function 'kotlinx.serialization.serializer' call
-    var this_4 = this_3.xl();
+    var this_4 = this_3.ul();
     // Inline function 'kotlinx.serialization.internal.cast' call
     var this_5 = serializer(this_4, createKType(getKClass(RecipeV3), arrayOf([]), false));
     var tmp$ret$4 = isInterface(this_5, KSerializer) ? this_5 : THROW_CCE();
-    return this_3.t11(tmp$ret$4, scaledRecipe);
+    return this_3.q11(tmp$ret$4, scaledRecipe);
   }
   function parseTemplate_0(templateString) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
     var parsedTemplate = parseTemplate(templateString);
-    return parsedTemplate.k1f_1;
+    return parsedTemplate.h1f_1;
   }
   function renderTemplate(templateElements, session, unit) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
@@ -4017,19 +4016,18 @@
     }
     var measuringSystem = tmp;
     var template = new ParsedTemplate(templateElements);
-    return session.j1f(template, 1.0, measuringSystem);
+    return session.g1f(template, 1.0, measuringSystem);
   }
   function createTemplateSession(rawDensityData) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
     // Inline function 'kotlin.getOrThrow' call
     var this_0 = newTemplateSession(rawDensityData);
     throwOnFailure(this_0);
-    var tmp = _Result___get_value__impl__bjfvqg(this_0);
-    return (tmp == null ? true : !(tmp == null)) ? tmp : THROW_CCE();
+    return _Result___get_value__impl__bjfvqg(this_0);
   }
   function tolerantJson$lambda_0($this$Json) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
-    $this$Json.o12_1 = true;
+    $this$Json.l12_1 = true;
     return Unit_instance;
   }
   var properties_initialized_ScaleRecipeJsContract_kt_yki7mr;
@@ -4040,19 +4038,19 @@
     }
   }
   //region block: post-declaration
-  protoOf($serializer).us = typeParametersSerializers;
-  protoOf($serializer_0).us = typeParametersSerializers;
-  protoOf($serializer_1).us = typeParametersSerializers;
-  protoOf($serializer_2).us = typeParametersSerializers;
-  protoOf($serializer_3).us = typeParametersSerializers;
-  protoOf($serializer_4).us = typeParametersSerializers;
-  protoOf($serializer_5).us = typeParametersSerializers;
-  protoOf($serializer_6).us = typeParametersSerializers;
-  protoOf($serializer_7).us = typeParametersSerializers;
-  protoOf($serializer_8).us = typeParametersSerializers;
-  protoOf($serializer_9).us = typeParametersSerializers;
-  protoOf($serializer_10).us = typeParametersSerializers;
-  protoOf($serializer_11).us = typeParametersSerializers;
+  protoOf($serializer).rs = typeParametersSerializers;
+  protoOf($serializer_0).rs = typeParametersSerializers;
+  protoOf($serializer_1).rs = typeParametersSerializers;
+  protoOf($serializer_2).rs = typeParametersSerializers;
+  protoOf($serializer_3).rs = typeParametersSerializers;
+  protoOf($serializer_4).rs = typeParametersSerializers;
+  protoOf($serializer_5).rs = typeParametersSerializers;
+  protoOf($serializer_6).rs = typeParametersSerializers;
+  protoOf($serializer_7).rs = typeParametersSerializers;
+  protoOf($serializer_8).rs = typeParametersSerializers;
+  protoOf($serializer_9).rs = typeParametersSerializers;
+  protoOf($serializer_10).rs = typeParametersSerializers;
+  protoOf($serializer_11).rs = typeParametersSerializers;
   //endregion
   //region block: init
   Companion_instance_1 = new Companion_0();
@@ -4072,25 +4070,25 @@
   //endregion
   //region block: exports
   function $jsExportAll$(_) {
-    var $com = _.com || (_.com = {});
-    var $com$gu = $com.gu || ($com.gu = {});
-    var $com$gu$recipe = $com$gu.recipe || ($com$gu.recipe = {});
-    $com$gu$recipe.TemplateSession = TemplateSession;
-    var $com = _.com || (_.com = {});
-    var $com$gu = $com.gu || ($com.gu = {});
-    var $com$gu$recipe = $com$gu.recipe || ($com$gu.recipe = {});
-    var $com$gu$recipe$template = $com$gu$recipe.template || ($com$gu$recipe.template = {});
-    $com$gu$recipe$template.TemplateConst = TemplateConst;
-    $com$gu$recipe$template.QuantityPlaceholder = QuantityPlaceholder;
-    $com$gu$recipe$template.OvenTemperaturePlaceholder = OvenTemperaturePlaceholder;
-    var $com = _.com || (_.com = {});
-    var $com$gu = $com.gu || ($com.gu = {});
-    var $com$gu$recipe = $com$gu.recipe || ($com$gu.recipe = {});
-    var $com$gu$recipe$js = $com$gu$recipe.js || ($com$gu$recipe.js = {});
-    $com$gu$recipe$js.scaleRecipe = scaleRecipe;
-    $com$gu$recipe$js.parseTemplate = parseTemplate_0;
-    $com$gu$recipe$js.renderTemplate = renderTemplate;
-    $com$gu$recipe$js.createTemplateSession = createTemplateSession;
+    var com = _.com || (_.com = {});
+    var gu = com.gu || (com.gu = {});
+    var recipe = gu.recipe || (gu.recipe = {});
+    recipe.TemplateSession = TemplateSession;
+    var com_0 = _.com || (_.com = {});
+    var gu_0 = com_0.gu || (com_0.gu = {});
+    var recipe_0 = gu_0.recipe || (gu_0.recipe = {});
+    var template = recipe_0.template || (recipe_0.template = {});
+    template.TemplateConst = TemplateConst;
+    template.QuantityPlaceholder = QuantityPlaceholder;
+    template.OvenTemperaturePlaceholder = OvenTemperaturePlaceholder;
+    var com_1 = _.com || (_.com = {});
+    var gu_1 = com_1.gu || (com_1.gu = {});
+    var recipe_1 = gu_1.recipe || (gu_1.recipe = {});
+    var js = recipe_1.js || (recipe_1.js = {});
+    js.scaleRecipe = scaleRecipe;
+    js.parseTemplate = parseTemplate_0;
+    js.renderTemplate = renderTemplate;
+    js.createTemplateSession = createTemplateSession;
   }
   $jsExportAll$(_);
   kotlin_kotlin.$jsExportAll$(_);