@guardian/feast-multiplatform-library 3.0.1 → 4.0.0

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

@@ -2,60 +2,62 @@
   'use strict';
   //region block: imports
   var imul = Math.imul;
-  var protoOf = kotlin_kotlin.$_$.m7;
-  var initMetadataForObject = kotlin_kotlin.$_$.v6;
-  var numberToInt = kotlin_kotlin.$_$.k7;
+  var protoOf = kotlin_kotlin.$_$.n7;
+  var initMetadataForObject = kotlin_kotlin.$_$.w6;
+  var numberToInt = kotlin_kotlin.$_$.l7;
   var Unit_instance = kotlin_kotlin.$_$.j3;
-  var round = kotlin_kotlin.$_$.p7;
-  var collectionSizeOrDefault = kotlin_kotlin.$_$.z3;
-  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
-  var noWhenBranchMatchedException = kotlin_kotlin.$_$.ha;
+  var round = kotlin_kotlin.$_$.q7;
+  var noWhenBranchMatchedException = kotlin_kotlin.$_$.ia;
   var listOfNotNull = kotlin_kotlin.$_$.x4;
   var joinToString = kotlin_kotlin.$_$.s4;
-  var Pair = kotlin_kotlin.$_$.l9;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.r6;
+  var Pair = kotlin_kotlin.$_$.m9;
+  var collectionSizeOrDefault = kotlin_kotlin.$_$.z3;
+  var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.s6;
   var PluginGeneratedSerialDescriptor = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.u1;
   var DoubleSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.l;
-  var THROW_CCE = kotlin_kotlin.$_$.n9;
+  var THROW_CCE = kotlin_kotlin.$_$.o9;
   var UnknownFieldException_init_$Create$ = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.b;
   var get_nullable = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.r;
   var typeParametersSerializers = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.q1;
   var GeneratedSerializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.r1;
   var VOID = kotlin_kotlin.$_$.b;
   var throwMissingFieldException = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.x1;
-  var objectCreate = kotlin_kotlin.$_$.l7;
-  var getNumberHashCode = kotlin_kotlin.$_$.m6;
-  var equals = kotlin_kotlin.$_$.k6;
-  var initMetadataForClass = kotlin_kotlin.$_$.q6;
+  var objectCreate = kotlin_kotlin.$_$.m7;
+  var getNumberHashCode = kotlin_kotlin.$_$.n6;
+  var equals = kotlin_kotlin.$_$.l6;
+  var initMetadataForClass = kotlin_kotlin.$_$.r6;
   var StringSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.o;
   var BooleanSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.k;
-  var toString = kotlin_kotlin.$_$.ja;
-  var getStringHashCode = kotlin_kotlin.$_$.o6;
-  var getBooleanHashCode = kotlin_kotlin.$_$.l6;
+  var toString = kotlin_kotlin.$_$.ka;
+  var getStringHashCode = kotlin_kotlin.$_$.p6;
+  var getBooleanHashCode = kotlin_kotlin.$_$.m6;
   var ArrayListSerializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.o1;
   var LazyThreadSafetyMode_PUBLICATION_getInstance = kotlin_kotlin.$_$.c;
-  var lazy = kotlin_kotlin.$_$.fa;
-  var hashCode = kotlin_kotlin.$_$.p6;
+  var lazy = kotlin_kotlin.$_$.ga;
+  var hashCode = kotlin_kotlin.$_$.q6;
   var Regex_init_$Create$ = kotlin_kotlin.$_$.q;
   var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.e;
-  var substring = kotlin_kotlin.$_$.o8;
+  var substring = kotlin_kotlin.$_$.p8;
   var charSequenceLength = kotlin_kotlin.$_$.i6;
   var Default_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.a;
   var get_jsonObject = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.c;
-  var getKClass = kotlin_kotlin.$_$.y7;
-  var arrayOf = kotlin_kotlin.$_$.y9;
-  var createKType = kotlin_kotlin.$_$.w7;
+  var getKClass = kotlin_kotlin.$_$.z7;
+  var arrayOf = kotlin_kotlin.$_$.z9;
+  var createKType = kotlin_kotlin.$_$.x7;
   var serializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.j2;
   var KSerializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.c2;
-  var isInterface = kotlin_kotlin.$_$.d7;
+  var isInterface = kotlin_kotlin.$_$.e7;
   var print = kotlin_kotlin.$_$.m5;
-  var Exception = kotlin_kotlin.$_$.i9;
-  var substring_0 = kotlin_kotlin.$_$.n8;
-  var isBlank = kotlin_kotlin.$_$.g8;
+  var Exception = kotlin_kotlin.$_$.j9;
+  var substring_0 = kotlin_kotlin.$_$.o8;
+  var isBlank = kotlin_kotlin.$_$.h8;
   var Json = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.b;
+  var initMetadataForInterface = kotlin_kotlin.$_$.u6;
   var FloatSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.m;
   var IntSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.n;
-  var toString_0 = kotlin_kotlin.$_$.o7;
+  var defineProp = kotlin_kotlin.$_$.k6;
+  var toString_0 = kotlin_kotlin.$_$.p7;
   var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.v;
   //endregion
   //region block: pre-declaration
@@ -95,13 +97,14 @@
   initMetadataForCompanion(Companion_8);
   initMetadataForObject($serializer_10, '$serializer', VOID, VOID, [GeneratedSerializer]);
   initMetadataForClass(InstructionsTemplateElement, 'InstructionsTemplateElement', VOID, VOID, VOID, VOID, VOID, {0: $serializer_getInstance_10});
+  initMetadataForInterface(TemplateElement, 'TemplateElement');
+  initMetadataForClass(TemplateConst, 'TemplateConst', VOID, VOID, [TemplateElement]);
   initMetadataForCompanion(Companion_9);
   initMetadataForObject($serializer_11, '$serializer', VOID, VOID, [GeneratedSerializer]);
+  initMetadataForClass(QuantityPlaceholder, 'QuantityPlaceholder', VOID, VOID, [TemplateElement], VOID, VOID, {0: $serializer_getInstance_11});
   initMetadataForCompanion(Companion_10);
   initMetadataForObject($serializer_12, '$serializer', VOID, VOID, [GeneratedSerializer]);
-  initMetadataForClass(TemplateConst, 'TemplateConst');
-  initMetadataForClass(QuantityPlaceholder, 'QuantityPlaceholder', VOID, VOID, VOID, VOID, VOID, {0: $serializer_getInstance_11});
-  initMetadataForClass(OvenTemperaturePlaceholder, 'OvenTemperaturePlaceholder', OvenTemperaturePlaceholder, VOID, VOID, VOID, VOID, {0: $serializer_getInstance_12});
+  initMetadataForClass(OvenTemperaturePlaceholder, 'OvenTemperaturePlaceholder', OvenTemperaturePlaceholder, VOID, [TemplateElement], VOID, VOID, {0: $serializer_getInstance_12});
   initMetadataForClass(ParsedTemplate, 'ParsedTemplate');
   //endregion
   function Imperial() {
@@ -154,126 +157,129 @@
     }
     return roundedNumber.toString();
   }
-  function scaleTemplate(template, factor) {
-    // Inline function 'kotlin.collections.map' call
-    var this_0 = template.c1c_1;
-    // Inline function 'kotlin.collections.mapTo' call
-    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
-    var _iterator__ex2g4s = this_0.h();
-    while (_iterator__ex2g4s.i()) {
-      var item = _iterator__ex2g4s.j();
-      var tmp;
-      if (item instanceof TemplateConst) {
-        tmp = item.l1c_1;
+  function renderTemplateElement(element, factor) {
+    var tmp;
+    if (element instanceof TemplateConst) {
+      tmp = element.value;
+    } else {
+      if (element instanceof QuantityPlaceholder) {
+        var max = !(element.min === element.max) ? element.max : null;
+        var tmp_0;
+        if (element.scale) {
+          var scaledMin = element.min * factor;
+          var tmp_1;
+          if (max == null) {
+            tmp_1 = null;
+          } else {
+            // Inline function 'kotlin.let' call
+            tmp_1 = max * factor;
+          }
+          var scaledMax = tmp_1;
+          tmp_0 = new Pair(scaledMin, scaledMax);
+        } else {
+          tmp_0 = new Pair(element.min, max);
+        }
+        var _destruct__k2r9zo = tmp_0;
+        var scaledMin_0 = _destruct__k2r9zo.cd();
+        var scaledMax_0 = _destruct__k2r9zo.dd();
+        var unit = !(element.unit == null) ? ' ' + element.unit : '';
+        var decimals;
+        switch (unit) {
+          case 'g':
+          case 'ml':
+            decimals = 0;
+            break;
+          default:
+            decimals = 2;
+            break;
+        }
+        var fraction;
+        switch (element.unit) {
+          case 'tsp':
+          case 'tbsp':
+          case 'cup':
+          case 'cups':
+            fraction = true;
+            break;
+          case null:
+            fraction = true;
+            break;
+          default:
+            fraction = false;
+            break;
+        }
+        var tmp_2;
+        if (!(scaledMax_0 == null)) {
+          tmp_2 = formatAmount(scaledMin_0, decimals, fraction) + '-' + formatAmount(scaledMax_0, decimals, fraction) + unit;
+        } else {
+          tmp_2 = formatAmount(scaledMin_0, decimals, fraction) + unit;
+        }
+        tmp = tmp_2;
       } else {
-        if (item instanceof QuantityPlaceholder) {
-          var max = !(item.h1c_1 === item.i1c_1) ? item.i1c_1 : null;
-          var tmp_0;
-          if (item.k1c_1) {
-            var scaledMin = item.h1c_1 * factor;
-            var tmp_1;
-            if (max == null) {
-              tmp_1 = null;
+        if (element instanceof OvenTemperaturePlaceholder) {
+          var tmp_3;
+          if (element.temperatureFanC == null) {
+            tmp_3 = null;
+          } else {
+            // Inline function 'kotlin.let' call
+            var tmp_4;
+            if (element.temperatureC == null) {
+              tmp_4 = '' + element.temperatureFanC + 'C fan';
             } else {
-              // Inline function 'kotlin.let' call
-              tmp_1 = max * factor;
+              tmp_4 = ' (' + element.temperatureFanC + 'C fan)';
             }
-            var scaledMax = tmp_1;
-            tmp_0 = new Pair(scaledMin, scaledMax);
-          } else {
-            tmp_0 = new Pair(item.h1c_1, max);
+            tmp_3 = tmp_4;
           }
-          var _destruct__k2r9zo = tmp_0;
-          var scaledMin_0 = _destruct__k2r9zo.cc();
-          var scaledMax_0 = _destruct__k2r9zo.dc();
-          var unit = !(item.j1c_1 == null) ? ' ' + item.j1c_1 : '';
-          var decimals;
-          switch (unit) {
-            case 'g':
-            case 'ml':
-              decimals = 0;
-              break;
-            default:
-              decimals = 2;
-              break;
-          }
-          var fraction;
-          switch (item.j1c_1) {
-            case 'tsp':
-            case 'tbsp':
-            case 'cup':
-            case 'cups':
-              fraction = true;
-              break;
-            case null:
-              fraction = true;
-              break;
-            default:
-              fraction = false;
-              break;
+          var fanTempC = tmp_3;
+          var tmp_5;
+          if (element.temperatureC == null) {
+            tmp_5 = null;
+          } else {
+            // Inline function 'kotlin.let' call
+            tmp_5 = '' + element.temperatureC + 'C';
           }
-          var tmp_2;
-          if (!(scaledMax_0 == null)) {
-            tmp_2 = formatAmount(scaledMin_0, decimals, fraction) + '-' + formatAmount(scaledMax_0, decimals, fraction) + unit;
+          var tmp_6 = tmp_5;
+          var tmp6_safe_receiver = element.temperatureF;
+          var tmp_7;
+          if (tmp6_safe_receiver == null) {
+            tmp_7 = null;
           } else {
-            tmp_2 = formatAmount(scaledMin_0, decimals, fraction) + unit;
+            // Inline function 'kotlin.let' call
+            tmp_7 = '/' + tmp6_safe_receiver + 'F';
           }
-          tmp = tmp_2;
-        } else {
-          if (item instanceof OvenTemperaturePlaceholder) {
-            var tmp_3;
-            if (item.e1c_1 == null) {
-              tmp_3 = null;
-            } else {
-              // Inline function 'kotlin.let' call
-              var tmp_4;
-              if (item.d1c_1 == null) {
-                tmp_4 = '' + item.e1c_1 + 'C fan';
-              } else {
-                tmp_4 = ' (' + item.e1c_1 + 'C fan)';
-              }
-              tmp_3 = tmp_4;
-            }
-            var fanTempC = tmp_3;
-            var tmp_5;
-            if (item.d1c_1 == null) {
-              tmp_5 = null;
-            } else {
-              // Inline function 'kotlin.let' call
-              tmp_5 = '' + item.d1c_1 + 'C';
-            }
-            var tmp_6 = tmp_5;
-            var tmp6_safe_receiver = item.f1c_1;
-            var tmp_7;
-            if (tmp6_safe_receiver == null) {
-              tmp_7 = null;
-            } else {
-              // Inline function 'kotlin.let' call
-              tmp_7 = '/' + tmp6_safe_receiver + 'F';
-            }
-            var tmp_8 = tmp_7;
-            var tmp7_safe_receiver = item.g1c_1;
-            var tmp_9;
-            if (tmp7_safe_receiver == null) {
-              tmp_9 = null;
-            } else {
-              // Inline function 'kotlin.let' call
-              tmp_9 = '/gas mark ' + formatFraction(tmp7_safe_receiver);
-            }
-            tmp = joinToString(listOfNotNull([tmp_6, fanTempC, tmp_8, tmp_9]), '');
+          var tmp_8 = tmp_7;
+          var tmp7_safe_receiver = element.gasMark;
+          var tmp_9;
+          if (tmp7_safe_receiver == null) {
+            tmp_9 = null;
           } else {
-            noWhenBranchMatchedException();
+            // Inline function 'kotlin.let' call
+            tmp_9 = '/gas mark ' + formatFraction(tmp7_safe_receiver);
           }
+          tmp = joinToString(listOfNotNull([tmp_6, fanTempC, tmp_8, tmp_9]), '');
+        } else {
+          noWhenBranchMatchedException();
         }
       }
-      var tmp$ret$10 = tmp;
-      destination.f(tmp$ret$10);
+    }
+    return tmp;
+  }
+  function renderTemplate(template, factor) {
+    // Inline function 'kotlin.collections.map' call
+    var this_0 = template.g1d_1;
+    // Inline function 'kotlin.collections.mapTo' call
+    var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
+    var _iterator__ex2g4s = this_0.h();
+    while (_iterator__ex2g4s.i()) {
+      var item = _iterator__ex2g4s.j();
+      var tmp$ret$0 = renderTemplateElement(item, factor);
+      destination.f(tmp$ret$0);
     }
     var scaledParts = destination;
     return joinToString(scaledParts, '');
   }
-  function scaleRecipe(recipe, factor, unit) {
-    var tmp0_safe_receiver = recipe.y1c_1;
+  function scaleAndConvertUnitRecipe(recipe, factor, unit) {
+    var tmp0_safe_receiver = recipe.t1d_1;
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
@@ -284,7 +290,7 @@
       var _iterator__ex2g4s = tmp0_safe_receiver.h();
       while (_iterator__ex2g4s.i()) {
         var item = _iterator__ex2g4s.j();
-        var tmp0_safe_receiver_0 = item.k1d_1;
+        var tmp0_safe_receiver_0 = item.f1e_1;
         var tmp_0;
         if (tmp0_safe_receiver_0 == null) {
           tmp_0 = null;
@@ -295,28 +301,28 @@
           var _iterator__ex2g4s_0 = tmp0_safe_receiver_0.h();
           while (_iterator__ex2g4s_0.i()) {
             var item_0 = _iterator__ex2g4s_0.j();
-            var tmp0_safe_receiver_1 = item_0.u1d_1;
+            var tmp0_safe_receiver_1 = item_0.p1e_1;
             var tmp_1;
             if (tmp0_safe_receiver_1 == null) {
               tmp_1 = null;
             } else {
               // Inline function 'kotlin.let' call
-              tmp_1 = scaleTemplate(parseTemplate(tmp0_safe_receiver_1), factor);
+              tmp_1 = renderTemplate(parseTemplate(tmp0_safe_receiver_1), factor);
             }
             var tmp1_elvis_lhs = tmp_1;
-            var scaledText = tmp1_elvis_lhs == null ? item_0.s1d_1 : tmp1_elvis_lhs;
-            var tmp$ret$2 = new IngredientsListIngredientsList(item_0.m1d_1, item_0.n1d_1, item_0.o1d_1, item_0.p1d_1, item_0.q1d_1, item_0.r1d_1, scaledText, item_0.t1d_1);
+            var scaledText = tmp1_elvis_lhs == null ? item_0.n1e_1 : tmp1_elvis_lhs;
+            var tmp$ret$2 = new IngredientsListIngredientsList(item_0.h1e_1, item_0.i1e_1, item_0.j1e_1, item_0.k1e_1, item_0.l1e_1, item_0.m1e_1, scaledText, item_0.o1e_1);
             destination_0.f(tmp$ret$2);
           }
           tmp_0 = destination_0;
         }
-        var tmp$ret$5 = new IngredientElement(tmp_0, item.l1d_1);
+        var tmp$ret$5 = new IngredientElement(tmp_0, item.g1e_1);
         destination.f(tmp$ret$5);
       }
       tmp = destination;
     }
     var scaledIngredients = tmp;
-    var tmp1_safe_receiver = recipe.a1d_1;
+    var tmp1_safe_receiver = recipe.v1d_1;
     var tmp_2;
     if (tmp1_safe_receiver == null) {
       tmp_2 = null;
@@ -327,14 +333,14 @@
       var _iterator__ex2g4s_1 = tmp1_safe_receiver.h();
       while (_iterator__ex2g4s_1.i()) {
         var item_1 = _iterator__ex2g4s_1.j();
-        var description = scaleTemplate(parseTemplate(item_1.v1d_1), factor);
-        var tmp$ret$8 = new InstructionElement(description, item_1.w1d_1, item_1.x1d_1);
+        var description = renderTemplate(parseTemplate(item_1.q1e_1), factor);
+        var tmp$ret$8 = new InstructionElement(description, item_1.r1e_1, item_1.s1e_1);
         destination_1.f(tmp$ret$8);
       }
       tmp_2 = destination_1;
     }
     var scaledInstructions = tmp_2;
-    return new RecipeV2(recipe.m1c_1, recipe.n1c_1, recipe.o1c_1, recipe.p1c_1, recipe.q1c_1, recipe.r1c_1, recipe.s1c_1, recipe.t1c_1, recipe.u1c_1, recipe.v1c_1, recipe.w1c_1, scaledIngredients, scaledInstructions, recipe.b1d_1, recipe.c1d_1, recipe.d1d_1, recipe.e1d_1, recipe.f1d_1, recipe.g1d_1, recipe.h1d_1, recipe.i1d_1, recipe.j1d_1);
+    return new RecipeV2(recipe.h1d_1, recipe.i1d_1, recipe.j1d_1, recipe.k1d_1, recipe.l1d_1, recipe.m1d_1, recipe.n1d_1, recipe.o1d_1, recipe.p1d_1, recipe.q1d_1, recipe.r1d_1, scaledIngredients, scaledInstructions, recipe.w1d_1, recipe.x1d_1, recipe.y1d_1, recipe.z1d_1, recipe.a1e_1, recipe.b1e_1, recipe.c1e_1, recipe.d1e_1, recipe.e1e_1);
   }
   function Companion() {
   }
@@ -345,63 +351,63 @@
   function $serializer() {
     $serializer_instance = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.RangeClass', this, 2);
-    tmp0_serialDesc.wr('max', true);
-    tmp0_serialDesc.wr('min', true);
-    this.y1d_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('max', true);
+    tmp0_serialDesc.ws('min', true);
+    this.t1e_1 = tmp0_serialDesc;
   }
-  protoOf($serializer).z1d = function (encoder, value) {
-    var tmp0_desc = this.y1d_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.a1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, DoubleSerializer_getInstance(), value.a1e_1);
+  protoOf($serializer).u1e = function (encoder, value) {
+    var tmp0_desc = this.t1e_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.v1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, DoubleSerializer_getInstance(), value.v1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.b1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, DoubleSerializer_getInstance(), value.b1e_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.w1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, DoubleSerializer_getInstance(), value.w1e_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer).rh = function (encoder, value) {
-    return this.z1d(encoder, value instanceof RangeClass ? value : THROW_CCE());
+  protoOf($serializer).ri = function (encoder, value) {
+    return this.u1e(encoder, value instanceof RangeClass ? value : THROW_CCE());
   };
-  protoOf($serializer).sh = function (decoder) {
-    var tmp0_desc = this.y1d_1;
+  protoOf($serializer).si = function (decoder) {
+    var tmp0_desc = this.t1e_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.nk(tmp0_desc);
-    if (tmp6_input.dl()) {
-      tmp4_local0 = tmp6_input.bl(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
+    var tmp6_input = decoder.nl(tmp0_desc);
+    if (tmp6_input.dm()) {
+      tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp6_input.bl(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp6_input.el(tmp0_desc);
+        tmp2_index = tmp6_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp6_input.bl(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp6_input.bl(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp6_input.ok(tmp0_desc);
+    tmp6_input.ol(tmp0_desc);
     return RangeClass_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
   };
-  protoOf($serializer).qh = function () {
-    return this.y1d_1;
+  protoOf($serializer).qi = function () {
+    return this.t1e_1;
   };
-  protoOf($serializer).yr = function () {
+  protoOf($serializer).ys = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -415,16 +421,16 @@
   }
   function RangeClass_init_$Init$(seen0, max, min, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance().y1d_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance().t1e_1);
     }
     if (0 === (seen0 & 1))
-      $this.a1e_1 = null;
+      $this.v1e_1 = null;
     else
-      $this.a1e_1 = max;
+      $this.v1e_1 = max;
     if (0 === (seen0 & 2))
-      $this.b1e_1 = null;
+      $this.w1e_1 = null;
     else
-      $this.b1e_1 = min;
+      $this.w1e_1 = min;
     return $this;
   }
   function RangeClass_init_$Create$(seen0, max, min, serializationConstructorMarker) {
@@ -433,15 +439,15 @@
   function RangeClass(max, min) {
     max = max === VOID ? null : max;
     min = min === VOID ? null : min;
-    this.a1e_1 = max;
-    this.b1e_1 = min;
+    this.v1e_1 = max;
+    this.w1e_1 = min;
   }
   protoOf(RangeClass).toString = function () {
-    return 'RangeClass(max=' + this.a1e_1 + ', min=' + this.b1e_1 + ')';
+    return 'RangeClass(max=' + this.v1e_1 + ', min=' + this.w1e_1 + ')';
   };
   protoOf(RangeClass).hashCode = function () {
-    var result = this.a1e_1 == null ? 0 : getNumberHashCode(this.a1e_1);
-    result = imul(result, 31) + (this.b1e_1 == null ? 0 : getNumberHashCode(this.b1e_1)) | 0;
+    var result = this.v1e_1 == null ? 0 : getNumberHashCode(this.v1e_1);
+    result = imul(result, 31) + (this.w1e_1 == null ? 0 : getNumberHashCode(this.w1e_1)) | 0;
     return result;
   };
   protoOf(RangeClass).equals = function (other) {
@@ -449,9 +455,9 @@
       return true;
     if (!(other instanceof RangeClass))
       return false;
-    if (!equals(this.a1e_1, other.a1e_1))
+    if (!equals(this.v1e_1, other.v1e_1))
       return false;
-    if (!equals(this.b1e_1, other.b1e_1))
+    if (!equals(this.w1e_1, other.w1e_1))
       return false;
     return true;
   };
@@ -464,50 +470,50 @@
   function $serializer_0() {
     $serializer_instance_0 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.IngredientsListIngredientsList', this, 8);
-    tmp0_serialDesc.wr('amount', true);
-    tmp0_serialDesc.wr('ingredientId', true);
-    tmp0_serialDesc.wr('name', true);
-    tmp0_serialDesc.wr('optional', true);
-    tmp0_serialDesc.wr('prefix', true);
-    tmp0_serialDesc.wr('suffix', true);
-    tmp0_serialDesc.wr('text', true);
-    tmp0_serialDesc.wr('unit', true);
-    this.c1e_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('amount', true);
+    tmp0_serialDesc.ws('ingredientId', true);
+    tmp0_serialDesc.ws('name', true);
+    tmp0_serialDesc.ws('optional', true);
+    tmp0_serialDesc.ws('prefix', true);
+    tmp0_serialDesc.ws('suffix', true);
+    tmp0_serialDesc.ws('text', true);
+    tmp0_serialDesc.ws('unit', true);
+    this.x1e_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_0).d1e = function (encoder, value) {
-    var tmp0_desc = this.c1e_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.e1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, $serializer_getInstance(), value.e1e_1);
+  protoOf($serializer_0).y1e = function (encoder, value) {
+    var tmp0_desc = this.x1e_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.z1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, $serializer_getInstance(), value.z1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.f1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, StringSerializer_getInstance(), value.f1e_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.a1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.a1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.g1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, StringSerializer_getInstance(), value.g1e_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.b1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.b1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 3) ? true : !(value.h1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 3, BooleanSerializer_getInstance(), value.h1e_1);
+    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.c1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 3, BooleanSerializer_getInstance(), value.c1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 4) ? true : !(value.i1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 4, StringSerializer_getInstance(), value.i1e_1);
+    if (tmp1_output.jn(tmp0_desc, 4) ? true : !(value.d1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 4, StringSerializer_getInstance(), value.d1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 5) ? true : !(value.j1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 5, StringSerializer_getInstance(), value.j1e_1);
+    if (tmp1_output.jn(tmp0_desc, 5) ? true : !(value.e1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 5, StringSerializer_getInstance(), value.e1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 6) ? true : !(value.k1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 6, StringSerializer_getInstance(), value.k1e_1);
+    if (tmp1_output.jn(tmp0_desc, 6) ? true : !(value.f1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 6, StringSerializer_getInstance(), value.f1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 7) ? true : !(value.l1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 7, StringSerializer_getInstance(), value.l1e_1);
+    if (tmp1_output.jn(tmp0_desc, 7) ? true : !(value.g1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 7, StringSerializer_getInstance(), value.g1f_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_0).rh = function (encoder, value) {
-    return this.d1e(encoder, value instanceof IngredientsListIngredientsList ? value : THROW_CCE());
+  protoOf($serializer_0).ri = function (encoder, value) {
+    return this.y1e(encoder, value instanceof IngredientsListIngredientsList ? value : THROW_CCE());
   };
-  protoOf($serializer_0).sh = function (decoder) {
-    var tmp0_desc = this.c1e_1;
+  protoOf($serializer_0).si = function (decoder) {
+    var tmp0_desc = this.x1e_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -519,74 +525,74 @@
     var tmp9_local5 = null;
     var tmp10_local6 = null;
     var tmp11_local7 = null;
-    var tmp12_input = decoder.nk(tmp0_desc);
-    if (tmp12_input.dl()) {
-      tmp4_local0 = tmp12_input.bl(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
+    var tmp12_input = decoder.nl(tmp0_desc);
+    if (tmp12_input.dm()) {
+      tmp4_local0 = tmp12_input.bm(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp12_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp12_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp12_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp12_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp12_input.bl(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp12_input.bm(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp12_input.bl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+      tmp8_local4 = tmp12_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp12_input.bl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp12_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp12_input.bl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+      tmp10_local6 = tmp12_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp12_input.bl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+      tmp11_local7 = tmp12_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp12_input.el(tmp0_desc);
+        tmp2_index = tmp12_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp12_input.bl(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp12_input.bm(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp12_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp12_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp12_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp12_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp12_input.bl(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp12_input.bm(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp12_input.bl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+            tmp8_local4 = tmp12_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp12_input.bl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp12_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp12_input.bl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+            tmp10_local6 = tmp12_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp12_input.bl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+            tmp11_local7 = tmp12_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp12_input.ok(tmp0_desc);
+    tmp12_input.ol(tmp0_desc);
     return IngredientsListIngredientsList_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, null);
   };
-  protoOf($serializer_0).qh = function () {
-    return this.c1e_1;
+  protoOf($serializer_0).qi = function () {
+    return this.x1e_1;
   };
-  protoOf($serializer_0).yr = function () {
+  protoOf($serializer_0).ys = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -600,40 +606,40 @@
   }
   function IngredientsListIngredientsList_init_$Init$(seen0, amount, ingredientID, name, optional, prefix, suffix, text, unit, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_0().c1e_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_0().x1e_1);
     }
     if (0 === (seen0 & 1))
-      $this.e1e_1 = null;
+      $this.z1e_1 = null;
     else
-      $this.e1e_1 = amount;
+      $this.z1e_1 = amount;
     if (0 === (seen0 & 2))
-      $this.f1e_1 = null;
+      $this.a1f_1 = null;
     else
-      $this.f1e_1 = ingredientID;
+      $this.a1f_1 = ingredientID;
     if (0 === (seen0 & 4))
-      $this.g1e_1 = null;
+      $this.b1f_1 = null;
     else
-      $this.g1e_1 = name;
+      $this.b1f_1 = name;
     if (0 === (seen0 & 8))
-      $this.h1e_1 = null;
+      $this.c1f_1 = null;
     else
-      $this.h1e_1 = optional;
+      $this.c1f_1 = optional;
     if (0 === (seen0 & 16))
-      $this.i1e_1 = null;
+      $this.d1f_1 = null;
     else
-      $this.i1e_1 = prefix;
+      $this.d1f_1 = prefix;
     if (0 === (seen0 & 32))
-      $this.j1e_1 = null;
+      $this.e1f_1 = null;
     else
-      $this.j1e_1 = suffix;
+      $this.e1f_1 = suffix;
     if (0 === (seen0 & 64))
-      $this.k1e_1 = null;
+      $this.f1f_1 = null;
     else
-      $this.k1e_1 = text;
+      $this.f1f_1 = text;
     if (0 === (seen0 & 128))
-      $this.l1e_1 = null;
+      $this.g1f_1 = null;
     else
-      $this.l1e_1 = unit;
+      $this.g1f_1 = unit;
     return $this;
   }
   function IngredientsListIngredientsList_init_$Create$(seen0, amount, ingredientID, name, optional, prefix, suffix, text, unit, serializationConstructorMarker) {
@@ -648,27 +654,27 @@
     suffix = suffix === VOID ? null : suffix;
     text = text === VOID ? null : text;
     unit = unit === VOID ? null : unit;
-    this.e1e_1 = amount;
-    this.f1e_1 = ingredientID;
-    this.g1e_1 = name;
-    this.h1e_1 = optional;
-    this.i1e_1 = prefix;
-    this.j1e_1 = suffix;
-    this.k1e_1 = text;
-    this.l1e_1 = unit;
+    this.z1e_1 = amount;
+    this.a1f_1 = ingredientID;
+    this.b1f_1 = name;
+    this.c1f_1 = optional;
+    this.d1f_1 = prefix;
+    this.e1f_1 = suffix;
+    this.f1f_1 = text;
+    this.g1f_1 = unit;
   }
   protoOf(IngredientsListIngredientsList).toString = function () {
-    return 'IngredientsListIngredientsList(amount=' + toString(this.e1e_1) + ', ingredientID=' + this.f1e_1 + ', name=' + this.g1e_1 + ', optional=' + this.h1e_1 + ', prefix=' + this.i1e_1 + ', suffix=' + this.j1e_1 + ', text=' + this.k1e_1 + ', unit=' + this.l1e_1 + ')';
+    return 'IngredientsListIngredientsList(amount=' + toString(this.z1e_1) + ', ingredientID=' + this.a1f_1 + ', name=' + this.b1f_1 + ', optional=' + this.c1f_1 + ', prefix=' + this.d1f_1 + ', suffix=' + this.e1f_1 + ', text=' + this.f1f_1 + ', unit=' + this.g1f_1 + ')';
   };
   protoOf(IngredientsListIngredientsList).hashCode = function () {
-    var result = this.e1e_1 == null ? 0 : this.e1e_1.hashCode();
-    result = imul(result, 31) + (this.f1e_1 == null ? 0 : getStringHashCode(this.f1e_1)) | 0;
-    result = imul(result, 31) + (this.g1e_1 == null ? 0 : getStringHashCode(this.g1e_1)) | 0;
-    result = imul(result, 31) + (this.h1e_1 == null ? 0 : getBooleanHashCode(this.h1e_1)) | 0;
-    result = imul(result, 31) + (this.i1e_1 == null ? 0 : getStringHashCode(this.i1e_1)) | 0;
-    result = imul(result, 31) + (this.j1e_1 == null ? 0 : getStringHashCode(this.j1e_1)) | 0;
-    result = imul(result, 31) + (this.k1e_1 == null ? 0 : getStringHashCode(this.k1e_1)) | 0;
-    result = imul(result, 31) + (this.l1e_1 == null ? 0 : getStringHashCode(this.l1e_1)) | 0;
+    var result = this.z1e_1 == null ? 0 : this.z1e_1.hashCode();
+    result = imul(result, 31) + (this.a1f_1 == null ? 0 : getStringHashCode(this.a1f_1)) | 0;
+    result = imul(result, 31) + (this.b1f_1 == null ? 0 : getStringHashCode(this.b1f_1)) | 0;
+    result = imul(result, 31) + (this.c1f_1 == null ? 0 : getBooleanHashCode(this.c1f_1)) | 0;
+    result = imul(result, 31) + (this.d1f_1 == null ? 0 : getStringHashCode(this.d1f_1)) | 0;
+    result = imul(result, 31) + (this.e1f_1 == null ? 0 : getStringHashCode(this.e1f_1)) | 0;
+    result = imul(result, 31) + (this.f1f_1 == null ? 0 : getStringHashCode(this.f1f_1)) | 0;
+    result = imul(result, 31) + (this.g1f_1 == null ? 0 : getStringHashCode(this.g1f_1)) | 0;
     return result;
   };
   protoOf(IngredientsListIngredientsList).equals = function (other) {
@@ -676,21 +682,21 @@
       return true;
     if (!(other instanceof IngredientsListIngredientsList))
       return false;
-    if (!equals(this.e1e_1, other.e1e_1))
+    if (!equals(this.z1e_1, other.z1e_1))
       return false;
-    if (!(this.f1e_1 == other.f1e_1))
+    if (!(this.a1f_1 == other.a1f_1))
       return false;
-    if (!(this.g1e_1 == other.g1e_1))
+    if (!(this.b1f_1 == other.b1f_1))
       return false;
-    if (!(this.h1e_1 == other.h1e_1))
+    if (!(this.c1f_1 == other.c1f_1))
       return false;
-    if (!(this.i1e_1 == other.i1e_1))
+    if (!(this.d1f_1 == other.d1f_1))
       return false;
-    if (!(this.j1e_1 == other.j1e_1))
+    if (!(this.e1f_1 == other.e1f_1))
       return false;
-    if (!(this.k1e_1 == other.k1e_1))
+    if (!(this.f1f_1 == other.f1f_1))
       return false;
-    if (!(this.l1e_1 == other.l1e_1))
+    if (!(this.g1f_1 == other.g1f_1))
       return false;
     return true;
   };
@@ -759,7 +765,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.m1e_1 = [null, tmp_1, null, tmp_3, null, tmp_5, tmp_7, null, null, null, null, tmp_9, tmp_11, null, tmp_13, tmp_15, tmp_17, tmp_19, tmp_21, null, lazy(tmp_22, RecipeV2$Companion$$childSerializers$_anonymous__obtsao_10), null];
+    tmp.h1f_1 = [null, tmp_1, null, tmp_3, null, tmp_5, tmp_7, null, null, null, null, tmp_9, tmp_11, null, tmp_13, tmp_15, tmp_17, tmp_19, tmp_21, null, lazy(tmp_22, RecipeV2$Companion$$childSerializers$_anonymous__obtsao_10), null];
   }
   var Companion_instance_1;
   function Companion_getInstance_1() {
@@ -770,105 +776,105 @@
   function $serializer_1() {
     $serializer_instance_1 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.RecipeV2', this, 22);
-    tmp0_serialDesc.wr('bookCredit', true);
-    tmp0_serialDesc.wr('byline', true);
-    tmp0_serialDesc.wr('canonicalArticle', true);
-    tmp0_serialDesc.wr('celebrationIds', true);
-    tmp0_serialDesc.wr('composerId', true);
-    tmp0_serialDesc.wr('contributors', true);
-    tmp0_serialDesc.wr('cuisineIds', true);
-    tmp0_serialDesc.wr('description', true);
-    tmp0_serialDesc.wr('difficultyLevel', true);
-    tmp0_serialDesc.wr('featuredImage', true);
-    tmp0_serialDesc.wr('id', false);
-    tmp0_serialDesc.wr('ingredients', true);
-    tmp0_serialDesc.wr('instructions', true);
-    tmp0_serialDesc.wr('isAppReady', true);
-    tmp0_serialDesc.wr('mealTypeIds', true);
-    tmp0_serialDesc.wr('serves', true);
-    tmp0_serialDesc.wr('suitableForDietIds', true);
-    tmp0_serialDesc.wr('techniquesUsedIds', true);
-    tmp0_serialDesc.wr('timings', true);
-    tmp0_serialDesc.wr('title', true);
-    tmp0_serialDesc.wr('utensilsAndApplianceIds', true);
-    tmp0_serialDesc.wr('webPublicationDate', true);
-    this.n1e_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('bookCredit', true);
+    tmp0_serialDesc.ws('byline', true);
+    tmp0_serialDesc.ws('canonicalArticle', true);
+    tmp0_serialDesc.ws('celebrationIds', true);
+    tmp0_serialDesc.ws('composerId', true);
+    tmp0_serialDesc.ws('contributors', true);
+    tmp0_serialDesc.ws('cuisineIds', true);
+    tmp0_serialDesc.ws('description', true);
+    tmp0_serialDesc.ws('difficultyLevel', true);
+    tmp0_serialDesc.ws('featuredImage', true);
+    tmp0_serialDesc.ws('id', false);
+    tmp0_serialDesc.ws('ingredients', true);
+    tmp0_serialDesc.ws('instructions', true);
+    tmp0_serialDesc.ws('isAppReady', true);
+    tmp0_serialDesc.ws('mealTypeIds', true);
+    tmp0_serialDesc.ws('serves', true);
+    tmp0_serialDesc.ws('suitableForDietIds', true);
+    tmp0_serialDesc.ws('techniquesUsedIds', true);
+    tmp0_serialDesc.ws('timings', true);
+    tmp0_serialDesc.ws('title', true);
+    tmp0_serialDesc.ws('utensilsAndApplianceIds', true);
+    tmp0_serialDesc.ws('webPublicationDate', true);
+    this.i1f_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_1).o1e = function (encoder, value) {
-    var tmp0_desc = this.n1e_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_1().m1e_1;
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.p1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, StringSerializer_getInstance(), value.p1e_1);
+  protoOf($serializer_1).j1f = function (encoder, value) {
+    var tmp0_desc = this.i1f_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_1().h1f_1;
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.k1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, StringSerializer_getInstance(), value.k1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.q1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, tmp2_cached[1].o1(), value.q1e_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.l1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, tmp2_cached[1].t1(), value.l1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.r1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, StringSerializer_getInstance(), value.r1e_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.m1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.m1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 3) ? true : !(value.s1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 3, tmp2_cached[3].o1(), value.s1e_1);
+    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.n1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 3, tmp2_cached[3].t1(), value.n1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 4) ? true : !(value.t1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 4, StringSerializer_getInstance(), value.t1e_1);
+    if (tmp1_output.jn(tmp0_desc, 4) ? true : !(value.o1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 4, StringSerializer_getInstance(), value.o1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 5) ? true : !(value.u1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 5, tmp2_cached[5].o1(), value.u1e_1);
+    if (tmp1_output.jn(tmp0_desc, 5) ? true : !(value.p1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 5, tmp2_cached[5].t1(), value.p1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 6) ? true : !(value.v1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 6, tmp2_cached[6].o1(), value.v1e_1);
+    if (tmp1_output.jn(tmp0_desc, 6) ? true : !(value.q1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 6, tmp2_cached[6].t1(), value.q1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 7) ? true : !(value.w1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 7, StringSerializer_getInstance(), value.w1e_1);
+    if (tmp1_output.jn(tmp0_desc, 7) ? true : !(value.r1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 7, StringSerializer_getInstance(), value.r1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 8) ? true : !(value.x1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 8, StringSerializer_getInstance(), value.x1e_1);
+    if (tmp1_output.jn(tmp0_desc, 8) ? true : !(value.s1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 8, StringSerializer_getInstance(), value.s1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 9) ? true : !(value.y1e_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 9, $serializer_getInstance_2(), value.y1e_1);
+    if (tmp1_output.jn(tmp0_desc, 9) ? true : !(value.t1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 9, $serializer_getInstance_2(), value.t1f_1);
     }
-    tmp1_output.bm(tmp0_desc, 10, value.z1e_1);
-    if (tmp1_output.jm(tmp0_desc, 11) ? true : !(value.a1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 11, tmp2_cached[11].o1(), value.a1f_1);
+    tmp1_output.bn(tmp0_desc, 10, value.u1f_1);
+    if (tmp1_output.jn(tmp0_desc, 11) ? true : !(value.v1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 11, tmp2_cached[11].t1(), value.v1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 12) ? true : !(value.b1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 12, tmp2_cached[12].o1(), value.b1f_1);
+    if (tmp1_output.jn(tmp0_desc, 12) ? true : !(value.w1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 12, tmp2_cached[12].t1(), value.w1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 13) ? true : !(value.c1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 13, BooleanSerializer_getInstance(), value.c1f_1);
+    if (tmp1_output.jn(tmp0_desc, 13) ? true : !(value.x1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 13, BooleanSerializer_getInstance(), value.x1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 14) ? true : !(value.d1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 14, tmp2_cached[14].o1(), value.d1f_1);
+    if (tmp1_output.jn(tmp0_desc, 14) ? true : !(value.y1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 14, tmp2_cached[14].t1(), value.y1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 15) ? true : !(value.e1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 15, tmp2_cached[15].o1(), value.e1f_1);
+    if (tmp1_output.jn(tmp0_desc, 15) ? true : !(value.z1f_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 15, tmp2_cached[15].t1(), value.z1f_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 16) ? true : !(value.f1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 16, tmp2_cached[16].o1(), value.f1f_1);
+    if (tmp1_output.jn(tmp0_desc, 16) ? true : !(value.a1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 16, tmp2_cached[16].t1(), value.a1g_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 17) ? true : !(value.g1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 17, tmp2_cached[17].o1(), value.g1f_1);
+    if (tmp1_output.jn(tmp0_desc, 17) ? true : !(value.b1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 17, tmp2_cached[17].t1(), value.b1g_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 18) ? true : !(value.h1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 18, tmp2_cached[18].o1(), value.h1f_1);
+    if (tmp1_output.jn(tmp0_desc, 18) ? true : !(value.c1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 18, tmp2_cached[18].t1(), value.c1g_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 19) ? true : !(value.i1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 19, StringSerializer_getInstance(), value.i1f_1);
+    if (tmp1_output.jn(tmp0_desc, 19) ? true : !(value.d1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 19, StringSerializer_getInstance(), value.d1g_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 20) ? true : !(value.j1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 20, tmp2_cached[20].o1(), value.j1f_1);
+    if (tmp1_output.jn(tmp0_desc, 20) ? true : !(value.e1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 20, tmp2_cached[20].t1(), value.e1g_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 21) ? true : !(value.k1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 21, StringSerializer_getInstance(), value.k1f_1);
+    if (tmp1_output.jn(tmp0_desc, 21) ? true : !(value.f1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 21, StringSerializer_getInstance(), value.f1g_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_1).rh = function (encoder, value) {
-    return this.o1e(encoder, value instanceof RecipeV2 ? value : THROW_CCE());
+  protoOf($serializer_1).ri = function (encoder, value) {
+    return this.j1f(encoder, value instanceof RecipeV2 ? value : THROW_CCE());
   };
-  protoOf($serializer_1).sh = function (decoder) {
-    var tmp0_desc = this.n1e_1;
+  protoOf($serializer_1).si = function (decoder) {
+    var tmp0_desc = this.i1f_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -894,164 +900,164 @@
     var tmp23_local19 = null;
     var tmp24_local20 = null;
     var tmp25_local21 = null;
-    var tmp26_input = decoder.nk(tmp0_desc);
-    var tmp27_cached = Companion_getInstance_1().m1e_1;
-    if (tmp26_input.dl()) {
-      tmp4_local0 = tmp26_input.bl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+    var tmp26_input = decoder.nl(tmp0_desc);
+    var tmp27_cached = Companion_getInstance_1().h1f_1;
+    if (tmp26_input.dm()) {
+      tmp4_local0 = tmp26_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp26_input.bl(tmp0_desc, 1, tmp27_cached[1].o1(), tmp5_local1);
+      tmp5_local1 = tmp26_input.bm(tmp0_desc, 1, tmp27_cached[1].t1(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp26_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp26_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp26_input.bl(tmp0_desc, 3, tmp27_cached[3].o1(), tmp7_local3);
+      tmp7_local3 = tmp26_input.bm(tmp0_desc, 3, tmp27_cached[3].t1(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp26_input.bl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+      tmp8_local4 = tmp26_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp26_input.bl(tmp0_desc, 5, tmp27_cached[5].o1(), tmp9_local5);
+      tmp9_local5 = tmp26_input.bm(tmp0_desc, 5, tmp27_cached[5].t1(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp26_input.bl(tmp0_desc, 6, tmp27_cached[6].o1(), tmp10_local6);
+      tmp10_local6 = tmp26_input.bm(tmp0_desc, 6, tmp27_cached[6].t1(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp26_input.bl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+      tmp11_local7 = tmp26_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
-      tmp12_local8 = tmp26_input.bl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+      tmp12_local8 = tmp26_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
       tmp3_bitMask0 = tmp3_bitMask0 | 256;
-      tmp13_local9 = tmp26_input.bl(tmp0_desc, 9, $serializer_getInstance_2(), tmp13_local9);
+      tmp13_local9 = tmp26_input.bm(tmp0_desc, 9, $serializer_getInstance_2(), tmp13_local9);
       tmp3_bitMask0 = tmp3_bitMask0 | 512;
-      tmp14_local10 = tmp26_input.xk(tmp0_desc, 10);
+      tmp14_local10 = tmp26_input.xl(tmp0_desc, 10);
       tmp3_bitMask0 = tmp3_bitMask0 | 1024;
-      tmp15_local11 = tmp26_input.bl(tmp0_desc, 11, tmp27_cached[11].o1(), tmp15_local11);
+      tmp15_local11 = tmp26_input.bm(tmp0_desc, 11, tmp27_cached[11].t1(), tmp15_local11);
       tmp3_bitMask0 = tmp3_bitMask0 | 2048;
-      tmp16_local12 = tmp26_input.bl(tmp0_desc, 12, tmp27_cached[12].o1(), tmp16_local12);
+      tmp16_local12 = tmp26_input.bm(tmp0_desc, 12, tmp27_cached[12].t1(), tmp16_local12);
       tmp3_bitMask0 = tmp3_bitMask0 | 4096;
-      tmp17_local13 = tmp26_input.bl(tmp0_desc, 13, BooleanSerializer_getInstance(), tmp17_local13);
+      tmp17_local13 = tmp26_input.bm(tmp0_desc, 13, BooleanSerializer_getInstance(), tmp17_local13);
       tmp3_bitMask0 = tmp3_bitMask0 | 8192;
-      tmp18_local14 = tmp26_input.bl(tmp0_desc, 14, tmp27_cached[14].o1(), tmp18_local14);
+      tmp18_local14 = tmp26_input.bm(tmp0_desc, 14, tmp27_cached[14].t1(), tmp18_local14);
       tmp3_bitMask0 = tmp3_bitMask0 | 16384;
-      tmp19_local15 = tmp26_input.bl(tmp0_desc, 15, tmp27_cached[15].o1(), tmp19_local15);
+      tmp19_local15 = tmp26_input.bm(tmp0_desc, 15, tmp27_cached[15].t1(), tmp19_local15);
       tmp3_bitMask0 = tmp3_bitMask0 | 32768;
-      tmp20_local16 = tmp26_input.bl(tmp0_desc, 16, tmp27_cached[16].o1(), tmp20_local16);
+      tmp20_local16 = tmp26_input.bm(tmp0_desc, 16, tmp27_cached[16].t1(), tmp20_local16);
       tmp3_bitMask0 = tmp3_bitMask0 | 65536;
-      tmp21_local17 = tmp26_input.bl(tmp0_desc, 17, tmp27_cached[17].o1(), tmp21_local17);
+      tmp21_local17 = tmp26_input.bm(tmp0_desc, 17, tmp27_cached[17].t1(), tmp21_local17);
       tmp3_bitMask0 = tmp3_bitMask0 | 131072;
-      tmp22_local18 = tmp26_input.bl(tmp0_desc, 18, tmp27_cached[18].o1(), tmp22_local18);
+      tmp22_local18 = tmp26_input.bm(tmp0_desc, 18, tmp27_cached[18].t1(), tmp22_local18);
       tmp3_bitMask0 = tmp3_bitMask0 | 262144;
-      tmp23_local19 = tmp26_input.bl(tmp0_desc, 19, StringSerializer_getInstance(), tmp23_local19);
+      tmp23_local19 = tmp26_input.bm(tmp0_desc, 19, StringSerializer_getInstance(), tmp23_local19);
       tmp3_bitMask0 = tmp3_bitMask0 | 524288;
-      tmp24_local20 = tmp26_input.bl(tmp0_desc, 20, tmp27_cached[20].o1(), tmp24_local20);
+      tmp24_local20 = tmp26_input.bm(tmp0_desc, 20, tmp27_cached[20].t1(), tmp24_local20);
       tmp3_bitMask0 = tmp3_bitMask0 | 1048576;
-      tmp25_local21 = tmp26_input.bl(tmp0_desc, 21, StringSerializer_getInstance(), tmp25_local21);
+      tmp25_local21 = tmp26_input.bm(tmp0_desc, 21, StringSerializer_getInstance(), tmp25_local21);
       tmp3_bitMask0 = tmp3_bitMask0 | 2097152;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp26_input.el(tmp0_desc);
+        tmp2_index = tmp26_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp26_input.bl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp26_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp26_input.bl(tmp0_desc, 1, tmp27_cached[1].o1(), tmp5_local1);
+            tmp5_local1 = tmp26_input.bm(tmp0_desc, 1, tmp27_cached[1].t1(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp26_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp26_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp26_input.bl(tmp0_desc, 3, tmp27_cached[3].o1(), tmp7_local3);
+            tmp7_local3 = tmp26_input.bm(tmp0_desc, 3, tmp27_cached[3].t1(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp26_input.bl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+            tmp8_local4 = tmp26_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp26_input.bl(tmp0_desc, 5, tmp27_cached[5].o1(), tmp9_local5);
+            tmp9_local5 = tmp26_input.bm(tmp0_desc, 5, tmp27_cached[5].t1(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp26_input.bl(tmp0_desc, 6, tmp27_cached[6].o1(), tmp10_local6);
+            tmp10_local6 = tmp26_input.bm(tmp0_desc, 6, tmp27_cached[6].t1(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp26_input.bl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+            tmp11_local7 = tmp26_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           case 8:
-            tmp12_local8 = tmp26_input.bl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+            tmp12_local8 = tmp26_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
             tmp3_bitMask0 = tmp3_bitMask0 | 256;
             break;
           case 9:
-            tmp13_local9 = tmp26_input.bl(tmp0_desc, 9, $serializer_getInstance_2(), tmp13_local9);
+            tmp13_local9 = tmp26_input.bm(tmp0_desc, 9, $serializer_getInstance_2(), tmp13_local9);
             tmp3_bitMask0 = tmp3_bitMask0 | 512;
             break;
           case 10:
-            tmp14_local10 = tmp26_input.xk(tmp0_desc, 10);
+            tmp14_local10 = tmp26_input.xl(tmp0_desc, 10);
             tmp3_bitMask0 = tmp3_bitMask0 | 1024;
             break;
           case 11:
-            tmp15_local11 = tmp26_input.bl(tmp0_desc, 11, tmp27_cached[11].o1(), tmp15_local11);
+            tmp15_local11 = tmp26_input.bm(tmp0_desc, 11, tmp27_cached[11].t1(), tmp15_local11);
             tmp3_bitMask0 = tmp3_bitMask0 | 2048;
             break;
           case 12:
-            tmp16_local12 = tmp26_input.bl(tmp0_desc, 12, tmp27_cached[12].o1(), tmp16_local12);
+            tmp16_local12 = tmp26_input.bm(tmp0_desc, 12, tmp27_cached[12].t1(), tmp16_local12);
             tmp3_bitMask0 = tmp3_bitMask0 | 4096;
             break;
           case 13:
-            tmp17_local13 = tmp26_input.bl(tmp0_desc, 13, BooleanSerializer_getInstance(), tmp17_local13);
+            tmp17_local13 = tmp26_input.bm(tmp0_desc, 13, BooleanSerializer_getInstance(), tmp17_local13);
             tmp3_bitMask0 = tmp3_bitMask0 | 8192;
             break;
           case 14:
-            tmp18_local14 = tmp26_input.bl(tmp0_desc, 14, tmp27_cached[14].o1(), tmp18_local14);
+            tmp18_local14 = tmp26_input.bm(tmp0_desc, 14, tmp27_cached[14].t1(), tmp18_local14);
             tmp3_bitMask0 = tmp3_bitMask0 | 16384;
             break;
           case 15:
-            tmp19_local15 = tmp26_input.bl(tmp0_desc, 15, tmp27_cached[15].o1(), tmp19_local15);
+            tmp19_local15 = tmp26_input.bm(tmp0_desc, 15, tmp27_cached[15].t1(), tmp19_local15);
             tmp3_bitMask0 = tmp3_bitMask0 | 32768;
             break;
           case 16:
-            tmp20_local16 = tmp26_input.bl(tmp0_desc, 16, tmp27_cached[16].o1(), tmp20_local16);
+            tmp20_local16 = tmp26_input.bm(tmp0_desc, 16, tmp27_cached[16].t1(), tmp20_local16);
             tmp3_bitMask0 = tmp3_bitMask0 | 65536;
             break;
           case 17:
-            tmp21_local17 = tmp26_input.bl(tmp0_desc, 17, tmp27_cached[17].o1(), tmp21_local17);
+            tmp21_local17 = tmp26_input.bm(tmp0_desc, 17, tmp27_cached[17].t1(), tmp21_local17);
             tmp3_bitMask0 = tmp3_bitMask0 | 131072;
             break;
           case 18:
-            tmp22_local18 = tmp26_input.bl(tmp0_desc, 18, tmp27_cached[18].o1(), tmp22_local18);
+            tmp22_local18 = tmp26_input.bm(tmp0_desc, 18, tmp27_cached[18].t1(), tmp22_local18);
             tmp3_bitMask0 = tmp3_bitMask0 | 262144;
             break;
           case 19:
-            tmp23_local19 = tmp26_input.bl(tmp0_desc, 19, StringSerializer_getInstance(), tmp23_local19);
+            tmp23_local19 = tmp26_input.bm(tmp0_desc, 19, StringSerializer_getInstance(), tmp23_local19);
             tmp3_bitMask0 = tmp3_bitMask0 | 524288;
             break;
           case 20:
-            tmp24_local20 = tmp26_input.bl(tmp0_desc, 20, tmp27_cached[20].o1(), tmp24_local20);
+            tmp24_local20 = tmp26_input.bm(tmp0_desc, 20, tmp27_cached[20].t1(), tmp24_local20);
             tmp3_bitMask0 = tmp3_bitMask0 | 1048576;
             break;
           case 21:
-            tmp25_local21 = tmp26_input.bl(tmp0_desc, 21, StringSerializer_getInstance(), tmp25_local21);
+            tmp25_local21 = tmp26_input.bm(tmp0_desc, 21, StringSerializer_getInstance(), tmp25_local21);
             tmp3_bitMask0 = tmp3_bitMask0 | 2097152;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp26_input.ok(tmp0_desc);
+    tmp26_input.ol(tmp0_desc);
     return RecipeV2_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, null);
   };
-  protoOf($serializer_1).qh = function () {
-    return this.n1e_1;
+  protoOf($serializer_1).qi = function () {
+    return this.i1f_1;
   };
-  protoOf($serializer_1).yr = function () {
-    var tmp0_cached = Companion_getInstance_1().m1e_1;
+  protoOf($serializer_1).ys = function () {
+    var tmp0_cached = Companion_getInstance_1().h1f_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].o1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[3].o1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[5].o1()), get_nullable(tmp0_cached[6].o1()), get_nullable(StringSerializer_getInstance()), get_nullable(StringSerializer_getInstance()), get_nullable($serializer_getInstance_2()), StringSerializer_getInstance(), get_nullable(tmp0_cached[11].o1()), get_nullable(tmp0_cached[12].o1()), get_nullable(BooleanSerializer_getInstance()), get_nullable(tmp0_cached[14].o1()), get_nullable(tmp0_cached[15].o1()), get_nullable(tmp0_cached[16].o1()), get_nullable(tmp0_cached[17].o1()), get_nullable(tmp0_cached[18].o1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[20].o1()), get_nullable(StringSerializer_getInstance())];
+    return [get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[1].t1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[3].t1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[5].t1()), get_nullable(tmp0_cached[6].t1()), get_nullable(StringSerializer_getInstance()), get_nullable(StringSerializer_getInstance()), get_nullable($serializer_getInstance_2()), StringSerializer_getInstance(), get_nullable(tmp0_cached[11].t1()), get_nullable(tmp0_cached[12].t1()), get_nullable(BooleanSerializer_getInstance()), get_nullable(tmp0_cached[14].t1()), get_nullable(tmp0_cached[15].t1()), get_nullable(tmp0_cached[16].t1()), get_nullable(tmp0_cached[17].t1()), get_nullable(tmp0_cached[18].t1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[20].t1()), get_nullable(StringSerializer_getInstance())];
   };
   var $serializer_instance_1;
   function $serializer_getInstance_1() {
@@ -1061,93 +1067,93 @@
   }
   function RecipeV2_init_$Init$(seen0, bookCredit, byline, canonicalArticle, celebrationIDS, composerID, contributors, cuisineIDS, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIDS, serves, suitableForDietIDS, techniquesUsedIDS, timings, title, utensilsAndApplianceIDS, webPublicationDate, serializationConstructorMarker, $this) {
     if (!(1024 === (1024 & seen0))) {
-      throwMissingFieldException(seen0, 1024, $serializer_getInstance_1().n1e_1);
+      throwMissingFieldException(seen0, 1024, $serializer_getInstance_1().i1f_1);
     }
     if (0 === (seen0 & 1))
-      $this.p1e_1 = null;
+      $this.k1f_1 = null;
     else
-      $this.p1e_1 = bookCredit;
+      $this.k1f_1 = bookCredit;
     if (0 === (seen0 & 2))
-      $this.q1e_1 = null;
+      $this.l1f_1 = null;
     else
-      $this.q1e_1 = byline;
+      $this.l1f_1 = byline;
     if (0 === (seen0 & 4))
-      $this.r1e_1 = null;
+      $this.m1f_1 = null;
     else
-      $this.r1e_1 = canonicalArticle;
+      $this.m1f_1 = canonicalArticle;
     if (0 === (seen0 & 8))
-      $this.s1e_1 = null;
+      $this.n1f_1 = null;
     else
-      $this.s1e_1 = celebrationIDS;
+      $this.n1f_1 = celebrationIDS;
     if (0 === (seen0 & 16))
-      $this.t1e_1 = null;
+      $this.o1f_1 = null;
     else
-      $this.t1e_1 = composerID;
+      $this.o1f_1 = composerID;
     if (0 === (seen0 & 32))
-      $this.u1e_1 = null;
+      $this.p1f_1 = null;
     else
-      $this.u1e_1 = contributors;
+      $this.p1f_1 = contributors;
     if (0 === (seen0 & 64))
-      $this.v1e_1 = null;
+      $this.q1f_1 = null;
     else
-      $this.v1e_1 = cuisineIDS;
+      $this.q1f_1 = cuisineIDS;
     if (0 === (seen0 & 128))
-      $this.w1e_1 = null;
+      $this.r1f_1 = null;
     else
-      $this.w1e_1 = description;
+      $this.r1f_1 = description;
     if (0 === (seen0 & 256))
-      $this.x1e_1 = null;
+      $this.s1f_1 = null;
     else
-      $this.x1e_1 = difficultyLevel;
+      $this.s1f_1 = difficultyLevel;
     if (0 === (seen0 & 512))
-      $this.y1e_1 = null;
+      $this.t1f_1 = null;
     else
-      $this.y1e_1 = featuredImage;
-    $this.z1e_1 = id;
+      $this.t1f_1 = featuredImage;
+    $this.u1f_1 = id;
     if (0 === (seen0 & 2048))
-      $this.a1f_1 = null;
+      $this.v1f_1 = null;
     else
-      $this.a1f_1 = ingredients;
+      $this.v1f_1 = ingredients;
     if (0 === (seen0 & 4096))
-      $this.b1f_1 = null;
+      $this.w1f_1 = null;
     else
-      $this.b1f_1 = instructions;
+      $this.w1f_1 = instructions;
     if (0 === (seen0 & 8192))
-      $this.c1f_1 = null;
+      $this.x1f_1 = null;
     else
-      $this.c1f_1 = isAppReady;
+      $this.x1f_1 = isAppReady;
     if (0 === (seen0 & 16384))
-      $this.d1f_1 = null;
+      $this.y1f_1 = null;
     else
-      $this.d1f_1 = mealTypeIDS;
+      $this.y1f_1 = mealTypeIDS;
     if (0 === (seen0 & 32768))
-      $this.e1f_1 = null;
+      $this.z1f_1 = null;
     else
-      $this.e1f_1 = serves;
+      $this.z1f_1 = serves;
     if (0 === (seen0 & 65536))
-      $this.f1f_1 = null;
+      $this.a1g_1 = null;
     else
-      $this.f1f_1 = suitableForDietIDS;
+      $this.a1g_1 = suitableForDietIDS;
     if (0 === (seen0 & 131072))
-      $this.g1f_1 = null;
+      $this.b1g_1 = null;
     else
-      $this.g1f_1 = techniquesUsedIDS;
+      $this.b1g_1 = techniquesUsedIDS;
     if (0 === (seen0 & 262144))
-      $this.h1f_1 = null;
+      $this.c1g_1 = null;
     else
-      $this.h1f_1 = timings;
+      $this.c1g_1 = timings;
     if (0 === (seen0 & 524288))
-      $this.i1f_1 = null;
+      $this.d1g_1 = null;
     else
-      $this.i1f_1 = title;
+      $this.d1g_1 = title;
     if (0 === (seen0 & 1048576))
-      $this.j1f_1 = null;
+      $this.e1g_1 = null;
     else
-      $this.j1f_1 = utensilsAndApplianceIDS;
+      $this.e1g_1 = utensilsAndApplianceIDS;
     if (0 === (seen0 & 2097152))
-      $this.k1f_1 = null;
+      $this.f1g_1 = null;
     else
-      $this.k1f_1 = webPublicationDate;
+      $this.f1g_1 = webPublicationDate;
     return $this;
   }
   function RecipeV2_init_$Create$(seen0, bookCredit, byline, canonicalArticle, celebrationIDS, composerID, contributors, cuisineIDS, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIDS, serves, suitableForDietIDS, techniquesUsedIDS, timings, title, utensilsAndApplianceIDS, webPublicationDate, serializationConstructorMarker) {
@@ -1176,55 +1182,55 @@
     title = title === VOID ? null : title;
     utensilsAndApplianceIDS = utensilsAndApplianceIDS === VOID ? null : utensilsAndApplianceIDS;
     webPublicationDate = webPublicationDate === VOID ? null : webPublicationDate;
-    this.p1e_1 = bookCredit;
-    this.q1e_1 = byline;
-    this.r1e_1 = canonicalArticle;
-    this.s1e_1 = celebrationIDS;
-    this.t1e_1 = composerID;
-    this.u1e_1 = contributors;
-    this.v1e_1 = cuisineIDS;
-    this.w1e_1 = description;
-    this.x1e_1 = difficultyLevel;
-    this.y1e_1 = featuredImage;
-    this.z1e_1 = id;
-    this.a1f_1 = ingredients;
-    this.b1f_1 = instructions;
-    this.c1f_1 = isAppReady;
-    this.d1f_1 = mealTypeIDS;
-    this.e1f_1 = serves;
-    this.f1f_1 = suitableForDietIDS;
-    this.g1f_1 = techniquesUsedIDS;
-    this.h1f_1 = timings;
-    this.i1f_1 = title;
-    this.j1f_1 = utensilsAndApplianceIDS;
-    this.k1f_1 = webPublicationDate;
+    this.k1f_1 = bookCredit;
+    this.l1f_1 = byline;
+    this.m1f_1 = canonicalArticle;
+    this.n1f_1 = celebrationIDS;
+    this.o1f_1 = composerID;
+    this.p1f_1 = contributors;
+    this.q1f_1 = cuisineIDS;
+    this.r1f_1 = description;
+    this.s1f_1 = difficultyLevel;
+    this.t1f_1 = featuredImage;
+    this.u1f_1 = id;
+    this.v1f_1 = ingredients;
+    this.w1f_1 = instructions;
+    this.x1f_1 = isAppReady;
+    this.y1f_1 = mealTypeIDS;
+    this.z1f_1 = serves;
+    this.a1g_1 = suitableForDietIDS;
+    this.b1g_1 = techniquesUsedIDS;
+    this.c1g_1 = timings;
+    this.d1g_1 = title;
+    this.e1g_1 = utensilsAndApplianceIDS;
+    this.f1g_1 = webPublicationDate;
   }
   protoOf(RecipeV2).toString = function () {
-    return 'RecipeV2(bookCredit=' + this.p1e_1 + ', byline=' + toString(this.q1e_1) + ', canonicalArticle=' + this.r1e_1 + ', celebrationIDS=' + toString(this.s1e_1) + ', composerID=' + this.t1e_1 + ', contributors=' + toString(this.u1e_1) + ', cuisineIDS=' + toString(this.v1e_1) + ', description=' + this.w1e_1 + ', difficultyLevel=' + this.x1e_1 + ', featuredImage=' + toString(this.y1e_1) + ', id=' + this.z1e_1 + ', ingredients=' + toString(this.a1f_1) + ', instructions=' + toString(this.b1f_1) + ', isAppReady=' + this.c1f_1 + ', mealTypeIDS=' + toString(this.d1f_1) + ', serves=' + toString(this.e1f_1) + ', suitableForDietIDS=' + toString(this.f1f_1) + ', techniquesUsedIDS=' + toString(this.g1f_1) + ', timings=' + toString(this.h1f_1) + ', title=' + this.i1f_1 + ', utensilsAndApplianceIDS=' + toString(this.j1f_1) + ', webPublicationDate=' + this.k1f_1 + ')';
+    return 'RecipeV2(bookCredit=' + this.k1f_1 + ', byline=' + toString(this.l1f_1) + ', canonicalArticle=' + this.m1f_1 + ', celebrationIDS=' + toString(this.n1f_1) + ', composerID=' + this.o1f_1 + ', contributors=' + toString(this.p1f_1) + ', cuisineIDS=' + toString(this.q1f_1) + ', description=' + this.r1f_1 + ', difficultyLevel=' + this.s1f_1 + ', featuredImage=' + toString(this.t1f_1) + ', id=' + this.u1f_1 + ', ingredients=' + toString(this.v1f_1) + ', instructions=' + toString(this.w1f_1) + ', isAppReady=' + this.x1f_1 + ', mealTypeIDS=' + toString(this.y1f_1) + ', serves=' + toString(this.z1f_1) + ', suitableForDietIDS=' + toString(this.a1g_1) + ', techniquesUsedIDS=' + toString(this.b1g_1) + ', timings=' + toString(this.c1g_1) + ', title=' + this.d1g_1 + ', utensilsAndApplianceIDS=' + toString(this.e1g_1) + ', webPublicationDate=' + this.f1g_1 + ')';
   };
   protoOf(RecipeV2).hashCode = function () {
-    var result = this.p1e_1 == null ? 0 : getStringHashCode(this.p1e_1);
-    result = imul(result, 31) + (this.q1e_1 == null ? 0 : hashCode(this.q1e_1)) | 0;
-    result = imul(result, 31) + (this.r1e_1 == null ? 0 : getStringHashCode(this.r1e_1)) | 0;
-    result = imul(result, 31) + (this.s1e_1 == null ? 0 : hashCode(this.s1e_1)) | 0;
-    result = imul(result, 31) + (this.t1e_1 == null ? 0 : getStringHashCode(this.t1e_1)) | 0;
-    result = imul(result, 31) + (this.u1e_1 == null ? 0 : hashCode(this.u1e_1)) | 0;
-    result = imul(result, 31) + (this.v1e_1 == null ? 0 : hashCode(this.v1e_1)) | 0;
-    result = imul(result, 31) + (this.w1e_1 == null ? 0 : getStringHashCode(this.w1e_1)) | 0;
-    result = imul(result, 31) + (this.x1e_1 == null ? 0 : getStringHashCode(this.x1e_1)) | 0;
-    result = imul(result, 31) + (this.y1e_1 == null ? 0 : this.y1e_1.hashCode()) | 0;
-    result = imul(result, 31) + getStringHashCode(this.z1e_1) | 0;
-    result = imul(result, 31) + (this.a1f_1 == null ? 0 : hashCode(this.a1f_1)) | 0;
-    result = imul(result, 31) + (this.b1f_1 == null ? 0 : hashCode(this.b1f_1)) | 0;
-    result = imul(result, 31) + (this.c1f_1 == null ? 0 : getBooleanHashCode(this.c1f_1)) | 0;
-    result = imul(result, 31) + (this.d1f_1 == null ? 0 : hashCode(this.d1f_1)) | 0;
-    result = imul(result, 31) + (this.e1f_1 == null ? 0 : hashCode(this.e1f_1)) | 0;
-    result = imul(result, 31) + (this.f1f_1 == null ? 0 : hashCode(this.f1f_1)) | 0;
-    result = imul(result, 31) + (this.g1f_1 == null ? 0 : hashCode(this.g1f_1)) | 0;
-    result = imul(result, 31) + (this.h1f_1 == null ? 0 : hashCode(this.h1f_1)) | 0;
-    result = imul(result, 31) + (this.i1f_1 == null ? 0 : getStringHashCode(this.i1f_1)) | 0;
-    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;
+    var result = this.k1f_1 == null ? 0 : getStringHashCode(this.k1f_1);
+    result = imul(result, 31) + (this.l1f_1 == null ? 0 : hashCode(this.l1f_1)) | 0;
+    result = imul(result, 31) + (this.m1f_1 == null ? 0 : getStringHashCode(this.m1f_1)) | 0;
+    result = imul(result, 31) + (this.n1f_1 == null ? 0 : hashCode(this.n1f_1)) | 0;
+    result = imul(result, 31) + (this.o1f_1 == null ? 0 : getStringHashCode(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 : hashCode(this.q1f_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 : getStringHashCode(this.s1f_1)) | 0;
+    result = imul(result, 31) + (this.t1f_1 == null ? 0 : this.t1f_1.hashCode()) | 0;
+    result = imul(result, 31) + getStringHashCode(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 : hashCode(this.w1f_1)) | 0;
+    result = imul(result, 31) + (this.x1f_1 == null ? 0 : getBooleanHashCode(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 : 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.d1g_1 == null ? 0 : getStringHashCode(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;
     return result;
   };
   protoOf(RecipeV2).equals = function (other) {
@@ -1232,93 +1238,93 @@
       return true;
     if (!(other instanceof RecipeV2))
       return false;
-    if (!(this.p1e_1 == other.p1e_1))
+    if (!(this.k1f_1 == other.k1f_1))
       return false;
-    if (!equals(this.q1e_1, other.q1e_1))
+    if (!equals(this.l1f_1, other.l1f_1))
       return false;
-    if (!(this.r1e_1 == other.r1e_1))
+    if (!(this.m1f_1 == other.m1f_1))
       return false;
-    if (!equals(this.s1e_1, other.s1e_1))
+    if (!equals(this.n1f_1, other.n1f_1))
       return false;
-    if (!(this.t1e_1 == other.t1e_1))
+    if (!(this.o1f_1 == other.o1f_1))
       return false;
-    if (!equals(this.u1e_1, other.u1e_1))
+    if (!equals(this.p1f_1, other.p1f_1))
       return false;
-    if (!equals(this.v1e_1, other.v1e_1))
+    if (!equals(this.q1f_1, other.q1f_1))
       return false;
-    if (!(this.w1e_1 == other.w1e_1))
+    if (!(this.r1f_1 == other.r1f_1))
       return false;
-    if (!(this.x1e_1 == other.x1e_1))
+    if (!(this.s1f_1 == other.s1f_1))
       return false;
-    if (!equals(this.y1e_1, other.y1e_1))
+    if (!equals(this.t1f_1, other.t1f_1))
       return false;
-    if (!(this.z1e_1 === other.z1e_1))
+    if (!(this.u1f_1 === other.u1f_1))
       return false;
-    if (!equals(this.a1f_1, other.a1f_1))
+    if (!equals(this.v1f_1, other.v1f_1))
       return false;
-    if (!equals(this.b1f_1, other.b1f_1))
+    if (!equals(this.w1f_1, other.w1f_1))
       return false;
-    if (!(this.c1f_1 == other.c1f_1))
+    if (!(this.x1f_1 == other.x1f_1))
       return false;
-    if (!equals(this.d1f_1, other.d1f_1))
+    if (!equals(this.y1f_1, other.y1f_1))
       return false;
-    if (!equals(this.e1f_1, other.e1f_1))
+    if (!equals(this.z1f_1, other.z1f_1))
       return false;
-    if (!equals(this.f1f_1, other.f1f_1))
+    if (!equals(this.a1g_1, other.a1g_1))
       return false;
-    if (!equals(this.g1f_1, other.g1f_1))
+    if (!equals(this.b1g_1, other.b1g_1))
       return false;
-    if (!equals(this.h1f_1, other.h1f_1))
+    if (!equals(this.c1g_1, other.c1g_1))
       return false;
-    if (!(this.i1f_1 == other.i1f_1))
+    if (!(this.d1g_1 == other.d1g_1))
       return false;
-    if (!equals(this.j1f_1, other.j1f_1))
+    if (!equals(this.e1g_1, other.e1g_1))
       return false;
-    if (!(this.k1f_1 == other.k1f_1))
+    if (!(this.f1g_1 == other.f1g_1))
       return false;
     return true;
   };
   function $serializer_2() {
     $serializer_instance_2 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.ImageClass', this, 8);
-    tmp0_serialDesc.wr('caption', true);
-    tmp0_serialDesc.wr('cropId', false);
-    tmp0_serialDesc.wr('imageType', true);
-    tmp0_serialDesc.wr('mediaApiUrl', true);
-    tmp0_serialDesc.wr('mediaId', false);
-    tmp0_serialDesc.wr('photographer', true);
-    tmp0_serialDesc.wr('source', true);
-    tmp0_serialDesc.wr('url', false);
-    this.l1f_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_2).m1f = function (encoder, value) {
-    var tmp0_desc = this.l1f_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.n1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, StringSerializer_getInstance(), value.n1f_1);
-    }
-    tmp1_output.bm(tmp0_desc, 1, value.o1f_1);
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.p1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, StringSerializer_getInstance(), value.p1f_1);
-    }
-    if (tmp1_output.jm(tmp0_desc, 3) ? true : !(value.q1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 3, StringSerializer_getInstance(), value.q1f_1);
-    }
-    tmp1_output.bm(tmp0_desc, 4, value.r1f_1);
-    if (tmp1_output.jm(tmp0_desc, 5) ? true : !(value.s1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 5, StringSerializer_getInstance(), value.s1f_1);
-    }
-    if (tmp1_output.jm(tmp0_desc, 6) ? true : !(value.t1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 6, StringSerializer_getInstance(), value.t1f_1);
-    }
-    tmp1_output.bm(tmp0_desc, 7, value.u1f_1);
-    tmp1_output.ok(tmp0_desc);
-  };
-  protoOf($serializer_2).rh = function (encoder, value) {
-    return this.m1f(encoder, value instanceof ImageClass ? value : THROW_CCE());
-  };
-  protoOf($serializer_2).sh = function (decoder) {
-    var tmp0_desc = this.l1f_1;
+    tmp0_serialDesc.ws('caption', true);
+    tmp0_serialDesc.ws('cropId', false);
+    tmp0_serialDesc.ws('imageType', true);
+    tmp0_serialDesc.ws('mediaApiUrl', true);
+    tmp0_serialDesc.ws('mediaId', false);
+    tmp0_serialDesc.ws('photographer', true);
+    tmp0_serialDesc.ws('source', true);
+    tmp0_serialDesc.ws('url', false);
+    this.g1g_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_2).h1g = function (encoder, value) {
+    var tmp0_desc = this.g1g_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.i1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, StringSerializer_getInstance(), value.i1g_1);
+    }
+    tmp1_output.bn(tmp0_desc, 1, value.j1g_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.k1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.k1g_1);
+    }
+    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.l1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 3, StringSerializer_getInstance(), value.l1g_1);
+    }
+    tmp1_output.bn(tmp0_desc, 4, value.m1g_1);
+    if (tmp1_output.jn(tmp0_desc, 5) ? true : !(value.n1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 5, StringSerializer_getInstance(), value.n1g_1);
+    }
+    if (tmp1_output.jn(tmp0_desc, 6) ? true : !(value.o1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 6, StringSerializer_getInstance(), value.o1g_1);
+    }
+    tmp1_output.bn(tmp0_desc, 7, value.p1g_1);
+    tmp1_output.ol(tmp0_desc);
+  };
+  protoOf($serializer_2).ri = function (encoder, value) {
+    return this.h1g(encoder, value instanceof ImageClass ? value : THROW_CCE());
+  };
+  protoOf($serializer_2).si = function (decoder) {
+    var tmp0_desc = this.g1g_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -1330,74 +1336,74 @@
     var tmp9_local5 = null;
     var tmp10_local6 = null;
     var tmp11_local7 = null;
-    var tmp12_input = decoder.nk(tmp0_desc);
-    if (tmp12_input.dl()) {
-      tmp4_local0 = tmp12_input.bl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+    var tmp12_input = decoder.nl(tmp0_desc);
+    if (tmp12_input.dm()) {
+      tmp4_local0 = tmp12_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp12_input.xk(tmp0_desc, 1);
+      tmp5_local1 = tmp12_input.xl(tmp0_desc, 1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp12_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp12_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp12_input.bl(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp12_input.bm(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp12_input.xk(tmp0_desc, 4);
+      tmp8_local4 = tmp12_input.xl(tmp0_desc, 4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp12_input.bl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp12_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp12_input.bl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+      tmp10_local6 = tmp12_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp12_input.xk(tmp0_desc, 7);
+      tmp11_local7 = tmp12_input.xl(tmp0_desc, 7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp12_input.el(tmp0_desc);
+        tmp2_index = tmp12_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp12_input.bl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp12_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp12_input.xk(tmp0_desc, 1);
+            tmp5_local1 = tmp12_input.xl(tmp0_desc, 1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp12_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp12_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp12_input.bl(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp12_input.bm(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp12_input.xk(tmp0_desc, 4);
+            tmp8_local4 = tmp12_input.xl(tmp0_desc, 4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp12_input.bl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp12_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp12_input.bl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+            tmp10_local6 = tmp12_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp12_input.xk(tmp0_desc, 7);
+            tmp11_local7 = tmp12_input.xl(tmp0_desc, 7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp12_input.ok(tmp0_desc);
+    tmp12_input.ol(tmp0_desc);
     return ImageClass_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, null);
   };
-  protoOf($serializer_2).qh = function () {
-    return this.l1f_1;
+  protoOf($serializer_2).qi = function () {
+    return this.g1g_1;
   };
-  protoOf($serializer_2).yr = function () {
+  protoOf($serializer_2).ys = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1411,31 +1417,31 @@
   }
   function ImageClass_init_$Init$(seen0, caption, cropID, imageType, mediaAPIURL, mediaID, photographer, source, url, serializationConstructorMarker, $this) {
     if (!(146 === (146 & seen0))) {
-      throwMissingFieldException(seen0, 146, $serializer_getInstance_2().l1f_1);
+      throwMissingFieldException(seen0, 146, $serializer_getInstance_2().g1g_1);
     }
     if (0 === (seen0 & 1))
-      $this.n1f_1 = null;
+      $this.i1g_1 = null;
     else
-      $this.n1f_1 = caption;
-    $this.o1f_1 = cropID;
+      $this.i1g_1 = caption;
+    $this.j1g_1 = cropID;
     if (0 === (seen0 & 4))
-      $this.p1f_1 = null;
+      $this.k1g_1 = null;
     else
-      $this.p1f_1 = imageType;
+      $this.k1g_1 = imageType;
     if (0 === (seen0 & 8))
-      $this.q1f_1 = null;
+      $this.l1g_1 = null;
     else
-      $this.q1f_1 = mediaAPIURL;
-    $this.r1f_1 = mediaID;
+      $this.l1g_1 = mediaAPIURL;
+    $this.m1g_1 = mediaID;
     if (0 === (seen0 & 32))
-      $this.s1f_1 = null;
+      $this.n1g_1 = null;
     else
-      $this.s1f_1 = photographer;
+      $this.n1g_1 = photographer;
     if (0 === (seen0 & 64))
-      $this.t1f_1 = null;
+      $this.o1g_1 = null;
     else
-      $this.t1f_1 = source;
-    $this.u1f_1 = url;
+      $this.o1g_1 = source;
+    $this.p1g_1 = url;
     return $this;
   }
   function ImageClass_init_$Create$(seen0, caption, cropID, imageType, mediaAPIURL, mediaID, photographer, source, url, serializationConstructorMarker) {
@@ -1444,17 +1450,17 @@
   function ImageClass() {
   }
   protoOf(ImageClass).toString = function () {
-    return 'ImageClass(caption=' + this.n1f_1 + ', cropID=' + this.o1f_1 + ', imageType=' + this.p1f_1 + ', mediaAPIURL=' + this.q1f_1 + ', mediaID=' + this.r1f_1 + ', photographer=' + this.s1f_1 + ', source=' + this.t1f_1 + ', url=' + this.u1f_1 + ')';
+    return 'ImageClass(caption=' + this.i1g_1 + ', cropID=' + this.j1g_1 + ', imageType=' + this.k1g_1 + ', mediaAPIURL=' + this.l1g_1 + ', mediaID=' + this.m1g_1 + ', photographer=' + this.n1g_1 + ', source=' + this.o1g_1 + ', url=' + this.p1g_1 + ')';
   };
   protoOf(ImageClass).hashCode = function () {
-    var result = this.n1f_1 == null ? 0 : getStringHashCode(this.n1f_1);
-    result = imul(result, 31) + getStringHashCode(this.o1f_1) | 0;
-    result = imul(result, 31) + (this.p1f_1 == null ? 0 : getStringHashCode(this.p1f_1)) | 0;
-    result = imul(result, 31) + (this.q1f_1 == null ? 0 : getStringHashCode(this.q1f_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.r1f_1) | 0;
-    result = imul(result, 31) + (this.s1f_1 == null ? 0 : getStringHashCode(this.s1f_1)) | 0;
-    result = imul(result, 31) + (this.t1f_1 == null ? 0 : getStringHashCode(this.t1f_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.u1f_1) | 0;
+    var result = this.i1g_1 == null ? 0 : getStringHashCode(this.i1g_1);
+    result = imul(result, 31) + getStringHashCode(this.j1g_1) | 0;
+    result = imul(result, 31) + (this.k1g_1 == null ? 0 : getStringHashCode(this.k1g_1)) | 0;
+    result = imul(result, 31) + (this.l1g_1 == null ? 0 : getStringHashCode(this.l1g_1)) | 0;
+    result = imul(result, 31) + getStringHashCode(this.m1g_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) + getStringHashCode(this.p1g_1) | 0;
     return result;
   };
   protoOf(ImageClass).equals = function (other) {
@@ -1462,21 +1468,21 @@
       return true;
     if (!(other instanceof ImageClass))
       return false;
-    if (!(this.n1f_1 == other.n1f_1))
+    if (!(this.i1g_1 == other.i1g_1))
       return false;
-    if (!(this.o1f_1 === other.o1f_1))
+    if (!(this.j1g_1 === other.j1g_1))
       return false;
-    if (!(this.p1f_1 == other.p1f_1))
+    if (!(this.k1g_1 == other.k1g_1))
       return false;
-    if (!(this.q1f_1 == other.q1f_1))
+    if (!(this.l1g_1 == other.l1g_1))
       return false;
-    if (!(this.r1f_1 === other.r1f_1))
+    if (!(this.m1g_1 === other.m1g_1))
       return false;
-    if (!(this.s1f_1 == other.s1f_1))
+    if (!(this.n1g_1 == other.n1g_1))
       return false;
-    if (!(this.t1f_1 == other.t1f_1))
+    if (!(this.o1g_1 == other.o1g_1))
       return false;
-    if (!(this.u1f_1 === other.u1f_1))
+    if (!(this.p1g_1 === other.p1g_1))
       return false;
     return true;
   };
@@ -1490,7 +1496,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.v1f_1 = [lazy(tmp_0, IngredientElement$Companion$$childSerializers$_anonymous__4w7loh), null];
+    tmp.q1g_1 = [lazy(tmp_0, IngredientElement$Companion$$childSerializers$_anonymous__4w7loh), null];
   }
   var Companion_instance_2;
   function Companion_getInstance_2() {
@@ -1501,70 +1507,70 @@
   function $serializer_3() {
     $serializer_instance_3 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.IngredientElement', this, 2);
-    tmp0_serialDesc.wr('ingredientsList', true);
-    tmp0_serialDesc.wr('recipeSection', true);
-    this.w1f_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('ingredientsList', true);
+    tmp0_serialDesc.ws('recipeSection', true);
+    this.r1g_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_3).x1f = function (encoder, value) {
-    var tmp0_desc = this.w1f_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_2().v1f_1;
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.y1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, tmp2_cached[0].o1(), value.y1f_1);
+  protoOf($serializer_3).s1g = function (encoder, value) {
+    var tmp0_desc = this.r1g_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_2().q1g_1;
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.t1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, tmp2_cached[0].t1(), value.t1g_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.z1f_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, StringSerializer_getInstance(), value.z1f_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.u1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.u1g_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_3).rh = function (encoder, value) {
-    return this.x1f(encoder, value instanceof IngredientElement ? value : THROW_CCE());
+  protoOf($serializer_3).ri = function (encoder, value) {
+    return this.s1g(encoder, value instanceof IngredientElement ? value : THROW_CCE());
   };
-  protoOf($serializer_3).sh = function (decoder) {
-    var tmp0_desc = this.w1f_1;
+  protoOf($serializer_3).si = function (decoder) {
+    var tmp0_desc = this.r1g_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.nk(tmp0_desc);
-    var tmp7_cached = Companion_getInstance_2().v1f_1;
-    if (tmp6_input.dl()) {
-      tmp4_local0 = tmp6_input.bl(tmp0_desc, 0, tmp7_cached[0].o1(), tmp4_local0);
+    var tmp6_input = decoder.nl(tmp0_desc);
+    var tmp7_cached = Companion_getInstance_2().q1g_1;
+    if (tmp6_input.dm()) {
+      tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, tmp7_cached[0].t1(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp6_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp6_input.el(tmp0_desc);
+        tmp2_index = tmp6_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp6_input.bl(tmp0_desc, 0, tmp7_cached[0].o1(), tmp4_local0);
+            tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, tmp7_cached[0].t1(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp6_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp6_input.ok(tmp0_desc);
+    tmp6_input.ol(tmp0_desc);
     return IngredientElement_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
   };
-  protoOf($serializer_3).qh = function () {
-    return this.w1f_1;
+  protoOf($serializer_3).qi = function () {
+    return this.r1g_1;
   };
-  protoOf($serializer_3).yr = function () {
-    var tmp0_cached = Companion_getInstance_2().v1f_1;
+  protoOf($serializer_3).ys = function () {
+    var tmp0_cached = Companion_getInstance_2().q1g_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    return [get_nullable(tmp0_cached[0].o1()), get_nullable(StringSerializer_getInstance())];
+    return [get_nullable(tmp0_cached[0].t1()), get_nullable(StringSerializer_getInstance())];
   };
   var $serializer_instance_3;
   function $serializer_getInstance_3() {
@@ -1574,16 +1580,16 @@
   }
   function IngredientElement_init_$Init$(seen0, ingredientsList, recipeSection, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_3().w1f_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_3().r1g_1);
     }
     if (0 === (seen0 & 1))
-      $this.y1f_1 = null;
+      $this.t1g_1 = null;
     else
-      $this.y1f_1 = ingredientsList;
+      $this.t1g_1 = ingredientsList;
     if (0 === (seen0 & 2))
-      $this.z1f_1 = null;
+      $this.u1g_1 = null;
     else
-      $this.z1f_1 = recipeSection;
+      $this.u1g_1 = recipeSection;
     return $this;
   }
   function IngredientElement_init_$Create$(seen0, ingredientsList, recipeSection, serializationConstructorMarker) {
@@ -1593,15 +1599,15 @@
     Companion_getInstance_2();
     ingredientsList = ingredientsList === VOID ? null : ingredientsList;
     recipeSection = recipeSection === VOID ? null : recipeSection;
-    this.y1f_1 = ingredientsList;
-    this.z1f_1 = recipeSection;
+    this.t1g_1 = ingredientsList;
+    this.u1g_1 = recipeSection;
   }
   protoOf(IngredientElement).toString = function () {
-    return 'IngredientElement(ingredientsList=' + toString(this.y1f_1) + ', recipeSection=' + this.z1f_1 + ')';
+    return 'IngredientElement(ingredientsList=' + toString(this.t1g_1) + ', recipeSection=' + this.u1g_1 + ')';
   };
   protoOf(IngredientElement).hashCode = function () {
-    var result = this.y1f_1 == null ? 0 : hashCode(this.y1f_1);
-    result = imul(result, 31) + (this.z1f_1 == null ? 0 : getStringHashCode(this.z1f_1)) | 0;
+    var result = this.t1g_1 == null ? 0 : hashCode(this.t1g_1);
+    result = imul(result, 31) + (this.u1g_1 == null ? 0 : getStringHashCode(this.u1g_1)) | 0;
     return result;
   };
   protoOf(IngredientElement).equals = function (other) {
@@ -1609,9 +1615,9 @@
       return true;
     if (!(other instanceof IngredientElement))
       return false;
-    if (!equals(this.y1f_1, other.y1f_1))
+    if (!equals(this.t1g_1, other.t1g_1))
       return false;
-    if (!(this.z1f_1 == other.z1f_1))
+    if (!(this.u1g_1 == other.u1g_1))
       return false;
     return true;
   };
@@ -1625,7 +1631,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.a1g_1 = [null, lazy(tmp_0, InstructionElement$Companion$$childSerializers$_anonymous__fr382k), null];
+    tmp.v1g_1 = [null, lazy(tmp_0, InstructionElement$Companion$$childSerializers$_anonymous__fr382k), null];
   }
   var Companion_instance_3;
   function Companion_getInstance_3() {
@@ -1636,79 +1642,79 @@
   function $serializer_4() {
     $serializer_instance_4 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.InstructionElement', this, 3);
-    tmp0_serialDesc.wr('description', false);
-    tmp0_serialDesc.wr('images', true);
-    tmp0_serialDesc.wr('stepNumber', true);
-    this.b1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('description', false);
+    tmp0_serialDesc.ws('images', true);
+    tmp0_serialDesc.ws('stepNumber', true);
+    this.w1g_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_4).c1g = function (encoder, value) {
-    var tmp0_desc = this.b1g_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_3().a1g_1;
-    tmp1_output.bm(tmp0_desc, 0, value.d1g_1);
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.e1g_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, tmp2_cached[1].o1(), value.e1g_1);
+  protoOf($serializer_4).x1g = function (encoder, value) {
+    var tmp0_desc = this.w1g_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_3().v1g_1;
+    tmp1_output.bn(tmp0_desc, 0, value.y1g_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.z1g_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, tmp2_cached[1].t1(), value.z1g_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.f1g_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, DoubleSerializer_getInstance(), value.f1g_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.a1h_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 2, DoubleSerializer_getInstance(), value.a1h_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_4).rh = function (encoder, value) {
-    return this.c1g(encoder, value instanceof InstructionElement ? value : THROW_CCE());
+  protoOf($serializer_4).ri = function (encoder, value) {
+    return this.x1g(encoder, value instanceof InstructionElement ? value : THROW_CCE());
   };
-  protoOf($serializer_4).sh = function (decoder) {
-    var tmp0_desc = this.b1g_1;
+  protoOf($serializer_4).si = function (decoder) {
+    var tmp0_desc = this.w1g_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.nk(tmp0_desc);
-    var tmp8_cached = Companion_getInstance_3().a1g_1;
-    if (tmp7_input.dl()) {
-      tmp4_local0 = tmp7_input.xk(tmp0_desc, 0);
+    var tmp7_input = decoder.nl(tmp0_desc);
+    var tmp8_cached = Companion_getInstance_3().v1g_1;
+    if (tmp7_input.dm()) {
+      tmp4_local0 = tmp7_input.xl(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.bl(tmp0_desc, 1, tmp8_cached[1].o1(), tmp5_local1);
+      tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, tmp8_cached[1].t1(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.bl(tmp0_desc, 2, DoubleSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp7_input.bm(tmp0_desc, 2, DoubleSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.el(tmp0_desc);
+        tmp2_index = tmp7_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.xk(tmp0_desc, 0);
+            tmp4_local0 = tmp7_input.xl(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.bl(tmp0_desc, 1, tmp8_cached[1].o1(), tmp5_local1);
+            tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, tmp8_cached[1].t1(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.bl(tmp0_desc, 2, DoubleSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp7_input.bm(tmp0_desc, 2, DoubleSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.ok(tmp0_desc);
+    tmp7_input.ol(tmp0_desc);
     return InstructionElement_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_4).qh = function () {
-    return this.b1g_1;
+  protoOf($serializer_4).qi = function () {
+    return this.w1g_1;
   };
-  protoOf($serializer_4).yr = function () {
-    var tmp0_cached = Companion_getInstance_3().a1g_1;
+  protoOf($serializer_4).ys = function () {
+    var tmp0_cached = Companion_getInstance_3().v1g_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    return [StringSerializer_getInstance(), get_nullable(tmp0_cached[1].o1()), get_nullable(DoubleSerializer_getInstance())];
+    return [StringSerializer_getInstance(), get_nullable(tmp0_cached[1].t1()), get_nullable(DoubleSerializer_getInstance())];
   };
   var $serializer_instance_4;
   function $serializer_getInstance_4() {
@@ -1718,17 +1724,17 @@
   }
   function InstructionElement_init_$Init$(seen0, description, images, stepNumber, serializationConstructorMarker, $this) {
     if (!(1 === (1 & seen0))) {
-      throwMissingFieldException(seen0, 1, $serializer_getInstance_4().b1g_1);
+      throwMissingFieldException(seen0, 1, $serializer_getInstance_4().w1g_1);
     }
-    $this.d1g_1 = description;
+    $this.y1g_1 = description;
     if (0 === (seen0 & 2))
-      $this.e1g_1 = null;
+      $this.z1g_1 = null;
     else
-      $this.e1g_1 = images;
+      $this.z1g_1 = images;
     if (0 === (seen0 & 4))
-      $this.f1g_1 = null;
+      $this.a1h_1 = null;
     else
-      $this.f1g_1 = stepNumber;
+      $this.a1h_1 = stepNumber;
     return $this;
   }
   function InstructionElement_init_$Create$(seen0, description, images, stepNumber, serializationConstructorMarker) {
@@ -1738,17 +1744,17 @@
     Companion_getInstance_3();
     images = images === VOID ? null : images;
     stepNumber = stepNumber === VOID ? null : stepNumber;
-    this.d1g_1 = description;
-    this.e1g_1 = images;
-    this.f1g_1 = stepNumber;
+    this.y1g_1 = description;
+    this.z1g_1 = images;
+    this.a1h_1 = stepNumber;
   }
   protoOf(InstructionElement).toString = function () {
-    return 'InstructionElement(description=' + this.d1g_1 + ', images=' + toString(this.e1g_1) + ', stepNumber=' + this.f1g_1 + ')';
+    return 'InstructionElement(description=' + this.y1g_1 + ', images=' + toString(this.z1g_1) + ', stepNumber=' + this.a1h_1 + ')';
   };
   protoOf(InstructionElement).hashCode = function () {
-    var result = getStringHashCode(this.d1g_1);
-    result = imul(result, 31) + (this.e1g_1 == null ? 0 : hashCode(this.e1g_1)) | 0;
-    result = imul(result, 31) + (this.f1g_1 == null ? 0 : getNumberHashCode(this.f1g_1)) | 0;
+    var result = getStringHashCode(this.y1g_1);
+    result = imul(result, 31) + (this.z1g_1 == null ? 0 : hashCode(this.z1g_1)) | 0;
+    result = imul(result, 31) + (this.a1h_1 == null ? 0 : getNumberHashCode(this.a1h_1)) | 0;
     return result;
   };
   protoOf(InstructionElement).equals = function (other) {
@@ -1756,83 +1762,83 @@
       return true;
     if (!(other instanceof InstructionElement))
       return false;
-    if (!(this.d1g_1 === other.d1g_1))
+    if (!(this.y1g_1 === other.y1g_1))
       return false;
-    if (!equals(this.e1g_1, other.e1g_1))
+    if (!equals(this.z1g_1, other.z1g_1))
       return false;
-    if (!equals(this.f1g_1, other.f1g_1))
+    if (!equals(this.a1h_1, other.a1h_1))
       return false;
     return true;
   };
   function $serializer_5() {
     $serializer_instance_5 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.ServeElement', this, 3);
-    tmp0_serialDesc.wr('amount', true);
-    tmp0_serialDesc.wr('text', true);
-    tmp0_serialDesc.wr('unit', false);
-    this.g1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('amount', true);
+    tmp0_serialDesc.ws('text', true);
+    tmp0_serialDesc.ws('unit', false);
+    this.b1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_5).h1g = function (encoder, value) {
-    var tmp0_desc = this.g1g_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.i1g_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, $serializer_getInstance(), value.i1g_1);
+  protoOf($serializer_5).c1h = function (encoder, value) {
+    var tmp0_desc = this.b1h_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.d1h_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, $serializer_getInstance(), value.d1h_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.j1g_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, StringSerializer_getInstance(), value.j1g_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.e1h_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.e1h_1);
     }
-    tmp1_output.bm(tmp0_desc, 2, value.k1g_1);
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.bn(tmp0_desc, 2, value.f1h_1);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_5).rh = function (encoder, value) {
-    return this.h1g(encoder, value instanceof ServeElement ? value : THROW_CCE());
+  protoOf($serializer_5).ri = function (encoder, value) {
+    return this.c1h(encoder, value instanceof ServeElement ? value : THROW_CCE());
   };
-  protoOf($serializer_5).sh = function (decoder) {
-    var tmp0_desc = this.g1g_1;
+  protoOf($serializer_5).si = function (decoder) {
+    var tmp0_desc = this.b1h_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.nk(tmp0_desc);
-    if (tmp7_input.dl()) {
-      tmp4_local0 = tmp7_input.bl(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
+    var tmp7_input = decoder.nl(tmp0_desc);
+    if (tmp7_input.dm()) {
+      tmp4_local0 = tmp7_input.bm(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.xk(tmp0_desc, 2);
+      tmp6_local2 = tmp7_input.xl(tmp0_desc, 2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.el(tmp0_desc);
+        tmp2_index = tmp7_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.bl(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp7_input.bm(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.xk(tmp0_desc, 2);
+            tmp6_local2 = tmp7_input.xl(tmp0_desc, 2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.ok(tmp0_desc);
+    tmp7_input.ol(tmp0_desc);
     return ServeElement_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_5).qh = function () {
-    return this.g1g_1;
+  protoOf($serializer_5).qi = function () {
+    return this.b1h_1;
   };
-  protoOf($serializer_5).yr = function () {
+  protoOf($serializer_5).ys = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1846,17 +1852,17 @@
   }
   function ServeElement_init_$Init$(seen0, amount, text, unit, serializationConstructorMarker, $this) {
     if (!(4 === (4 & seen0))) {
-      throwMissingFieldException(seen0, 4, $serializer_getInstance_5().g1g_1);
+      throwMissingFieldException(seen0, 4, $serializer_getInstance_5().b1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.i1g_1 = null;
+      $this.d1h_1 = null;
     else
-      $this.i1g_1 = amount;
+      $this.d1h_1 = amount;
     if (0 === (seen0 & 2))
-      $this.j1g_1 = null;
+      $this.e1h_1 = null;
     else
-      $this.j1g_1 = text;
-    $this.k1g_1 = unit;
+      $this.e1h_1 = text;
+    $this.f1h_1 = unit;
     return $this;
   }
   function ServeElement_init_$Create$(seen0, amount, text, unit, serializationConstructorMarker) {
@@ -1865,12 +1871,12 @@
   function ServeElement() {
   }
   protoOf(ServeElement).toString = function () {
-    return 'ServeElement(amount=' + toString(this.i1g_1) + ', text=' + this.j1g_1 + ', unit=' + this.k1g_1 + ')';
+    return 'ServeElement(amount=' + toString(this.d1h_1) + ', text=' + this.e1h_1 + ', unit=' + this.f1h_1 + ')';
   };
   protoOf(ServeElement).hashCode = function () {
-    var result = this.i1g_1 == null ? 0 : this.i1g_1.hashCode();
-    result = imul(result, 31) + (this.j1g_1 == null ? 0 : getStringHashCode(this.j1g_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.k1g_1) | 0;
+    var result = this.d1h_1 == null ? 0 : this.d1h_1.hashCode();
+    result = imul(result, 31) + (this.e1h_1 == null ? 0 : getStringHashCode(this.e1h_1)) | 0;
+    result = imul(result, 31) + getStringHashCode(this.f1h_1) | 0;
     return result;
   };
   protoOf(ServeElement).equals = function (other) {
@@ -1878,11 +1884,11 @@
       return true;
     if (!(other instanceof ServeElement))
       return false;
-    if (!equals(this.i1g_1, other.i1g_1))
+    if (!equals(this.d1h_1, other.d1h_1))
       return false;
-    if (!(this.j1g_1 == other.j1g_1))
+    if (!(this.e1h_1 == other.e1h_1))
       return false;
-    if (!(this.k1g_1 === other.k1g_1))
+    if (!(this.f1h_1 === other.f1h_1))
       return false;
     return true;
   };
@@ -1895,74 +1901,74 @@
   function $serializer_6() {
     $serializer_instance_6 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.TimingElement', this, 3);
-    tmp0_serialDesc.wr('durationInMins', true);
-    tmp0_serialDesc.wr('qualifier', true);
-    tmp0_serialDesc.wr('text', true);
-    this.l1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('durationInMins', true);
+    tmp0_serialDesc.ws('qualifier', true);
+    tmp0_serialDesc.ws('text', true);
+    this.g1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_6).m1g = function (encoder, value) {
-    var tmp0_desc = this.l1g_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.n1g_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, $serializer_getInstance(), value.n1g_1);
+  protoOf($serializer_6).h1h = function (encoder, value) {
+    var tmp0_desc = this.g1h_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.i1h_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, $serializer_getInstance(), value.i1h_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.o1g_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, StringSerializer_getInstance(), value.o1g_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.j1h_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.j1h_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.p1g_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, StringSerializer_getInstance(), value.p1g_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.k1h_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.k1h_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_6).rh = function (encoder, value) {
-    return this.m1g(encoder, value instanceof TimingElement ? value : THROW_CCE());
+  protoOf($serializer_6).ri = function (encoder, value) {
+    return this.h1h(encoder, value instanceof TimingElement ? value : THROW_CCE());
   };
-  protoOf($serializer_6).sh = function (decoder) {
-    var tmp0_desc = this.l1g_1;
+  protoOf($serializer_6).si = function (decoder) {
+    var tmp0_desc = this.g1h_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.nk(tmp0_desc);
-    if (tmp7_input.dl()) {
-      tmp4_local0 = tmp7_input.bl(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
+    var tmp7_input = decoder.nl(tmp0_desc);
+    if (tmp7_input.dm()) {
+      tmp4_local0 = tmp7_input.bm(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp7_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.el(tmp0_desc);
+        tmp2_index = tmp7_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.bl(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp7_input.bm(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp7_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.ok(tmp0_desc);
+    tmp7_input.ol(tmp0_desc);
     return TimingElement_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_6).qh = function () {
-    return this.l1g_1;
+  protoOf($serializer_6).qi = function () {
+    return this.g1h_1;
   };
-  protoOf($serializer_6).yr = function () {
+  protoOf($serializer_6).ys = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1976,20 +1982,20 @@
   }
   function TimingElement_init_$Init$(seen0, durationInMins, qualifier, text, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_6().l1g_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_6().g1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.n1g_1 = null;
+      $this.i1h_1 = null;
     else
-      $this.n1g_1 = durationInMins;
+      $this.i1h_1 = durationInMins;
     if (0 === (seen0 & 2))
-      $this.o1g_1 = null;
+      $this.j1h_1 = null;
     else
-      $this.o1g_1 = qualifier;
+      $this.j1h_1 = qualifier;
     if (0 === (seen0 & 4))
-      $this.p1g_1 = null;
+      $this.k1h_1 = null;
     else
-      $this.p1g_1 = text;
+      $this.k1h_1 = text;
     return $this;
   }
   function TimingElement_init_$Create$(seen0, durationInMins, qualifier, text, serializationConstructorMarker) {
@@ -1999,17 +2005,17 @@
     durationInMins = durationInMins === VOID ? null : durationInMins;
     qualifier = qualifier === VOID ? null : qualifier;
     text = text === VOID ? null : text;
-    this.n1g_1 = durationInMins;
-    this.o1g_1 = qualifier;
-    this.p1g_1 = text;
+    this.i1h_1 = durationInMins;
+    this.j1h_1 = qualifier;
+    this.k1h_1 = text;
   }
   protoOf(TimingElement).toString = function () {
-    return 'TimingElement(durationInMins=' + toString(this.n1g_1) + ', qualifier=' + this.o1g_1 + ', text=' + this.p1g_1 + ')';
+    return 'TimingElement(durationInMins=' + toString(this.i1h_1) + ', qualifier=' + this.j1h_1 + ', text=' + this.k1h_1 + ')';
   };
   protoOf(TimingElement).hashCode = function () {
-    var result = this.n1g_1 == null ? 0 : this.n1g_1.hashCode();
-    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;
+    var result = this.i1h_1 == null ? 0 : this.i1h_1.hashCode();
+    result = imul(result, 31) + (this.j1h_1 == null ? 0 : getStringHashCode(this.j1h_1)) | 0;
+    result = imul(result, 31) + (this.k1h_1 == null ? 0 : getStringHashCode(this.k1h_1)) | 0;
     return result;
   };
   protoOf(TimingElement).equals = function (other) {
@@ -2017,11 +2023,11 @@
       return true;
     if (!(other instanceof TimingElement))
       return false;
-    if (!equals(this.n1g_1, other.n1g_1))
+    if (!equals(this.i1h_1, other.i1h_1))
       return false;
-    if (!(this.o1g_1 == other.o1g_1))
+    if (!(this.j1h_1 == other.j1h_1))
       return false;
-    if (!(this.p1g_1 == other.p1g_1))
+    if (!(this.k1h_1 == other.k1h_1))
       return false;
     return true;
   };
@@ -2100,7 +2106,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.q1g_1 = [null, tmp_1, null, tmp_3, null, tmp_5, tmp_7, null, null, null, null, tmp_9, tmp_11, tmp_13, tmp_15, null, tmp_17, tmp_19, tmp_21, tmp_23, tmp_25, null, lazy(tmp_26, RecipeV3$Companion$$childSerializers$_anonymous__7om4qn_12), null];
+    tmp.l1h_1 = [null, tmp_1, null, tmp_3, null, tmp_5, tmp_7, null, null, null, null, tmp_9, tmp_11, tmp_13, tmp_15, null, tmp_17, tmp_19, tmp_21, tmp_23, tmp_25, null, lazy(tmp_26, RecipeV3$Companion$$childSerializers$_anonymous__7om4qn_12), null];
   }
   var Companion_instance_5;
   function Companion_getInstance_5() {
@@ -2111,113 +2117,113 @@
   function $serializer_7() {
     $serializer_instance_7 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.RecipeV3', this, 24);
-    tmp0_serialDesc.wr('bookCredit', true);
-    tmp0_serialDesc.wr('byline', true);
-    tmp0_serialDesc.wr('canonicalArticle', true);
-    tmp0_serialDesc.wr('celebrationIds', true);
-    tmp0_serialDesc.wr('composerId', true);
-    tmp0_serialDesc.wr('contributors', true);
-    tmp0_serialDesc.wr('cuisineIds', true);
-    tmp0_serialDesc.wr('description', true);
-    tmp0_serialDesc.wr('difficultyLevel', true);
-    tmp0_serialDesc.wr('featuredImage', true);
-    tmp0_serialDesc.wr('id', false);
-    tmp0_serialDesc.wr('ingredients', true);
-    tmp0_serialDesc.wr('ingredientsTemplate', true);
-    tmp0_serialDesc.wr('instructions', true);
-    tmp0_serialDesc.wr('instructionsTemplate', true);
-    tmp0_serialDesc.wr('isAppReady', true);
-    tmp0_serialDesc.wr('mealTypeIds', true);
-    tmp0_serialDesc.wr('serves', true);
-    tmp0_serialDesc.wr('suitableForDietIds', true);
-    tmp0_serialDesc.wr('techniquesUsedIds', true);
-    tmp0_serialDesc.wr('timings', true);
-    tmp0_serialDesc.wr('title', true);
-    tmp0_serialDesc.wr('utensilsAndApplianceIds', true);
-    tmp0_serialDesc.wr('webPublicationDate', true);
-    this.r1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('bookCredit', true);
+    tmp0_serialDesc.ws('byline', true);
+    tmp0_serialDesc.ws('canonicalArticle', true);
+    tmp0_serialDesc.ws('celebrationIds', true);
+    tmp0_serialDesc.ws('composerId', true);
+    tmp0_serialDesc.ws('contributors', true);
+    tmp0_serialDesc.ws('cuisineIds', true);
+    tmp0_serialDesc.ws('description', true);
+    tmp0_serialDesc.ws('difficultyLevel', true);
+    tmp0_serialDesc.ws('featuredImage', true);
+    tmp0_serialDesc.ws('id', false);
+    tmp0_serialDesc.ws('ingredients', true);
+    tmp0_serialDesc.ws('ingredientsTemplate', true);
+    tmp0_serialDesc.ws('instructions', true);
+    tmp0_serialDesc.ws('instructionsTemplate', true);
+    tmp0_serialDesc.ws('isAppReady', true);
+    tmp0_serialDesc.ws('mealTypeIds', true);
+    tmp0_serialDesc.ws('serves', true);
+    tmp0_serialDesc.ws('suitableForDietIds', true);
+    tmp0_serialDesc.ws('techniquesUsedIds', true);
+    tmp0_serialDesc.ws('timings', true);
+    tmp0_serialDesc.ws('title', true);
+    tmp0_serialDesc.ws('utensilsAndApplianceIds', true);
+    tmp0_serialDesc.ws('webPublicationDate', true);
+    this.m1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_7).s1g = function (encoder, value) {
-    var tmp0_desc = this.r1g_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_5().q1g_1;
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.m1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, StringSerializer_getInstance(), value.m1c_1);
+  protoOf($serializer_7).n1h = function (encoder, value) {
+    var tmp0_desc = this.m1h_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_5().l1h_1;
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.h1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, StringSerializer_getInstance(), value.h1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.n1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, tmp2_cached[1].o1(), value.n1c_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.i1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, tmp2_cached[1].t1(), value.i1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.o1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, StringSerializer_getInstance(), value.o1c_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.j1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.j1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 3) ? true : !(value.p1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 3, tmp2_cached[3].o1(), value.p1c_1);
+    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.k1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 3, tmp2_cached[3].t1(), value.k1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 4) ? true : !(value.q1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 4, StringSerializer_getInstance(), value.q1c_1);
+    if (tmp1_output.jn(tmp0_desc, 4) ? true : !(value.l1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 4, StringSerializer_getInstance(), value.l1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 5) ? true : !(value.r1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 5, tmp2_cached[5].o1(), value.r1c_1);
+    if (tmp1_output.jn(tmp0_desc, 5) ? true : !(value.m1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 5, tmp2_cached[5].t1(), value.m1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 6) ? true : !(value.s1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 6, tmp2_cached[6].o1(), value.s1c_1);
+    if (tmp1_output.jn(tmp0_desc, 6) ? true : !(value.n1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 6, tmp2_cached[6].t1(), value.n1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 7) ? true : !(value.t1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 7, StringSerializer_getInstance(), value.t1c_1);
+    if (tmp1_output.jn(tmp0_desc, 7) ? true : !(value.o1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 7, StringSerializer_getInstance(), value.o1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 8) ? true : !(value.u1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 8, StringSerializer_getInstance(), value.u1c_1);
+    if (tmp1_output.jn(tmp0_desc, 8) ? true : !(value.p1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 8, StringSerializer_getInstance(), value.p1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 9) ? true : !(value.v1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 9, $serializer_getInstance_2(), value.v1c_1);
+    if (tmp1_output.jn(tmp0_desc, 9) ? true : !(value.q1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 9, $serializer_getInstance_2(), value.q1d_1);
     }
-    tmp1_output.bm(tmp0_desc, 10, value.w1c_1);
-    if (tmp1_output.jm(tmp0_desc, 11) ? true : !(value.x1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 11, tmp2_cached[11].o1(), value.x1c_1);
+    tmp1_output.bn(tmp0_desc, 10, value.r1d_1);
+    if (tmp1_output.jn(tmp0_desc, 11) ? true : !(value.s1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 11, tmp2_cached[11].t1(), value.s1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 12) ? true : !(value.y1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 12, tmp2_cached[12].o1(), value.y1c_1);
+    if (tmp1_output.jn(tmp0_desc, 12) ? true : !(value.t1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 12, tmp2_cached[12].t1(), value.t1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 13) ? true : !(value.z1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 13, tmp2_cached[13].o1(), value.z1c_1);
+    if (tmp1_output.jn(tmp0_desc, 13) ? true : !(value.u1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 13, tmp2_cached[13].t1(), value.u1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 14) ? true : !(value.a1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 14, tmp2_cached[14].o1(), value.a1d_1);
+    if (tmp1_output.jn(tmp0_desc, 14) ? true : !(value.v1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 14, tmp2_cached[14].t1(), value.v1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 15) ? true : !(value.b1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 15, BooleanSerializer_getInstance(), value.b1d_1);
+    if (tmp1_output.jn(tmp0_desc, 15) ? true : !(value.w1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 15, BooleanSerializer_getInstance(), value.w1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 16) ? true : !(value.c1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 16, tmp2_cached[16].o1(), value.c1d_1);
+    if (tmp1_output.jn(tmp0_desc, 16) ? true : !(value.x1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 16, tmp2_cached[16].t1(), value.x1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 17) ? true : !(value.d1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 17, tmp2_cached[17].o1(), value.d1d_1);
+    if (tmp1_output.jn(tmp0_desc, 17) ? true : !(value.y1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 17, tmp2_cached[17].t1(), value.y1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 18) ? true : !(value.e1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 18, tmp2_cached[18].o1(), value.e1d_1);
+    if (tmp1_output.jn(tmp0_desc, 18) ? true : !(value.z1d_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 18, tmp2_cached[18].t1(), value.z1d_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 19) ? true : !(value.f1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 19, tmp2_cached[19].o1(), value.f1d_1);
+    if (tmp1_output.jn(tmp0_desc, 19) ? true : !(value.a1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 19, tmp2_cached[19].t1(), value.a1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 20) ? true : !(value.g1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 20, tmp2_cached[20].o1(), value.g1d_1);
+    if (tmp1_output.jn(tmp0_desc, 20) ? true : !(value.b1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 20, tmp2_cached[20].t1(), value.b1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 21) ? true : !(value.h1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 21, StringSerializer_getInstance(), value.h1d_1);
+    if (tmp1_output.jn(tmp0_desc, 21) ? true : !(value.c1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 21, StringSerializer_getInstance(), value.c1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 22) ? true : !(value.i1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 22, tmp2_cached[22].o1(), value.i1d_1);
+    if (tmp1_output.jn(tmp0_desc, 22) ? true : !(value.d1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 22, tmp2_cached[22].t1(), value.d1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 23) ? true : !(value.j1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 23, StringSerializer_getInstance(), value.j1d_1);
+    if (tmp1_output.jn(tmp0_desc, 23) ? true : !(value.e1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 23, StringSerializer_getInstance(), value.e1e_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_7).rh = function (encoder, value) {
-    return this.s1g(encoder, value instanceof RecipeV3 ? value : THROW_CCE());
+  protoOf($serializer_7).ri = function (encoder, value) {
+    return this.n1h(encoder, value instanceof RecipeV3 ? value : THROW_CCE());
   };
-  protoOf($serializer_7).sh = function (decoder) {
-    var tmp0_desc = this.r1g_1;
+  protoOf($serializer_7).si = function (decoder) {
+    var tmp0_desc = this.m1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2245,176 +2251,176 @@
     var tmp25_local21 = null;
     var tmp26_local22 = null;
     var tmp27_local23 = null;
-    var tmp28_input = decoder.nk(tmp0_desc);
-    var tmp29_cached = Companion_getInstance_5().q1g_1;
-    if (tmp28_input.dl()) {
-      tmp4_local0 = tmp28_input.bl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+    var tmp28_input = decoder.nl(tmp0_desc);
+    var tmp29_cached = Companion_getInstance_5().l1h_1;
+    if (tmp28_input.dm()) {
+      tmp4_local0 = tmp28_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp28_input.bl(tmp0_desc, 1, tmp29_cached[1].o1(), tmp5_local1);
+      tmp5_local1 = tmp28_input.bm(tmp0_desc, 1, tmp29_cached[1].t1(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp28_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp28_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp28_input.bl(tmp0_desc, 3, tmp29_cached[3].o1(), tmp7_local3);
+      tmp7_local3 = tmp28_input.bm(tmp0_desc, 3, tmp29_cached[3].t1(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp28_input.bl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+      tmp8_local4 = tmp28_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp28_input.bl(tmp0_desc, 5, tmp29_cached[5].o1(), tmp9_local5);
+      tmp9_local5 = tmp28_input.bm(tmp0_desc, 5, tmp29_cached[5].t1(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp28_input.bl(tmp0_desc, 6, tmp29_cached[6].o1(), tmp10_local6);
+      tmp10_local6 = tmp28_input.bm(tmp0_desc, 6, tmp29_cached[6].t1(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp28_input.bl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+      tmp11_local7 = tmp28_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
-      tmp12_local8 = tmp28_input.bl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+      tmp12_local8 = tmp28_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
       tmp3_bitMask0 = tmp3_bitMask0 | 256;
-      tmp13_local9 = tmp28_input.bl(tmp0_desc, 9, $serializer_getInstance_2(), tmp13_local9);
+      tmp13_local9 = tmp28_input.bm(tmp0_desc, 9, $serializer_getInstance_2(), tmp13_local9);
       tmp3_bitMask0 = tmp3_bitMask0 | 512;
-      tmp14_local10 = tmp28_input.xk(tmp0_desc, 10);
+      tmp14_local10 = tmp28_input.xl(tmp0_desc, 10);
       tmp3_bitMask0 = tmp3_bitMask0 | 1024;
-      tmp15_local11 = tmp28_input.bl(tmp0_desc, 11, tmp29_cached[11].o1(), tmp15_local11);
+      tmp15_local11 = tmp28_input.bm(tmp0_desc, 11, tmp29_cached[11].t1(), tmp15_local11);
       tmp3_bitMask0 = tmp3_bitMask0 | 2048;
-      tmp16_local12 = tmp28_input.bl(tmp0_desc, 12, tmp29_cached[12].o1(), tmp16_local12);
+      tmp16_local12 = tmp28_input.bm(tmp0_desc, 12, tmp29_cached[12].t1(), tmp16_local12);
       tmp3_bitMask0 = tmp3_bitMask0 | 4096;
-      tmp17_local13 = tmp28_input.bl(tmp0_desc, 13, tmp29_cached[13].o1(), tmp17_local13);
+      tmp17_local13 = tmp28_input.bm(tmp0_desc, 13, tmp29_cached[13].t1(), tmp17_local13);
       tmp3_bitMask0 = tmp3_bitMask0 | 8192;
-      tmp18_local14 = tmp28_input.bl(tmp0_desc, 14, tmp29_cached[14].o1(), tmp18_local14);
+      tmp18_local14 = tmp28_input.bm(tmp0_desc, 14, tmp29_cached[14].t1(), tmp18_local14);
       tmp3_bitMask0 = tmp3_bitMask0 | 16384;
-      tmp19_local15 = tmp28_input.bl(tmp0_desc, 15, BooleanSerializer_getInstance(), tmp19_local15);
+      tmp19_local15 = tmp28_input.bm(tmp0_desc, 15, BooleanSerializer_getInstance(), tmp19_local15);
       tmp3_bitMask0 = tmp3_bitMask0 | 32768;
-      tmp20_local16 = tmp28_input.bl(tmp0_desc, 16, tmp29_cached[16].o1(), tmp20_local16);
+      tmp20_local16 = tmp28_input.bm(tmp0_desc, 16, tmp29_cached[16].t1(), tmp20_local16);
       tmp3_bitMask0 = tmp3_bitMask0 | 65536;
-      tmp21_local17 = tmp28_input.bl(tmp0_desc, 17, tmp29_cached[17].o1(), tmp21_local17);
+      tmp21_local17 = tmp28_input.bm(tmp0_desc, 17, tmp29_cached[17].t1(), tmp21_local17);
       tmp3_bitMask0 = tmp3_bitMask0 | 131072;
-      tmp22_local18 = tmp28_input.bl(tmp0_desc, 18, tmp29_cached[18].o1(), tmp22_local18);
+      tmp22_local18 = tmp28_input.bm(tmp0_desc, 18, tmp29_cached[18].t1(), tmp22_local18);
       tmp3_bitMask0 = tmp3_bitMask0 | 262144;
-      tmp23_local19 = tmp28_input.bl(tmp0_desc, 19, tmp29_cached[19].o1(), tmp23_local19);
+      tmp23_local19 = tmp28_input.bm(tmp0_desc, 19, tmp29_cached[19].t1(), tmp23_local19);
       tmp3_bitMask0 = tmp3_bitMask0 | 524288;
-      tmp24_local20 = tmp28_input.bl(tmp0_desc, 20, tmp29_cached[20].o1(), tmp24_local20);
+      tmp24_local20 = tmp28_input.bm(tmp0_desc, 20, tmp29_cached[20].t1(), tmp24_local20);
       tmp3_bitMask0 = tmp3_bitMask0 | 1048576;
-      tmp25_local21 = tmp28_input.bl(tmp0_desc, 21, StringSerializer_getInstance(), tmp25_local21);
+      tmp25_local21 = tmp28_input.bm(tmp0_desc, 21, StringSerializer_getInstance(), tmp25_local21);
       tmp3_bitMask0 = tmp3_bitMask0 | 2097152;
-      tmp26_local22 = tmp28_input.bl(tmp0_desc, 22, tmp29_cached[22].o1(), tmp26_local22);
+      tmp26_local22 = tmp28_input.bm(tmp0_desc, 22, tmp29_cached[22].t1(), tmp26_local22);
       tmp3_bitMask0 = tmp3_bitMask0 | 4194304;
-      tmp27_local23 = tmp28_input.bl(tmp0_desc, 23, StringSerializer_getInstance(), tmp27_local23);
+      tmp27_local23 = tmp28_input.bm(tmp0_desc, 23, StringSerializer_getInstance(), tmp27_local23);
       tmp3_bitMask0 = tmp3_bitMask0 | 8388608;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp28_input.el(tmp0_desc);
+        tmp2_index = tmp28_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp28_input.bl(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp28_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp28_input.bl(tmp0_desc, 1, tmp29_cached[1].o1(), tmp5_local1);
+            tmp5_local1 = tmp28_input.bm(tmp0_desc, 1, tmp29_cached[1].t1(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp28_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp28_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp28_input.bl(tmp0_desc, 3, tmp29_cached[3].o1(), tmp7_local3);
+            tmp7_local3 = tmp28_input.bm(tmp0_desc, 3, tmp29_cached[3].t1(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp28_input.bl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+            tmp8_local4 = tmp28_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp28_input.bl(tmp0_desc, 5, tmp29_cached[5].o1(), tmp9_local5);
+            tmp9_local5 = tmp28_input.bm(tmp0_desc, 5, tmp29_cached[5].t1(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp28_input.bl(tmp0_desc, 6, tmp29_cached[6].o1(), tmp10_local6);
+            tmp10_local6 = tmp28_input.bm(tmp0_desc, 6, tmp29_cached[6].t1(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp28_input.bl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+            tmp11_local7 = tmp28_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           case 8:
-            tmp12_local8 = tmp28_input.bl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+            tmp12_local8 = tmp28_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
             tmp3_bitMask0 = tmp3_bitMask0 | 256;
             break;
           case 9:
-            tmp13_local9 = tmp28_input.bl(tmp0_desc, 9, $serializer_getInstance_2(), tmp13_local9);
+            tmp13_local9 = tmp28_input.bm(tmp0_desc, 9, $serializer_getInstance_2(), tmp13_local9);
             tmp3_bitMask0 = tmp3_bitMask0 | 512;
             break;
           case 10:
-            tmp14_local10 = tmp28_input.xk(tmp0_desc, 10);
+            tmp14_local10 = tmp28_input.xl(tmp0_desc, 10);
             tmp3_bitMask0 = tmp3_bitMask0 | 1024;
             break;
           case 11:
-            tmp15_local11 = tmp28_input.bl(tmp0_desc, 11, tmp29_cached[11].o1(), tmp15_local11);
+            tmp15_local11 = tmp28_input.bm(tmp0_desc, 11, tmp29_cached[11].t1(), tmp15_local11);
             tmp3_bitMask0 = tmp3_bitMask0 | 2048;
             break;
           case 12:
-            tmp16_local12 = tmp28_input.bl(tmp0_desc, 12, tmp29_cached[12].o1(), tmp16_local12);
+            tmp16_local12 = tmp28_input.bm(tmp0_desc, 12, tmp29_cached[12].t1(), tmp16_local12);
             tmp3_bitMask0 = tmp3_bitMask0 | 4096;
             break;
           case 13:
-            tmp17_local13 = tmp28_input.bl(tmp0_desc, 13, tmp29_cached[13].o1(), tmp17_local13);
+            tmp17_local13 = tmp28_input.bm(tmp0_desc, 13, tmp29_cached[13].t1(), tmp17_local13);
             tmp3_bitMask0 = tmp3_bitMask0 | 8192;
             break;
           case 14:
-            tmp18_local14 = tmp28_input.bl(tmp0_desc, 14, tmp29_cached[14].o1(), tmp18_local14);
+            tmp18_local14 = tmp28_input.bm(tmp0_desc, 14, tmp29_cached[14].t1(), tmp18_local14);
             tmp3_bitMask0 = tmp3_bitMask0 | 16384;
             break;
           case 15:
-            tmp19_local15 = tmp28_input.bl(tmp0_desc, 15, BooleanSerializer_getInstance(), tmp19_local15);
+            tmp19_local15 = tmp28_input.bm(tmp0_desc, 15, BooleanSerializer_getInstance(), tmp19_local15);
             tmp3_bitMask0 = tmp3_bitMask0 | 32768;
             break;
           case 16:
-            tmp20_local16 = tmp28_input.bl(tmp0_desc, 16, tmp29_cached[16].o1(), tmp20_local16);
+            tmp20_local16 = tmp28_input.bm(tmp0_desc, 16, tmp29_cached[16].t1(), tmp20_local16);
             tmp3_bitMask0 = tmp3_bitMask0 | 65536;
             break;
           case 17:
-            tmp21_local17 = tmp28_input.bl(tmp0_desc, 17, tmp29_cached[17].o1(), tmp21_local17);
+            tmp21_local17 = tmp28_input.bm(tmp0_desc, 17, tmp29_cached[17].t1(), tmp21_local17);
             tmp3_bitMask0 = tmp3_bitMask0 | 131072;
             break;
           case 18:
-            tmp22_local18 = tmp28_input.bl(tmp0_desc, 18, tmp29_cached[18].o1(), tmp22_local18);
+            tmp22_local18 = tmp28_input.bm(tmp0_desc, 18, tmp29_cached[18].t1(), tmp22_local18);
             tmp3_bitMask0 = tmp3_bitMask0 | 262144;
             break;
           case 19:
-            tmp23_local19 = tmp28_input.bl(tmp0_desc, 19, tmp29_cached[19].o1(), tmp23_local19);
+            tmp23_local19 = tmp28_input.bm(tmp0_desc, 19, tmp29_cached[19].t1(), tmp23_local19);
             tmp3_bitMask0 = tmp3_bitMask0 | 524288;
             break;
           case 20:
-            tmp24_local20 = tmp28_input.bl(tmp0_desc, 20, tmp29_cached[20].o1(), tmp24_local20);
+            tmp24_local20 = tmp28_input.bm(tmp0_desc, 20, tmp29_cached[20].t1(), tmp24_local20);
             tmp3_bitMask0 = tmp3_bitMask0 | 1048576;
             break;
           case 21:
-            tmp25_local21 = tmp28_input.bl(tmp0_desc, 21, StringSerializer_getInstance(), tmp25_local21);
+            tmp25_local21 = tmp28_input.bm(tmp0_desc, 21, StringSerializer_getInstance(), tmp25_local21);
             tmp3_bitMask0 = tmp3_bitMask0 | 2097152;
             break;
           case 22:
-            tmp26_local22 = tmp28_input.bl(tmp0_desc, 22, tmp29_cached[22].o1(), tmp26_local22);
+            tmp26_local22 = tmp28_input.bm(tmp0_desc, 22, tmp29_cached[22].t1(), tmp26_local22);
             tmp3_bitMask0 = tmp3_bitMask0 | 4194304;
             break;
           case 23:
-            tmp27_local23 = tmp28_input.bl(tmp0_desc, 23, StringSerializer_getInstance(), tmp27_local23);
+            tmp27_local23 = tmp28_input.bm(tmp0_desc, 23, StringSerializer_getInstance(), tmp27_local23);
             tmp3_bitMask0 = tmp3_bitMask0 | 8388608;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp28_input.ok(tmp0_desc);
+    tmp28_input.ol(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, tmp27_local23, null);
   };
-  protoOf($serializer_7).qh = function () {
-    return this.r1g_1;
+  protoOf($serializer_7).qi = function () {
+    return this.m1h_1;
   };
-  protoOf($serializer_7).yr = function () {
-    var tmp0_cached = Companion_getInstance_5().q1g_1;
+  protoOf($serializer_7).ys = function () {
+    var tmp0_cached = Companion_getInstance_5().l1h_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].o1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[3].o1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[5].o1()), get_nullable(tmp0_cached[6].o1()), get_nullable(StringSerializer_getInstance()), get_nullable(StringSerializer_getInstance()), get_nullable($serializer_getInstance_2()), StringSerializer_getInstance(), get_nullable(tmp0_cached[11].o1()), get_nullable(tmp0_cached[12].o1()), get_nullable(tmp0_cached[13].o1()), get_nullable(tmp0_cached[14].o1()), get_nullable(BooleanSerializer_getInstance()), get_nullable(tmp0_cached[16].o1()), get_nullable(tmp0_cached[17].o1()), get_nullable(tmp0_cached[18].o1()), get_nullable(tmp0_cached[19].o1()), get_nullable(tmp0_cached[20].o1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[22].o1()), get_nullable(StringSerializer_getInstance())];
+    return [get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[1].t1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[3].t1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[5].t1()), get_nullable(tmp0_cached[6].t1()), get_nullable(StringSerializer_getInstance()), get_nullable(StringSerializer_getInstance()), get_nullable($serializer_getInstance_2()), StringSerializer_getInstance(), get_nullable(tmp0_cached[11].t1()), get_nullable(tmp0_cached[12].t1()), get_nullable(tmp0_cached[13].t1()), get_nullable(tmp0_cached[14].t1()), get_nullable(BooleanSerializer_getInstance()), get_nullable(tmp0_cached[16].t1()), get_nullable(tmp0_cached[17].t1()), get_nullable(tmp0_cached[18].t1()), get_nullable(tmp0_cached[19].t1()), get_nullable(tmp0_cached[20].t1()), get_nullable(StringSerializer_getInstance()), get_nullable(tmp0_cached[22].t1()), get_nullable(StringSerializer_getInstance())];
   };
   var $serializer_instance_7;
   function $serializer_getInstance_7() {
@@ -2424,101 +2430,101 @@
   }
   function RecipeV3_init_$Init$(seen0, bookCredit, byline, canonicalArticle, celebrationIDS, composerID, contributors, cuisineIDS, description, difficultyLevel, featuredImage, id, ingredients, ingredientsTemplate, instructions, instructionsTemplate, isAppReady, mealTypeIDS, serves, suitableForDietIDS, techniquesUsedIDS, timings, title, utensilsAndApplianceIDS, webPublicationDate, serializationConstructorMarker, $this) {
     if (!(1024 === (1024 & seen0))) {
-      throwMissingFieldException(seen0, 1024, $serializer_getInstance_7().r1g_1);
+      throwMissingFieldException(seen0, 1024, $serializer_getInstance_7().m1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.m1c_1 = null;
+      $this.h1d_1 = null;
     else
-      $this.m1c_1 = bookCredit;
+      $this.h1d_1 = bookCredit;
     if (0 === (seen0 & 2))
-      $this.n1c_1 = null;
+      $this.i1d_1 = null;
     else
-      $this.n1c_1 = byline;
+      $this.i1d_1 = byline;
     if (0 === (seen0 & 4))
-      $this.o1c_1 = null;
+      $this.j1d_1 = null;
     else
-      $this.o1c_1 = canonicalArticle;
+      $this.j1d_1 = canonicalArticle;
     if (0 === (seen0 & 8))
-      $this.p1c_1 = null;
+      $this.k1d_1 = null;
     else
-      $this.p1c_1 = celebrationIDS;
+      $this.k1d_1 = celebrationIDS;
     if (0 === (seen0 & 16))
-      $this.q1c_1 = null;
+      $this.l1d_1 = null;
     else
-      $this.q1c_1 = composerID;
+      $this.l1d_1 = composerID;
     if (0 === (seen0 & 32))
-      $this.r1c_1 = null;
+      $this.m1d_1 = null;
     else
-      $this.r1c_1 = contributors;
+      $this.m1d_1 = contributors;
     if (0 === (seen0 & 64))
-      $this.s1c_1 = null;
+      $this.n1d_1 = null;
     else
-      $this.s1c_1 = cuisineIDS;
+      $this.n1d_1 = cuisineIDS;
     if (0 === (seen0 & 128))
-      $this.t1c_1 = null;
+      $this.o1d_1 = null;
     else
-      $this.t1c_1 = description;
+      $this.o1d_1 = description;
     if (0 === (seen0 & 256))
-      $this.u1c_1 = null;
+      $this.p1d_1 = null;
     else
-      $this.u1c_1 = difficultyLevel;
+      $this.p1d_1 = difficultyLevel;
     if (0 === (seen0 & 512))
-      $this.v1c_1 = null;
+      $this.q1d_1 = null;
     else
-      $this.v1c_1 = featuredImage;
-    $this.w1c_1 = id;
+      $this.q1d_1 = featuredImage;
+    $this.r1d_1 = id;
     if (0 === (seen0 & 2048))
-      $this.x1c_1 = null;
+      $this.s1d_1 = null;
     else
-      $this.x1c_1 = ingredients;
+      $this.s1d_1 = ingredients;
     if (0 === (seen0 & 4096))
-      $this.y1c_1 = null;
+      $this.t1d_1 = null;
     else
-      $this.y1c_1 = ingredientsTemplate;
+      $this.t1d_1 = ingredientsTemplate;
     if (0 === (seen0 & 8192))
-      $this.z1c_1 = null;
+      $this.u1d_1 = null;
     else
-      $this.z1c_1 = instructions;
+      $this.u1d_1 = instructions;
     if (0 === (seen0 & 16384))
-      $this.a1d_1 = null;
+      $this.v1d_1 = null;
     else
-      $this.a1d_1 = instructionsTemplate;
+      $this.v1d_1 = instructionsTemplate;
     if (0 === (seen0 & 32768))
-      $this.b1d_1 = null;
+      $this.w1d_1 = null;
     else
-      $this.b1d_1 = isAppReady;
+      $this.w1d_1 = isAppReady;
     if (0 === (seen0 & 65536))
-      $this.c1d_1 = null;
+      $this.x1d_1 = null;
     else
-      $this.c1d_1 = mealTypeIDS;
+      $this.x1d_1 = mealTypeIDS;
     if (0 === (seen0 & 131072))
-      $this.d1d_1 = null;
+      $this.y1d_1 = null;
     else
-      $this.d1d_1 = serves;
+      $this.y1d_1 = serves;
     if (0 === (seen0 & 262144))
-      $this.e1d_1 = null;
+      $this.z1d_1 = null;
     else
-      $this.e1d_1 = suitableForDietIDS;
+      $this.z1d_1 = suitableForDietIDS;
     if (0 === (seen0 & 524288))
-      $this.f1d_1 = null;
+      $this.a1e_1 = null;
     else
-      $this.f1d_1 = techniquesUsedIDS;
+      $this.a1e_1 = techniquesUsedIDS;
     if (0 === (seen0 & 1048576))
-      $this.g1d_1 = null;
+      $this.b1e_1 = null;
     else
-      $this.g1d_1 = timings;
+      $this.b1e_1 = timings;
     if (0 === (seen0 & 2097152))
-      $this.h1d_1 = null;
+      $this.c1e_1 = null;
     else
-      $this.h1d_1 = title;
+      $this.c1e_1 = title;
     if (0 === (seen0 & 4194304))
-      $this.i1d_1 = null;
+      $this.d1e_1 = null;
     else
-      $this.i1d_1 = utensilsAndApplianceIDS;
+      $this.d1e_1 = utensilsAndApplianceIDS;
     if (0 === (seen0 & 8388608))
-      $this.j1d_1 = null;
+      $this.e1e_1 = null;
     else
-      $this.j1d_1 = webPublicationDate;
+      $this.e1e_1 = webPublicationDate;
     return $this;
   }
   function RecipeV3_init_$Create$(seen0, bookCredit, byline, canonicalArticle, celebrationIDS, composerID, contributors, cuisineIDS, description, difficultyLevel, featuredImage, id, ingredients, ingredientsTemplate, instructions, instructionsTemplate, isAppReady, mealTypeIDS, serves, suitableForDietIDS, techniquesUsedIDS, timings, title, utensilsAndApplianceIDS, webPublicationDate, serializationConstructorMarker) {
@@ -2549,59 +2555,59 @@
     title = title === VOID ? null : title;
     utensilsAndApplianceIDS = utensilsAndApplianceIDS === VOID ? null : utensilsAndApplianceIDS;
     webPublicationDate = webPublicationDate === VOID ? null : webPublicationDate;
-    this.m1c_1 = bookCredit;
-    this.n1c_1 = byline;
-    this.o1c_1 = canonicalArticle;
-    this.p1c_1 = celebrationIDS;
-    this.q1c_1 = composerID;
-    this.r1c_1 = contributors;
-    this.s1c_1 = cuisineIDS;
-    this.t1c_1 = description;
-    this.u1c_1 = difficultyLevel;
-    this.v1c_1 = featuredImage;
-    this.w1c_1 = id;
-    this.x1c_1 = ingredients;
-    this.y1c_1 = ingredientsTemplate;
-    this.z1c_1 = instructions;
-    this.a1d_1 = instructionsTemplate;
-    this.b1d_1 = isAppReady;
-    this.c1d_1 = mealTypeIDS;
-    this.d1d_1 = serves;
-    this.e1d_1 = suitableForDietIDS;
-    this.f1d_1 = techniquesUsedIDS;
-    this.g1d_1 = timings;
-    this.h1d_1 = title;
-    this.i1d_1 = utensilsAndApplianceIDS;
-    this.j1d_1 = webPublicationDate;
+    this.h1d_1 = bookCredit;
+    this.i1d_1 = byline;
+    this.j1d_1 = canonicalArticle;
+    this.k1d_1 = celebrationIDS;
+    this.l1d_1 = composerID;
+    this.m1d_1 = contributors;
+    this.n1d_1 = cuisineIDS;
+    this.o1d_1 = description;
+    this.p1d_1 = difficultyLevel;
+    this.q1d_1 = featuredImage;
+    this.r1d_1 = id;
+    this.s1d_1 = ingredients;
+    this.t1d_1 = ingredientsTemplate;
+    this.u1d_1 = instructions;
+    this.v1d_1 = instructionsTemplate;
+    this.w1d_1 = isAppReady;
+    this.x1d_1 = mealTypeIDS;
+    this.y1d_1 = serves;
+    this.z1d_1 = suitableForDietIDS;
+    this.a1e_1 = techniquesUsedIDS;
+    this.b1e_1 = timings;
+    this.c1e_1 = title;
+    this.d1e_1 = utensilsAndApplianceIDS;
+    this.e1e_1 = webPublicationDate;
   }
   protoOf(RecipeV3).toString = function () {
-    return 'RecipeV3(bookCredit=' + this.m1c_1 + ', byline=' + toString(this.n1c_1) + ', canonicalArticle=' + this.o1c_1 + ', celebrationIDS=' + toString(this.p1c_1) + ', composerID=' + this.q1c_1 + ', contributors=' + toString(this.r1c_1) + ', cuisineIDS=' + toString(this.s1c_1) + ', description=' + this.t1c_1 + ', difficultyLevel=' + this.u1c_1 + ', featuredImage=' + toString(this.v1c_1) + ', id=' + this.w1c_1 + ', ingredients=' + toString(this.x1c_1) + ', ingredientsTemplate=' + toString(this.y1c_1) + ', instructions=' + toString(this.z1c_1) + ', instructionsTemplate=' + toString(this.a1d_1) + ', isAppReady=' + this.b1d_1 + ', mealTypeIDS=' + toString(this.c1d_1) + ', serves=' + toString(this.d1d_1) + ', suitableForDietIDS=' + toString(this.e1d_1) + ', techniquesUsedIDS=' + toString(this.f1d_1) + ', timings=' + toString(this.g1d_1) + ', title=' + this.h1d_1 + ', utensilsAndApplianceIDS=' + toString(this.i1d_1) + ', webPublicationDate=' + this.j1d_1 + ')';
+    return 'RecipeV3(bookCredit=' + this.h1d_1 + ', byline=' + toString(this.i1d_1) + ', canonicalArticle=' + this.j1d_1 + ', celebrationIDS=' + toString(this.k1d_1) + ', composerID=' + this.l1d_1 + ', contributors=' + toString(this.m1d_1) + ', cuisineIDS=' + toString(this.n1d_1) + ', description=' + this.o1d_1 + ', difficultyLevel=' + this.p1d_1 + ', featuredImage=' + toString(this.q1d_1) + ', id=' + this.r1d_1 + ', ingredients=' + toString(this.s1d_1) + ', ingredientsTemplate=' + toString(this.t1d_1) + ', instructions=' + toString(this.u1d_1) + ', instructionsTemplate=' + toString(this.v1d_1) + ', isAppReady=' + this.w1d_1 + ', mealTypeIDS=' + toString(this.x1d_1) + ', serves=' + toString(this.y1d_1) + ', suitableForDietIDS=' + toString(this.z1d_1) + ', techniquesUsedIDS=' + toString(this.a1e_1) + ', timings=' + toString(this.b1e_1) + ', title=' + this.c1e_1 + ', utensilsAndApplianceIDS=' + toString(this.d1e_1) + ', webPublicationDate=' + this.e1e_1 + ')';
   };
   protoOf(RecipeV3).hashCode = function () {
-    var result = this.m1c_1 == null ? 0 : getStringHashCode(this.m1c_1);
-    result = imul(result, 31) + (this.n1c_1 == null ? 0 : hashCode(this.n1c_1)) | 0;
-    result = imul(result, 31) + (this.o1c_1 == null ? 0 : getStringHashCode(this.o1c_1)) | 0;
-    result = imul(result, 31) + (this.p1c_1 == null ? 0 : hashCode(this.p1c_1)) | 0;
-    result = imul(result, 31) + (this.q1c_1 == null ? 0 : getStringHashCode(this.q1c_1)) | 0;
-    result = imul(result, 31) + (this.r1c_1 == null ? 0 : hashCode(this.r1c_1)) | 0;
-    result = imul(result, 31) + (this.s1c_1 == null ? 0 : hashCode(this.s1c_1)) | 0;
-    result = imul(result, 31) + (this.t1c_1 == null ? 0 : getStringHashCode(this.t1c_1)) | 0;
-    result = imul(result, 31) + (this.u1c_1 == null ? 0 : getStringHashCode(this.u1c_1)) | 0;
-    result = imul(result, 31) + (this.v1c_1 == null ? 0 : this.v1c_1.hashCode()) | 0;
-    result = imul(result, 31) + getStringHashCode(this.w1c_1) | 0;
-    result = imul(result, 31) + (this.x1c_1 == null ? 0 : hashCode(this.x1c_1)) | 0;
-    result = imul(result, 31) + (this.y1c_1 == null ? 0 : hashCode(this.y1c_1)) | 0;
-    result = imul(result, 31) + (this.z1c_1 == null ? 0 : hashCode(this.z1c_1)) | 0;
-    result = imul(result, 31) + (this.a1d_1 == null ? 0 : hashCode(this.a1d_1)) | 0;
-    result = imul(result, 31) + (this.b1d_1 == null ? 0 : getBooleanHashCode(this.b1d_1)) | 0;
-    result = imul(result, 31) + (this.c1d_1 == null ? 0 : hashCode(this.c1d_1)) | 0;
-    result = imul(result, 31) + (this.d1d_1 == null ? 0 : hashCode(this.d1d_1)) | 0;
-    result = imul(result, 31) + (this.e1d_1 == null ? 0 : hashCode(this.e1d_1)) | 0;
-    result = imul(result, 31) + (this.f1d_1 == null ? 0 : hashCode(this.f1d_1)) | 0;
-    result = imul(result, 31) + (this.g1d_1 == null ? 0 : hashCode(this.g1d_1)) | 0;
-    result = imul(result, 31) + (this.h1d_1 == null ? 0 : getStringHashCode(this.h1d_1)) | 0;
+    var result = this.h1d_1 == null ? 0 : getStringHashCode(this.h1d_1);
     result = imul(result, 31) + (this.i1d_1 == null ? 0 : hashCode(this.i1d_1)) | 0;
     result = imul(result, 31) + (this.j1d_1 == null ? 0 : getStringHashCode(this.j1d_1)) | 0;
+    result = imul(result, 31) + (this.k1d_1 == null ? 0 : hashCode(this.k1d_1)) | 0;
+    result = imul(result, 31) + (this.l1d_1 == null ? 0 : getStringHashCode(this.l1d_1)) | 0;
+    result = imul(result, 31) + (this.m1d_1 == null ? 0 : hashCode(this.m1d_1)) | 0;
+    result = imul(result, 31) + (this.n1d_1 == null ? 0 : hashCode(this.n1d_1)) | 0;
+    result = imul(result, 31) + (this.o1d_1 == null ? 0 : getStringHashCode(this.o1d_1)) | 0;
+    result = imul(result, 31) + (this.p1d_1 == null ? 0 : getStringHashCode(this.p1d_1)) | 0;
+    result = imul(result, 31) + (this.q1d_1 == null ? 0 : this.q1d_1.hashCode()) | 0;
+    result = imul(result, 31) + getStringHashCode(this.r1d_1) | 0;
+    result = imul(result, 31) + (this.s1d_1 == null ? 0 : hashCode(this.s1d_1)) | 0;
+    result = imul(result, 31) + (this.t1d_1 == null ? 0 : hashCode(this.t1d_1)) | 0;
+    result = imul(result, 31) + (this.u1d_1 == null ? 0 : hashCode(this.u1d_1)) | 0;
+    result = imul(result, 31) + (this.v1d_1 == null ? 0 : hashCode(this.v1d_1)) | 0;
+    result = imul(result, 31) + (this.w1d_1 == null ? 0 : getBooleanHashCode(this.w1d_1)) | 0;
+    result = imul(result, 31) + (this.x1d_1 == null ? 0 : hashCode(this.x1d_1)) | 0;
+    result = imul(result, 31) + (this.y1d_1 == null ? 0 : hashCode(this.y1d_1)) | 0;
+    result = imul(result, 31) + (this.z1d_1 == null ? 0 : hashCode(this.z1d_1)) | 0;
+    result = imul(result, 31) + (this.a1e_1 == null ? 0 : hashCode(this.a1e_1)) | 0;
+    result = imul(result, 31) + (this.b1e_1 == null ? 0 : hashCode(this.b1e_1)) | 0;
+    result = imul(result, 31) + (this.c1e_1 == null ? 0 : getStringHashCode(this.c1e_1)) | 0;
+    result = imul(result, 31) + (this.d1e_1 == null ? 0 : hashCode(this.d1e_1)) | 0;
+    result = imul(result, 31) + (this.e1e_1 == null ? 0 : getStringHashCode(this.e1e_1)) | 0;
     return result;
   };
   protoOf(RecipeV3).equals = function (other) {
@@ -2609,53 +2615,53 @@
       return true;
     if (!(other instanceof RecipeV3))
       return false;
-    if (!(this.m1c_1 == other.m1c_1))
+    if (!(this.h1d_1 == other.h1d_1))
       return false;
-    if (!equals(this.n1c_1, other.n1c_1))
+    if (!equals(this.i1d_1, other.i1d_1))
       return false;
-    if (!(this.o1c_1 == other.o1c_1))
+    if (!(this.j1d_1 == other.j1d_1))
       return false;
-    if (!equals(this.p1c_1, other.p1c_1))
+    if (!equals(this.k1d_1, other.k1d_1))
       return false;
-    if (!(this.q1c_1 == other.q1c_1))
+    if (!(this.l1d_1 == other.l1d_1))
       return false;
-    if (!equals(this.r1c_1, other.r1c_1))
+    if (!equals(this.m1d_1, other.m1d_1))
       return false;
-    if (!equals(this.s1c_1, other.s1c_1))
+    if (!equals(this.n1d_1, other.n1d_1))
       return false;
-    if (!(this.t1c_1 == other.t1c_1))
+    if (!(this.o1d_1 == other.o1d_1))
       return false;
-    if (!(this.u1c_1 == other.u1c_1))
+    if (!(this.p1d_1 == other.p1d_1))
       return false;
-    if (!equals(this.v1c_1, other.v1c_1))
+    if (!equals(this.q1d_1, other.q1d_1))
       return false;
-    if (!(this.w1c_1 === other.w1c_1))
+    if (!(this.r1d_1 === other.r1d_1))
       return false;
-    if (!equals(this.x1c_1, other.x1c_1))
+    if (!equals(this.s1d_1, other.s1d_1))
       return false;
-    if (!equals(this.y1c_1, other.y1c_1))
+    if (!equals(this.t1d_1, other.t1d_1))
       return false;
-    if (!equals(this.z1c_1, other.z1c_1))
+    if (!equals(this.u1d_1, other.u1d_1))
       return false;
-    if (!equals(this.a1d_1, other.a1d_1))
+    if (!equals(this.v1d_1, other.v1d_1))
       return false;
-    if (!(this.b1d_1 == other.b1d_1))
+    if (!(this.w1d_1 == other.w1d_1))
       return false;
-    if (!equals(this.c1d_1, other.c1d_1))
+    if (!equals(this.x1d_1, other.x1d_1))
       return false;
-    if (!equals(this.d1d_1, other.d1d_1))
+    if (!equals(this.y1d_1, other.y1d_1))
       return false;
-    if (!equals(this.e1d_1, other.e1d_1))
+    if (!equals(this.z1d_1, other.z1d_1))
       return false;
-    if (!equals(this.f1d_1, other.f1d_1))
+    if (!equals(this.a1e_1, other.a1e_1))
       return false;
-    if (!equals(this.g1d_1, other.g1d_1))
+    if (!equals(this.b1e_1, other.b1e_1))
       return false;
-    if (!(this.h1d_1 == other.h1d_1))
+    if (!(this.c1e_1 == other.c1e_1))
       return false;
-    if (!equals(this.i1d_1, other.i1d_1))
+    if (!equals(this.d1e_1, other.d1e_1))
       return false;
-    if (!(this.j1d_1 == other.j1d_1))
+    if (!(this.e1e_1 == other.e1e_1))
       return false;
     return true;
   };
@@ -2669,7 +2675,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.t1g_1 = [lazy(tmp_0, IngredientsTemplateElement$Companion$$childSerializers$_anonymous__8t0no6), null];
+    tmp.o1h_1 = [lazy(tmp_0, IngredientsTemplateElement$Companion$$childSerializers$_anonymous__8t0no6), null];
   }
   var Companion_instance_6;
   function Companion_getInstance_6() {
@@ -2680,70 +2686,70 @@
   function $serializer_8() {
     $serializer_instance_8 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.IngredientsTemplateElement', this, 2);
-    tmp0_serialDesc.wr('ingredientsList', true);
-    tmp0_serialDesc.wr('recipeSection', true);
-    this.u1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('ingredientsList', true);
+    tmp0_serialDesc.ws('recipeSection', true);
+    this.p1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_8).v1g = function (encoder, value) {
-    var tmp0_desc = this.u1g_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_6().t1g_1;
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.k1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, tmp2_cached[0].o1(), value.k1d_1);
+  protoOf($serializer_8).q1h = function (encoder, value) {
+    var tmp0_desc = this.p1h_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_6().o1h_1;
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.f1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, tmp2_cached[0].t1(), value.f1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.l1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, StringSerializer_getInstance(), value.l1d_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.g1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.g1e_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_8).rh = function (encoder, value) {
-    return this.v1g(encoder, value instanceof IngredientsTemplateElement ? value : THROW_CCE());
+  protoOf($serializer_8).ri = function (encoder, value) {
+    return this.q1h(encoder, value instanceof IngredientsTemplateElement ? value : THROW_CCE());
   };
-  protoOf($serializer_8).sh = function (decoder) {
-    var tmp0_desc = this.u1g_1;
+  protoOf($serializer_8).si = function (decoder) {
+    var tmp0_desc = this.p1h_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.nk(tmp0_desc);
-    var tmp7_cached = Companion_getInstance_6().t1g_1;
-    if (tmp6_input.dl()) {
-      tmp4_local0 = tmp6_input.bl(tmp0_desc, 0, tmp7_cached[0].o1(), tmp4_local0);
+    var tmp6_input = decoder.nl(tmp0_desc);
+    var tmp7_cached = Companion_getInstance_6().o1h_1;
+    if (tmp6_input.dm()) {
+      tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, tmp7_cached[0].t1(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp6_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp6_input.el(tmp0_desc);
+        tmp2_index = tmp6_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp6_input.bl(tmp0_desc, 0, tmp7_cached[0].o1(), tmp4_local0);
+            tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, tmp7_cached[0].t1(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp6_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp6_input.ok(tmp0_desc);
+    tmp6_input.ol(tmp0_desc);
     return IngredientsTemplateElement_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
   };
-  protoOf($serializer_8).qh = function () {
-    return this.u1g_1;
+  protoOf($serializer_8).qi = function () {
+    return this.p1h_1;
   };
-  protoOf($serializer_8).yr = function () {
-    var tmp0_cached = Companion_getInstance_6().t1g_1;
+  protoOf($serializer_8).ys = function () {
+    var tmp0_cached = Companion_getInstance_6().o1h_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    return [get_nullable(tmp0_cached[0].o1()), get_nullable(StringSerializer_getInstance())];
+    return [get_nullable(tmp0_cached[0].t1()), get_nullable(StringSerializer_getInstance())];
   };
   var $serializer_instance_8;
   function $serializer_getInstance_8() {
@@ -2753,16 +2759,16 @@
   }
   function IngredientsTemplateElement_init_$Init$(seen0, ingredientsList, recipeSection, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_8().u1g_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_8().p1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.k1d_1 = null;
+      $this.f1e_1 = null;
     else
-      $this.k1d_1 = ingredientsList;
+      $this.f1e_1 = ingredientsList;
     if (0 === (seen0 & 2))
-      $this.l1d_1 = null;
+      $this.g1e_1 = null;
     else
-      $this.l1d_1 = recipeSection;
+      $this.g1e_1 = recipeSection;
     return $this;
   }
   function IngredientsTemplateElement_init_$Create$(seen0, ingredientsList, recipeSection, serializationConstructorMarker) {
@@ -2772,15 +2778,15 @@
     Companion_getInstance_6();
     ingredientsList = ingredientsList === VOID ? null : ingredientsList;
     recipeSection = recipeSection === VOID ? null : recipeSection;
-    this.k1d_1 = ingredientsList;
-    this.l1d_1 = recipeSection;
+    this.f1e_1 = ingredientsList;
+    this.g1e_1 = recipeSection;
   }
   protoOf(IngredientsTemplateElement).toString = function () {
-    return 'IngredientsTemplateElement(ingredientsList=' + toString(this.k1d_1) + ', recipeSection=' + this.l1d_1 + ')';
+    return 'IngredientsTemplateElement(ingredientsList=' + toString(this.f1e_1) + ', recipeSection=' + this.g1e_1 + ')';
   };
   protoOf(IngredientsTemplateElement).hashCode = function () {
-    var result = this.k1d_1 == null ? 0 : hashCode(this.k1d_1);
-    result = imul(result, 31) + (this.l1d_1 == null ? 0 : getStringHashCode(this.l1d_1)) | 0;
+    var result = this.f1e_1 == null ? 0 : hashCode(this.f1e_1);
+    result = imul(result, 31) + (this.g1e_1 == null ? 0 : getStringHashCode(this.g1e_1)) | 0;
     return result;
   };
   protoOf(IngredientsTemplateElement).equals = function (other) {
@@ -2788,9 +2794,9 @@
       return true;
     if (!(other instanceof IngredientsTemplateElement))
       return false;
-    if (!equals(this.k1d_1, other.k1d_1))
+    if (!equals(this.f1e_1, other.f1e_1))
       return false;
-    if (!(this.l1d_1 == other.l1d_1))
+    if (!(this.g1e_1 == other.g1e_1))
       return false;
     return true;
   };
@@ -2803,54 +2809,54 @@
   function $serializer_9() {
     $serializer_instance_9 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.IngredientsTemplateIngredientsList', this, 9);
-    tmp0_serialDesc.wr('amount', true);
-    tmp0_serialDesc.wr('ingredientId', true);
-    tmp0_serialDesc.wr('name', true);
-    tmp0_serialDesc.wr('optional', true);
-    tmp0_serialDesc.wr('prefix', true);
-    tmp0_serialDesc.wr('suffix', true);
-    tmp0_serialDesc.wr('text', true);
-    tmp0_serialDesc.wr('unit', true);
-    tmp0_serialDesc.wr('template', true);
-    this.w1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('amount', true);
+    tmp0_serialDesc.ws('ingredientId', true);
+    tmp0_serialDesc.ws('name', true);
+    tmp0_serialDesc.ws('optional', true);
+    tmp0_serialDesc.ws('prefix', true);
+    tmp0_serialDesc.ws('suffix', true);
+    tmp0_serialDesc.ws('text', true);
+    tmp0_serialDesc.ws('unit', true);
+    tmp0_serialDesc.ws('template', true);
+    this.r1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_9).x1g = function (encoder, value) {
-    var tmp0_desc = this.w1g_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.m1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, $serializer_getInstance(), value.m1d_1);
+  protoOf($serializer_9).s1h = function (encoder, value) {
+    var tmp0_desc = this.r1h_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.h1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 0, $serializer_getInstance(), value.h1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.n1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, StringSerializer_getInstance(), value.n1d_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.i1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.i1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.o1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, StringSerializer_getInstance(), value.o1d_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.j1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.j1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 3) ? true : !(value.p1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 3, BooleanSerializer_getInstance(), value.p1d_1);
+    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.k1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 3, BooleanSerializer_getInstance(), value.k1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 4) ? true : !(value.q1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 4, StringSerializer_getInstance(), value.q1d_1);
+    if (tmp1_output.jn(tmp0_desc, 4) ? true : !(value.l1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 4, StringSerializer_getInstance(), value.l1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 5) ? true : !(value.r1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 5, StringSerializer_getInstance(), value.r1d_1);
+    if (tmp1_output.jn(tmp0_desc, 5) ? true : !(value.m1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 5, StringSerializer_getInstance(), value.m1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 6) ? true : !(value.s1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 6, StringSerializer_getInstance(), value.s1d_1);
+    if (tmp1_output.jn(tmp0_desc, 6) ? true : !(value.n1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 6, StringSerializer_getInstance(), value.n1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 7) ? true : !(value.t1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 7, StringSerializer_getInstance(), value.t1d_1);
+    if (tmp1_output.jn(tmp0_desc, 7) ? true : !(value.o1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 7, StringSerializer_getInstance(), value.o1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 8) ? true : !(value.u1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 8, StringSerializer_getInstance(), value.u1d_1);
+    if (tmp1_output.jn(tmp0_desc, 8) ? true : !(value.p1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 8, StringSerializer_getInstance(), value.p1e_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_9).rh = function (encoder, value) {
-    return this.x1g(encoder, value instanceof IngredientsTemplateIngredientsList ? value : THROW_CCE());
+  protoOf($serializer_9).ri = function (encoder, value) {
+    return this.s1h(encoder, value instanceof IngredientsTemplateIngredientsList ? value : THROW_CCE());
   };
-  protoOf($serializer_9).sh = function (decoder) {
-    var tmp0_desc = this.w1g_1;
+  protoOf($serializer_9).si = function (decoder) {
+    var tmp0_desc = this.r1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2863,80 +2869,80 @@
     var tmp10_local6 = null;
     var tmp11_local7 = null;
     var tmp12_local8 = null;
-    var tmp13_input = decoder.nk(tmp0_desc);
-    if (tmp13_input.dl()) {
-      tmp4_local0 = tmp13_input.bl(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
+    var tmp13_input = decoder.nl(tmp0_desc);
+    if (tmp13_input.dm()) {
+      tmp4_local0 = tmp13_input.bm(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp13_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp13_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp13_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp13_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp13_input.bl(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp13_input.bm(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp13_input.bl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+      tmp8_local4 = tmp13_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp13_input.bl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp13_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp13_input.bl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+      tmp10_local6 = tmp13_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp13_input.bl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+      tmp11_local7 = tmp13_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
-      tmp12_local8 = tmp13_input.bl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+      tmp12_local8 = tmp13_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
       tmp3_bitMask0 = tmp3_bitMask0 | 256;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp13_input.el(tmp0_desc);
+        tmp2_index = tmp13_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp13_input.bl(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp13_input.bm(tmp0_desc, 0, $serializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp13_input.bl(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp13_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp13_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp13_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp13_input.bl(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp13_input.bm(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp13_input.bl(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+            tmp8_local4 = tmp13_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp13_input.bl(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp13_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp13_input.bl(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+            tmp10_local6 = tmp13_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp13_input.bl(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+            tmp11_local7 = tmp13_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           case 8:
-            tmp12_local8 = tmp13_input.bl(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+            tmp12_local8 = tmp13_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
             tmp3_bitMask0 = tmp3_bitMask0 | 256;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp13_input.ok(tmp0_desc);
+    tmp13_input.ol(tmp0_desc);
     return IngredientsTemplateIngredientsList_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_9).qh = function () {
-    return this.w1g_1;
+  protoOf($serializer_9).qi = function () {
+    return this.r1h_1;
   };
-  protoOf($serializer_9).yr = function () {
+  protoOf($serializer_9).ys = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2950,44 +2956,44 @@
   }
   function IngredientsTemplateIngredientsList_init_$Init$(seen0, amount, ingredientID, name, optional, prefix, suffix, text, unit, template, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_9().w1g_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_9().r1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.m1d_1 = null;
+      $this.h1e_1 = null;
     else
-      $this.m1d_1 = amount;
+      $this.h1e_1 = amount;
     if (0 === (seen0 & 2))
-      $this.n1d_1 = null;
+      $this.i1e_1 = null;
     else
-      $this.n1d_1 = ingredientID;
+      $this.i1e_1 = ingredientID;
     if (0 === (seen0 & 4))
-      $this.o1d_1 = null;
+      $this.j1e_1 = null;
     else
-      $this.o1d_1 = name;
+      $this.j1e_1 = name;
     if (0 === (seen0 & 8))
-      $this.p1d_1 = null;
+      $this.k1e_1 = null;
     else
-      $this.p1d_1 = optional;
+      $this.k1e_1 = optional;
     if (0 === (seen0 & 16))
-      $this.q1d_1 = null;
+      $this.l1e_1 = null;
     else
-      $this.q1d_1 = prefix;
+      $this.l1e_1 = prefix;
     if (0 === (seen0 & 32))
-      $this.r1d_1 = null;
+      $this.m1e_1 = null;
     else
-      $this.r1d_1 = suffix;
+      $this.m1e_1 = suffix;
     if (0 === (seen0 & 64))
-      $this.s1d_1 = null;
+      $this.n1e_1 = null;
     else
-      $this.s1d_1 = text;
+      $this.n1e_1 = text;
     if (0 === (seen0 & 128))
-      $this.t1d_1 = null;
+      $this.o1e_1 = null;
     else
-      $this.t1d_1 = unit;
+      $this.o1e_1 = unit;
     if (0 === (seen0 & 256))
-      $this.u1d_1 = null;
+      $this.p1e_1 = null;
     else
-      $this.u1d_1 = template;
+      $this.p1e_1 = template;
     return $this;
   }
   function IngredientsTemplateIngredientsList_init_$Create$(seen0, amount, ingredientID, name, optional, prefix, suffix, text, unit, template, serializationConstructorMarker) {
@@ -3003,29 +3009,29 @@
     text = text === VOID ? null : text;
     unit = unit === VOID ? null : unit;
     template = template === VOID ? null : template;
-    this.m1d_1 = amount;
-    this.n1d_1 = ingredientID;
-    this.o1d_1 = name;
-    this.p1d_1 = optional;
-    this.q1d_1 = prefix;
-    this.r1d_1 = suffix;
-    this.s1d_1 = text;
-    this.t1d_1 = unit;
-    this.u1d_1 = template;
+    this.h1e_1 = amount;
+    this.i1e_1 = ingredientID;
+    this.j1e_1 = name;
+    this.k1e_1 = optional;
+    this.l1e_1 = prefix;
+    this.m1e_1 = suffix;
+    this.n1e_1 = text;
+    this.o1e_1 = unit;
+    this.p1e_1 = template;
   }
   protoOf(IngredientsTemplateIngredientsList).toString = function () {
-    return 'IngredientsTemplateIngredientsList(amount=' + toString(this.m1d_1) + ', ingredientID=' + this.n1d_1 + ', name=' + this.o1d_1 + ', optional=' + this.p1d_1 + ', prefix=' + this.q1d_1 + ', suffix=' + this.r1d_1 + ', text=' + this.s1d_1 + ', unit=' + this.t1d_1 + ', template=' + this.u1d_1 + ')';
+    return 'IngredientsTemplateIngredientsList(amount=' + toString(this.h1e_1) + ', ingredientID=' + this.i1e_1 + ', name=' + this.j1e_1 + ', optional=' + this.k1e_1 + ', prefix=' + this.l1e_1 + ', suffix=' + this.m1e_1 + ', text=' + this.n1e_1 + ', unit=' + this.o1e_1 + ', template=' + this.p1e_1 + ')';
   };
   protoOf(IngredientsTemplateIngredientsList).hashCode = function () {
-    var result = this.m1d_1 == null ? 0 : this.m1d_1.hashCode();
-    result = imul(result, 31) + (this.n1d_1 == null ? 0 : getStringHashCode(this.n1d_1)) | 0;
-    result = imul(result, 31) + (this.o1d_1 == null ? 0 : getStringHashCode(this.o1d_1)) | 0;
-    result = imul(result, 31) + (this.p1d_1 == null ? 0 : getBooleanHashCode(this.p1d_1)) | 0;
-    result = imul(result, 31) + (this.q1d_1 == null ? 0 : getStringHashCode(this.q1d_1)) | 0;
-    result = imul(result, 31) + (this.r1d_1 == null ? 0 : getStringHashCode(this.r1d_1)) | 0;
-    result = imul(result, 31) + (this.s1d_1 == null ? 0 : getStringHashCode(this.s1d_1)) | 0;
-    result = imul(result, 31) + (this.t1d_1 == null ? 0 : getStringHashCode(this.t1d_1)) | 0;
-    result = imul(result, 31) + (this.u1d_1 == null ? 0 : getStringHashCode(this.u1d_1)) | 0;
+    var result = this.h1e_1 == null ? 0 : this.h1e_1.hashCode();
+    result = imul(result, 31) + (this.i1e_1 == null ? 0 : getStringHashCode(this.i1e_1)) | 0;
+    result = imul(result, 31) + (this.j1e_1 == null ? 0 : getStringHashCode(this.j1e_1)) | 0;
+    result = imul(result, 31) + (this.k1e_1 == null ? 0 : getBooleanHashCode(this.k1e_1)) | 0;
+    result = imul(result, 31) + (this.l1e_1 == null ? 0 : getStringHashCode(this.l1e_1)) | 0;
+    result = imul(result, 31) + (this.m1e_1 == null ? 0 : getStringHashCode(this.m1e_1)) | 0;
+    result = imul(result, 31) + (this.n1e_1 == null ? 0 : getStringHashCode(this.n1e_1)) | 0;
+    result = imul(result, 31) + (this.o1e_1 == null ? 0 : getStringHashCode(this.o1e_1)) | 0;
+    result = imul(result, 31) + (this.p1e_1 == null ? 0 : getStringHashCode(this.p1e_1)) | 0;
     return result;
   };
   protoOf(IngredientsTemplateIngredientsList).equals = function (other) {
@@ -3033,23 +3039,23 @@
       return true;
     if (!(other instanceof IngredientsTemplateIngredientsList))
       return false;
-    if (!equals(this.m1d_1, other.m1d_1))
+    if (!equals(this.h1e_1, other.h1e_1))
       return false;
-    if (!(this.n1d_1 == other.n1d_1))
+    if (!(this.i1e_1 == other.i1e_1))
       return false;
-    if (!(this.o1d_1 == other.o1d_1))
+    if (!(this.j1e_1 == other.j1e_1))
       return false;
-    if (!(this.p1d_1 == other.p1d_1))
+    if (!(this.k1e_1 == other.k1e_1))
       return false;
-    if (!(this.q1d_1 == other.q1d_1))
+    if (!(this.l1e_1 == other.l1e_1))
       return false;
-    if (!(this.r1d_1 == other.r1d_1))
+    if (!(this.m1e_1 == other.m1e_1))
       return false;
-    if (!(this.s1d_1 == other.s1d_1))
+    if (!(this.n1e_1 == other.n1e_1))
       return false;
-    if (!(this.t1d_1 == other.t1d_1))
+    if (!(this.o1e_1 == other.o1e_1))
       return false;
-    if (!(this.u1d_1 == other.u1d_1))
+    if (!(this.p1e_1 == other.p1e_1))
       return false;
     return true;
   };
@@ -3063,7 +3069,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.y1g_1 = [null, lazy(tmp_0, InstructionsTemplateElement$Companion$$childSerializers$_anonymous__ebx60d), null];
+    tmp.t1h_1 = [null, lazy(tmp_0, InstructionsTemplateElement$Companion$$childSerializers$_anonymous__ebx60d), null];
   }
   var Companion_instance_8;
   function Companion_getInstance_8() {
@@ -3074,79 +3080,79 @@
   function $serializer_10() {
     $serializer_instance_10 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.InstructionsTemplateElement', this, 3);
-    tmp0_serialDesc.wr('descriptionTemplate', false);
-    tmp0_serialDesc.wr('images', true);
-    tmp0_serialDesc.wr('stepNumber', true);
-    this.z1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ws('descriptionTemplate', false);
+    tmp0_serialDesc.ws('images', true);
+    tmp0_serialDesc.ws('stepNumber', true);
+    this.u1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_10).a1h = function (encoder, value) {
-    var tmp0_desc = this.z1g_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_8().y1g_1;
-    tmp1_output.bm(tmp0_desc, 0, value.v1d_1);
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.w1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, tmp2_cached[1].o1(), value.w1d_1);
+  protoOf($serializer_10).v1h = function (encoder, value) {
+    var tmp0_desc = this.u1h_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_8().t1h_1;
+    tmp1_output.bn(tmp0_desc, 0, value.q1e_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.r1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 1, tmp2_cached[1].t1(), value.r1e_1);
     }
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.x1d_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, DoubleSerializer_getInstance(), value.x1d_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.s1e_1 == null)) {
+      tmp1_output.fn(tmp0_desc, 2, DoubleSerializer_getInstance(), value.s1e_1);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_10).rh = function (encoder, value) {
-    return this.a1h(encoder, value instanceof InstructionsTemplateElement ? value : THROW_CCE());
+  protoOf($serializer_10).ri = function (encoder, value) {
+    return this.v1h(encoder, value instanceof InstructionsTemplateElement ? value : THROW_CCE());
   };
-  protoOf($serializer_10).sh = function (decoder) {
-    var tmp0_desc = this.z1g_1;
+  protoOf($serializer_10).si = function (decoder) {
+    var tmp0_desc = this.u1h_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.nk(tmp0_desc);
-    var tmp8_cached = Companion_getInstance_8().y1g_1;
-    if (tmp7_input.dl()) {
-      tmp4_local0 = tmp7_input.xk(tmp0_desc, 0);
+    var tmp7_input = decoder.nl(tmp0_desc);
+    var tmp8_cached = Companion_getInstance_8().t1h_1;
+    if (tmp7_input.dm()) {
+      tmp4_local0 = tmp7_input.xl(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.bl(tmp0_desc, 1, tmp8_cached[1].o1(), tmp5_local1);
+      tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, tmp8_cached[1].t1(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.bl(tmp0_desc, 2, DoubleSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp7_input.bm(tmp0_desc, 2, DoubleSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.el(tmp0_desc);
+        tmp2_index = tmp7_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.xk(tmp0_desc, 0);
+            tmp4_local0 = tmp7_input.xl(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.bl(tmp0_desc, 1, tmp8_cached[1].o1(), tmp5_local1);
+            tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, tmp8_cached[1].t1(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.bl(tmp0_desc, 2, DoubleSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp7_input.bm(tmp0_desc, 2, DoubleSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.ok(tmp0_desc);
+    tmp7_input.ol(tmp0_desc);
     return InstructionsTemplateElement_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_10).qh = function () {
-    return this.z1g_1;
+  protoOf($serializer_10).qi = function () {
+    return this.u1h_1;
   };
-  protoOf($serializer_10).yr = function () {
-    var tmp0_cached = Companion_getInstance_8().y1g_1;
+  protoOf($serializer_10).ys = function () {
+    var tmp0_cached = Companion_getInstance_8().t1h_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    return [StringSerializer_getInstance(), get_nullable(tmp0_cached[1].o1()), get_nullable(DoubleSerializer_getInstance())];
+    return [StringSerializer_getInstance(), get_nullable(tmp0_cached[1].t1()), get_nullable(DoubleSerializer_getInstance())];
   };
   var $serializer_instance_10;
   function $serializer_getInstance_10() {
@@ -3156,17 +3162,17 @@
   }
   function InstructionsTemplateElement_init_$Init$(seen0, descriptionTemplate, images, stepNumber, serializationConstructorMarker, $this) {
     if (!(1 === (1 & seen0))) {
-      throwMissingFieldException(seen0, 1, $serializer_getInstance_10().z1g_1);
+      throwMissingFieldException(seen0, 1, $serializer_getInstance_10().u1h_1);
     }
-    $this.v1d_1 = descriptionTemplate;
+    $this.q1e_1 = descriptionTemplate;
     if (0 === (seen0 & 2))
-      $this.w1d_1 = null;
+      $this.r1e_1 = null;
     else
-      $this.w1d_1 = images;
+      $this.r1e_1 = images;
     if (0 === (seen0 & 4))
-      $this.x1d_1 = null;
+      $this.s1e_1 = null;
     else
-      $this.x1d_1 = stepNumber;
+      $this.s1e_1 = stepNumber;
     return $this;
   }
   function InstructionsTemplateElement_init_$Create$(seen0, descriptionTemplate, images, stepNumber, serializationConstructorMarker) {
@@ -3175,12 +3181,12 @@
   function InstructionsTemplateElement() {
   }
   protoOf(InstructionsTemplateElement).toString = function () {
-    return 'InstructionsTemplateElement(descriptionTemplate=' + this.v1d_1 + ', images=' + toString(this.w1d_1) + ', stepNumber=' + this.x1d_1 + ')';
+    return 'InstructionsTemplateElement(descriptionTemplate=' + this.q1e_1 + ', images=' + toString(this.r1e_1) + ', stepNumber=' + this.s1e_1 + ')';
   };
   protoOf(InstructionsTemplateElement).hashCode = function () {
-    var result = getStringHashCode(this.v1d_1);
-    result = imul(result, 31) + (this.w1d_1 == null ? 0 : hashCode(this.w1d_1)) | 0;
-    result = imul(result, 31) + (this.x1d_1 == null ? 0 : getNumberHashCode(this.x1d_1)) | 0;
+    var result = getStringHashCode(this.q1e_1);
+    result = imul(result, 31) + (this.r1e_1 == null ? 0 : hashCode(this.r1e_1)) | 0;
+    result = imul(result, 31) + (this.s1e_1 == null ? 0 : getNumberHashCode(this.s1e_1)) | 0;
     return result;
   };
   protoOf(InstructionsTemplateElement).equals = function (other) {
@@ -3188,11 +3194,11 @@
       return true;
     if (!(other instanceof InstructionsTemplateElement))
       return false;
-    if (!(this.v1d_1 === other.v1d_1))
+    if (!(this.q1e_1 === other.q1e_1))
       return false;
-    if (!equals(this.w1d_1, other.w1d_1))
+    if (!equals(this.r1e_1, other.r1e_1))
       return false;
-    if (!equals(this.x1d_1, other.x1d_1))
+    if (!equals(this.s1e_1, other.s1e_1))
       return false;
     return true;
   };
@@ -3208,51 +3214,51 @@
     var parts = ArrayList_init_$Create$_0();
     var lastEnd = 0;
     // Inline function 'kotlin.sequences.forEach' call
-    var _iterator__ex2g4s = pattern.fa(template).h();
+    var _iterator__ex2g4s = pattern.va(template).h();
     while (_iterator__ex2g4s.i()) {
       var element = _iterator__ex2g4s.j();
-      if (element.ta().p_1 > lastEnd) {
-        var textPart = substring(template, lastEnd, element.ta().p_1);
+      if (element.jb().p_1 > lastEnd) {
+        var textPart = substring(template, lastEnd, element.jb().p_1);
         // Inline function 'kotlin.text.isNotEmpty' call
         if (charSequenceLength(textPart) > 0) {
           parts.f(new TemplateConst(textPart));
         }
       }
       try {
-        var jsonObj = get_jsonObject(Default_getInstance().b11(element.o1()));
-        if (jsonObj.s1().l1('min')) {
+        var jsonObj = get_jsonObject(Default_getInstance().b12(element.t1()));
+        if (jsonObj.x1().l1('min')) {
           // Inline function 'kotlinx.serialization.json.decodeFromJsonElement' call
           var this_0 = get_tolerantJson();
           // Inline function 'kotlinx.serialization.serializer' call
-          var this_1 = this_0.cl();
+          var this_1 = this_0.cm();
           // 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();
           // Inline function 'kotlin.let' call
-          var it = this_0.a11(tmp$ret$3, jsonObj);
+          var it = this_0.a12(tmp$ret$3, jsonObj);
           parts.f(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.cl();
+          var this_4 = this_3.cm();
           // 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();
           // Inline function 'kotlin.let' call
-          var it_0 = this_3.a11(tmp$ret$8, jsonObj);
+          var it_0 = this_3.a12(tmp$ret$8, jsonObj);
           parts.f(it_0);
         }
       } catch ($p) {
         if ($p instanceof Exception) {
           var e = $p;
-          print('Failed to parse JSON: ' + element.o1() + ', error: ' + e.message);
-          parts.f(new TemplateConst(element.o1()));
+          print('Failed to parse JSON: ' + element.t1() + ', error: ' + e.message);
+          parts.f(new TemplateConst(element.t1()));
         } else {
           throw $p;
         }
       }
-      lastEnd = element.ta().q_1 + 1 | 0;
+      lastEnd = element.jb().q_1 + 1 | 0;
     }
     if (lastEnd < template.length) {
       var remaining = substring_0(template, lastEnd);
@@ -3265,7 +3271,7 @@
   }
   function tolerantJson$lambda($this$Json) {
     _init_properties_Parser_kt__o3jwn5();
-    $this$Json.t11_1 = true;
+    $this$Json.t12_1 = true;
     return Unit_instance;
   }
   var properties_initialized_Parser_kt_5uifb3;
@@ -3275,41 +3281,77 @@
       tolerantJson = Json(VOID, tolerantJson$lambda);
     }
   }
+  function TemplateElement() {
+  }
+  function TemplateConst(value) {
+    this.value = value;
+  }
+  protoOf(TemplateConst).t1 = function () {
+    return this.value;
+  };
+  protoOf(TemplateConst).cd = function () {
+    return this.value;
+  };
+  protoOf(TemplateConst).w1h = function (value) {
+    return new TemplateConst(value);
+  };
+  protoOf(TemplateConst).copy = function (value, $super) {
+    value = value === VOID ? this.value : value;
+    return $super === VOID ? this.w1h(value) : $super.w1h.call(this, value);
+  };
+  protoOf(TemplateConst).toString = function () {
+    return 'TemplateConst(value=' + this.value + ')';
+  };
+  protoOf(TemplateConst).hashCode = function () {
+    return getStringHashCode(this.value);
+  };
+  protoOf(TemplateConst).equals = function (other) {
+    if (this === other)
+      return true;
+    if (!(other instanceof TemplateConst))
+      return false;
+    if (!(this.value === other.value))
+      return false;
+    return true;
+  };
   function Companion_9() {
   }
+  protoOf(Companion_9).n14 = function () {
+    return $serializer_getInstance_11();
+  };
   var Companion_instance_9;
   function Companion_getInstance_9() {
     return Companion_instance_9;
   }
   function $serializer_11() {
     $serializer_instance_11 = this;
-    var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.template.TemplateElement.QuantityPlaceholder', this, 4);
-    tmp0_serialDesc.wr('min', false);
-    tmp0_serialDesc.wr('max', true);
-    tmp0_serialDesc.wr('unit', true);
-    tmp0_serialDesc.wr('scale', true);
-    this.b1h_1 = tmp0_serialDesc;
+    var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.template.QuantityPlaceholder', this, 4);
+    tmp0_serialDesc.ws('min', false);
+    tmp0_serialDesc.ws('max', true);
+    tmp0_serialDesc.ws('unit', true);
+    tmp0_serialDesc.ws('scale', true);
+    this.x1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_11).c1h = function (encoder, value) {
-    var tmp0_desc = this.b1h_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    tmp1_output.yl(tmp0_desc, 0, value.h1c_1);
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.i1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, FloatSerializer_getInstance(), value.i1c_1);
+  protoOf($serializer_11).y1h = function (encoder, value) {
+    var tmp0_desc = this.x1h_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    tmp1_output.ym(tmp0_desc, 0, value.min);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.max == null)) {
+      tmp1_output.fn(tmp0_desc, 1, FloatSerializer_getInstance(), value.max);
     }
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.j1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, StringSerializer_getInstance(), value.j1c_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.unit == null)) {
+      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.unit);
     }
-    if (tmp1_output.jm(tmp0_desc, 3) ? true : !(value.k1c_1 === false)) {
-      tmp1_output.tl(tmp0_desc, 3, value.k1c_1);
+    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.scale === false)) {
+      tmp1_output.tm(tmp0_desc, 3, value.scale);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_11).rh = function (encoder, value) {
-    return this.c1h(encoder, value instanceof QuantityPlaceholder ? value : THROW_CCE());
+  protoOf($serializer_11).ri = function (encoder, value) {
+    return this.y1h(encoder, value instanceof QuantityPlaceholder ? value : THROW_CCE());
   };
-  protoOf($serializer_11).sh = function (decoder) {
-    var tmp0_desc = this.b1h_1;
+  protoOf($serializer_11).si = function (decoder) {
+    var tmp0_desc = this.x1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -3317,50 +3359,50 @@
     var tmp5_local1 = null;
     var tmp6_local2 = null;
     var tmp7_local3 = false;
-    var tmp8_input = decoder.nk(tmp0_desc);
-    if (tmp8_input.dl()) {
-      tmp4_local0 = tmp8_input.uk(tmp0_desc, 0);
+    var tmp8_input = decoder.nl(tmp0_desc);
+    if (tmp8_input.dm()) {
+      tmp4_local0 = tmp8_input.ul(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp8_input.bl(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp8_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp8_input.pk(tmp0_desc, 3);
+      tmp7_local3 = tmp8_input.pl(tmp0_desc, 3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp8_input.el(tmp0_desc);
+        tmp2_index = tmp8_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp8_input.uk(tmp0_desc, 0);
+            tmp4_local0 = tmp8_input.ul(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp8_input.bl(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp8_input.bl(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp8_input.pk(tmp0_desc, 3);
+            tmp7_local3 = tmp8_input.pl(tmp0_desc, 3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp8_input.ok(tmp0_desc);
+    tmp8_input.ol(tmp0_desc);
     return QuantityPlaceholder_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
-  protoOf($serializer_11).qh = function () {
-    return this.b1h_1;
+  protoOf($serializer_11).qi = function () {
+    return this.x1h_1;
   };
-  protoOf($serializer_11).yr = function () {
+  protoOf($serializer_11).ys = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -3374,63 +3416,134 @@
   }
   function QuantityPlaceholder_init_$Init$(seen0, min, max, unit, scale, serializationConstructorMarker, $this) {
     if (!(1 === (1 & seen0))) {
-      throwMissingFieldException(seen0, 1, $serializer_getInstance_11().b1h_1);
+      throwMissingFieldException(seen0, 1, $serializer_getInstance_11().x1h_1);
     }
-    $this.h1c_1 = min;
+    $this.min = min;
     if (0 === (seen0 & 2))
-      $this.i1c_1 = null;
+      $this.max = null;
     else
-      $this.i1c_1 = max;
+      $this.max = max;
     if (0 === (seen0 & 4))
-      $this.j1c_1 = null;
+      $this.unit = null;
     else
-      $this.j1c_1 = unit;
+      $this.unit = unit;
     if (0 === (seen0 & 8))
-      $this.k1c_1 = false;
+      $this.scale = false;
     else
-      $this.k1c_1 = scale;
+      $this.scale = scale;
     return $this;
   }
   function QuantityPlaceholder_init_$Create$(seen0, min, max, unit, scale, serializationConstructorMarker) {
     return QuantityPlaceholder_init_$Init$(seen0, min, max, unit, scale, serializationConstructorMarker, objectCreate(protoOf(QuantityPlaceholder)));
   }
+  function QuantityPlaceholder(min, max, unit, scale) {
+    max = max === VOID ? null : max;
+    unit = unit === VOID ? null : unit;
+    scale = scale === VOID ? false : scale;
+    this.min = min;
+    this.max = max;
+    this.unit = unit;
+    this.scale = scale;
+  }
+  protoOf(QuantityPlaceholder).z1h = function () {
+    return this.min;
+  };
+  protoOf(QuantityPlaceholder).a1i = function () {
+    return this.max;
+  };
+  protoOf(QuantityPlaceholder).b1i = function () {
+    return this.unit;
+  };
+  protoOf(QuantityPlaceholder).c1i = function () {
+    return this.scale;
+  };
+  protoOf(QuantityPlaceholder).cd = function () {
+    return this.min;
+  };
+  protoOf(QuantityPlaceholder).dd = function () {
+    return this.max;
+  };
+  protoOf(QuantityPlaceholder).d1i = function () {
+    return this.unit;
+  };
+  protoOf(QuantityPlaceholder).e1i = function () {
+    return this.scale;
+  };
+  protoOf(QuantityPlaceholder).f1i = function (min, max, unit, scale) {
+    return new QuantityPlaceholder(min, max, unit, scale);
+  };
+  protoOf(QuantityPlaceholder).copy = function (min, max, unit, scale, $super) {
+    min = min === VOID ? this.min : min;
+    max = max === VOID ? this.max : max;
+    unit = unit === VOID ? this.unit : unit;
+    scale = scale === VOID ? this.scale : scale;
+    return $super === VOID ? this.f1i(min, max, unit, scale) : $super.f1i.call(this, min, max, unit, scale);
+  };
+  protoOf(QuantityPlaceholder).toString = function () {
+    return 'QuantityPlaceholder(min=' + this.min + ', max=' + this.max + ', unit=' + this.unit + ', scale=' + this.scale + ')';
+  };
+  protoOf(QuantityPlaceholder).hashCode = function () {
+    var result = getNumberHashCode(this.min);
+    result = imul(result, 31) + (this.max == null ? 0 : getNumberHashCode(this.max)) | 0;
+    result = imul(result, 31) + (this.unit == null ? 0 : getStringHashCode(this.unit)) | 0;
+    result = imul(result, 31) + getBooleanHashCode(this.scale) | 0;
+    return result;
+  };
+  protoOf(QuantityPlaceholder).equals = function (other) {
+    if (this === other)
+      return true;
+    if (!(other instanceof QuantityPlaceholder))
+      return false;
+    if (!equals(this.min, other.min))
+      return false;
+    if (!equals(this.max, other.max))
+      return false;
+    if (!(this.unit == other.unit))
+      return false;
+    if (!(this.scale === other.scale))
+      return false;
+    return true;
+  };
   function Companion_10() {
   }
+  protoOf(Companion_10).n14 = function () {
+    return $serializer_getInstance_12();
+  };
   var Companion_instance_10;
   function Companion_getInstance_10() {
     return Companion_instance_10;
   }
   function $serializer_12() {
     $serializer_instance_12 = this;
-    var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.template.TemplateElement.OvenTemperaturePlaceholder', this, 4);
-    tmp0_serialDesc.wr('temperatureC', true);
-    tmp0_serialDesc.wr('temperatureFanC', true);
-    tmp0_serialDesc.wr('temperatureF', true);
-    tmp0_serialDesc.wr('gasMark', true);
-    this.d1h_1 = tmp0_serialDesc;
+    var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.template.OvenTemperaturePlaceholder', this, 4);
+    tmp0_serialDesc.ws('temperatureC', true);
+    tmp0_serialDesc.ws('temperatureFanC', true);
+    tmp0_serialDesc.ws('temperatureF', true);
+    tmp0_serialDesc.ws('gasMark', true);
+    this.g1i_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_12).e1h = function (encoder, value) {
-    var tmp0_desc = this.d1h_1;
-    var tmp1_output = encoder.nk(tmp0_desc);
-    if (tmp1_output.jm(tmp0_desc, 0) ? true : !(value.d1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 0, IntSerializer_getInstance(), value.d1c_1);
+  protoOf($serializer_12).h1i = function (encoder, value) {
+    var tmp0_desc = this.g1i_1;
+    var tmp1_output = encoder.nl(tmp0_desc);
+    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.temperatureC == null)) {
+      tmp1_output.fn(tmp0_desc, 0, IntSerializer_getInstance(), value.temperatureC);
     }
-    if (tmp1_output.jm(tmp0_desc, 1) ? true : !(value.e1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 1, IntSerializer_getInstance(), value.e1c_1);
+    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.temperatureFanC == null)) {
+      tmp1_output.fn(tmp0_desc, 1, IntSerializer_getInstance(), value.temperatureFanC);
     }
-    if (tmp1_output.jm(tmp0_desc, 2) ? true : !(value.f1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 2, IntSerializer_getInstance(), value.f1c_1);
+    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.temperatureF == null)) {
+      tmp1_output.fn(tmp0_desc, 2, IntSerializer_getInstance(), value.temperatureF);
     }
-    if (tmp1_output.jm(tmp0_desc, 3) ? true : !(value.g1c_1 == null)) {
-      tmp1_output.fm(tmp0_desc, 3, FloatSerializer_getInstance(), value.g1c_1);
+    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.gasMark == null)) {
+      tmp1_output.fn(tmp0_desc, 3, FloatSerializer_getInstance(), value.gasMark);
     }
-    tmp1_output.ok(tmp0_desc);
+    tmp1_output.ol(tmp0_desc);
   };
-  protoOf($serializer_12).rh = function (encoder, value) {
-    return this.e1h(encoder, value instanceof OvenTemperaturePlaceholder ? value : THROW_CCE());
+  protoOf($serializer_12).ri = function (encoder, value) {
+    return this.h1i(encoder, value instanceof OvenTemperaturePlaceholder ? value : THROW_CCE());
   };
-  protoOf($serializer_12).sh = function (decoder) {
-    var tmp0_desc = this.d1h_1;
+  protoOf($serializer_12).si = function (decoder) {
+    var tmp0_desc = this.g1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -3438,50 +3551,50 @@
     var tmp5_local1 = null;
     var tmp6_local2 = null;
     var tmp7_local3 = null;
-    var tmp8_input = decoder.nk(tmp0_desc);
-    if (tmp8_input.dl()) {
-      tmp4_local0 = tmp8_input.bl(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
+    var tmp8_input = decoder.nl(tmp0_desc);
+    if (tmp8_input.dm()) {
+      tmp4_local0 = tmp8_input.bm(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp8_input.bl(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp8_input.bl(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp8_input.bl(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp8_input.bm(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp8_input.el(tmp0_desc);
+        tmp2_index = tmp8_input.em(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp8_input.bl(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp8_input.bm(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp8_input.bl(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp8_input.bl(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp8_input.bl(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp8_input.bm(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp8_input.ok(tmp0_desc);
+    tmp8_input.ol(tmp0_desc);
     return OvenTemperaturePlaceholder_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
-  protoOf($serializer_12).qh = function () {
-    return this.d1h_1;
+  protoOf($serializer_12).qi = function () {
+    return this.g1i_1;
   };
-  protoOf($serializer_12).yr = function () {
+  protoOf($serializer_12).ys = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -3495,99 +3608,81 @@
   }
   function OvenTemperaturePlaceholder_init_$Init$(seen0, temperatureC, temperatureFanC, temperatureF, gasMark, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_12().d1h_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_12().g1i_1);
     }
     if (0 === (seen0 & 1))
-      $this.d1c_1 = null;
+      $this.temperatureC = null;
     else
-      $this.d1c_1 = temperatureC;
+      $this.temperatureC = temperatureC;
     if (0 === (seen0 & 2))
-      $this.e1c_1 = null;
+      $this.temperatureFanC = null;
     else
-      $this.e1c_1 = temperatureFanC;
+      $this.temperatureFanC = temperatureFanC;
     if (0 === (seen0 & 4))
-      $this.f1c_1 = null;
+      $this.temperatureF = null;
     else
-      $this.f1c_1 = temperatureF;
+      $this.temperatureF = temperatureF;
     if (0 === (seen0 & 8))
-      $this.g1c_1 = null;
+      $this.gasMark = null;
     else
-      $this.g1c_1 = gasMark;
+      $this.gasMark = gasMark;
     return $this;
   }
   function OvenTemperaturePlaceholder_init_$Create$(seen0, temperatureC, temperatureFanC, temperatureF, gasMark, serializationConstructorMarker) {
     return OvenTemperaturePlaceholder_init_$Init$(seen0, temperatureC, temperatureFanC, temperatureF, gasMark, serializationConstructorMarker, objectCreate(protoOf(OvenTemperaturePlaceholder)));
   }
-  function TemplateConst(value) {
-    this.l1c_1 = value;
+  function OvenTemperaturePlaceholder(temperatureC, temperatureFanC, temperatureF, gasMark) {
+    temperatureC = temperatureC === VOID ? null : temperatureC;
+    temperatureFanC = temperatureFanC === VOID ? null : temperatureFanC;
+    temperatureF = temperatureF === VOID ? null : temperatureF;
+    gasMark = gasMark === VOID ? null : gasMark;
+    this.temperatureC = temperatureC;
+    this.temperatureFanC = temperatureFanC;
+    this.temperatureF = temperatureF;
+    this.gasMark = gasMark;
   }
-  protoOf(TemplateConst).toString = function () {
-    return 'TemplateConst(value=' + this.l1c_1 + ')';
+  protoOf(OvenTemperaturePlaceholder).i1i = function () {
+    return this.temperatureC;
   };
-  protoOf(TemplateConst).hashCode = function () {
-    return getStringHashCode(this.l1c_1);
+  protoOf(OvenTemperaturePlaceholder).j1i = function () {
+    return this.temperatureFanC;
   };
-  protoOf(TemplateConst).equals = function (other) {
-    if (this === other)
-      return true;
-    if (!(other instanceof TemplateConst))
-      return false;
-    if (!(this.l1c_1 === other.l1c_1))
-      return false;
-    return true;
+  protoOf(OvenTemperaturePlaceholder).k1i = function () {
+    return this.temperatureF;
   };
-  function QuantityPlaceholder(min, max, unit, scale) {
-    max = max === VOID ? null : max;
-    unit = unit === VOID ? null : unit;
-    scale = scale === VOID ? false : scale;
-    this.h1c_1 = min;
-    this.i1c_1 = max;
-    this.j1c_1 = unit;
-    this.k1c_1 = scale;
-  }
-  protoOf(QuantityPlaceholder).toString = function () {
-    return 'QuantityPlaceholder(min=' + this.h1c_1 + ', max=' + this.i1c_1 + ', unit=' + this.j1c_1 + ', scale=' + this.k1c_1 + ')';
+  protoOf(OvenTemperaturePlaceholder).l1i = function () {
+    return this.gasMark;
   };
-  protoOf(QuantityPlaceholder).hashCode = function () {
-    var result = getNumberHashCode(this.h1c_1);
-    result = imul(result, 31) + (this.i1c_1 == null ? 0 : getNumberHashCode(this.i1c_1)) | 0;
-    result = imul(result, 31) + (this.j1c_1 == null ? 0 : getStringHashCode(this.j1c_1)) | 0;
-    result = imul(result, 31) + getBooleanHashCode(this.k1c_1) | 0;
-    return result;
+  protoOf(OvenTemperaturePlaceholder).cd = function () {
+    return this.temperatureC;
   };
-  protoOf(QuantityPlaceholder).equals = function (other) {
-    if (this === other)
-      return true;
-    if (!(other instanceof QuantityPlaceholder))
-      return false;
-    if (!equals(this.h1c_1, other.h1c_1))
-      return false;
-    if (!equals(this.i1c_1, other.i1c_1))
-      return false;
-    if (!(this.j1c_1 == other.j1c_1))
-      return false;
-    if (!(this.k1c_1 === other.k1c_1))
-      return false;
-    return true;
+  protoOf(OvenTemperaturePlaceholder).dd = function () {
+    return this.temperatureFanC;
+  };
+  protoOf(OvenTemperaturePlaceholder).d1i = function () {
+    return this.temperatureF;
+  };
+  protoOf(OvenTemperaturePlaceholder).e1i = function () {
+    return this.gasMark;
+  };
+  protoOf(OvenTemperaturePlaceholder).m1i = function (temperatureC, temperatureFanC, temperatureF, gasMark) {
+    return new OvenTemperaturePlaceholder(temperatureC, temperatureFanC, temperatureF, gasMark);
+  };
+  protoOf(OvenTemperaturePlaceholder).copy = function (temperatureC, temperatureFanC, temperatureF, gasMark, $super) {
+    temperatureC = temperatureC === VOID ? this.temperatureC : temperatureC;
+    temperatureFanC = temperatureFanC === VOID ? this.temperatureFanC : temperatureFanC;
+    temperatureF = temperatureF === VOID ? this.temperatureF : temperatureF;
+    gasMark = gasMark === VOID ? this.gasMark : gasMark;
+    return $super === VOID ? this.m1i(temperatureC, temperatureFanC, temperatureF, gasMark) : $super.m1i.call(this, temperatureC, temperatureFanC, temperatureF, gasMark);
   };
-  function OvenTemperaturePlaceholder(temperatureC, temperatureFanC, temperatureF, gasMark) {
-    temperatureC = temperatureC === VOID ? null : temperatureC;
-    temperatureFanC = temperatureFanC === VOID ? null : temperatureFanC;
-    temperatureF = temperatureF === VOID ? null : temperatureF;
-    gasMark = gasMark === VOID ? null : gasMark;
-    this.d1c_1 = temperatureC;
-    this.e1c_1 = temperatureFanC;
-    this.f1c_1 = temperatureF;
-    this.g1c_1 = gasMark;
-  }
   protoOf(OvenTemperaturePlaceholder).toString = function () {
-    return 'OvenTemperaturePlaceholder(temperatureC=' + this.d1c_1 + ', temperatureFanC=' + this.e1c_1 + ', temperatureF=' + this.f1c_1 + ', gasMark=' + this.g1c_1 + ')';
+    return 'OvenTemperaturePlaceholder(temperatureC=' + this.temperatureC + ', temperatureFanC=' + this.temperatureFanC + ', temperatureF=' + this.temperatureF + ', gasMark=' + this.gasMark + ')';
   };
   protoOf(OvenTemperaturePlaceholder).hashCode = function () {
-    var result = this.d1c_1 == null ? 0 : this.d1c_1;
-    result = imul(result, 31) + (this.e1c_1 == null ? 0 : this.e1c_1) | 0;
-    result = imul(result, 31) + (this.f1c_1 == null ? 0 : this.f1c_1) | 0;
-    result = imul(result, 31) + (this.g1c_1 == null ? 0 : getNumberHashCode(this.g1c_1)) | 0;
+    var result = this.temperatureC == null ? 0 : this.temperatureC;
+    result = imul(result, 31) + (this.temperatureFanC == null ? 0 : this.temperatureFanC) | 0;
+    result = imul(result, 31) + (this.temperatureF == null ? 0 : this.temperatureF) | 0;
+    result = imul(result, 31) + (this.gasMark == null ? 0 : getNumberHashCode(this.gasMark)) | 0;
     return result;
   };
   protoOf(OvenTemperaturePlaceholder).equals = function (other) {
@@ -3595,31 +3690,31 @@
       return true;
     if (!(other instanceof OvenTemperaturePlaceholder))
       return false;
-    if (!(this.d1c_1 == other.d1c_1))
+    if (!(this.temperatureC == other.temperatureC))
       return false;
-    if (!(this.e1c_1 == other.e1c_1))
+    if (!(this.temperatureFanC == other.temperatureFanC))
       return false;
-    if (!(this.f1c_1 == other.f1c_1))
+    if (!(this.temperatureF == other.temperatureF))
       return false;
-    if (!equals(this.g1c_1, other.g1c_1))
+    if (!equals(this.gasMark, other.gasMark))
       return false;
     return true;
   };
   function ParsedTemplate(elements) {
-    this.c1c_1 = elements;
+    this.g1d_1 = elements;
   }
   protoOf(ParsedTemplate).toString = function () {
-    return 'ParsedTemplate(elements=' + toString_0(this.c1c_1) + ')';
+    return 'ParsedTemplate(elements=' + toString_0(this.g1d_1) + ')';
   };
   protoOf(ParsedTemplate).hashCode = function () {
-    return hashCode(this.c1c_1);
+    return hashCode(this.g1d_1);
   };
   protoOf(ParsedTemplate).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof ParsedTemplate))
       return false;
-    if (!equals(this.c1c_1, other.c1c_1))
+    if (!equals(this.g1d_1, other.g1d_1))
       return false;
     return true;
   };
@@ -3628,16 +3723,16 @@
     return tolerantJson_0;
   }
   var tolerantJson_0;
-  function scaleRecipe_0(recipe, factor, unit) {
+  function scaleRecipe(recipe, factor, unit) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
     // 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.cl();
+    var this_1 = this_0.cm();
     // 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.z10(tmp$ret$1, recipe);
+    var parsedRecipe = this_0.z11(tmp$ret$1, recipe);
     var tmp;
     switch (unit) {
       case 'Imperial':
@@ -3650,19 +3745,29 @@
         throw IllegalArgumentException_init_$Create$('Unknown unit: ' + unit);
     }
     var ingredientUnit = tmp;
-    var scaledRecipe = scaleRecipe(parsedRecipe, factor, ingredientUnit);
+    var scaledRecipe = scaleAndConvertUnitRecipe(parsedRecipe, factor, ingredientUnit);
     // Inline function 'kotlinx.serialization.json.Json.encodeToString' call
     var this_3 = Default_getInstance();
     // Inline function 'kotlinx.serialization.serializer' call
-    var this_4 = this_3.cl();
+    var this_4 = this_3.cm();
     // Inline function 'kotlinx.serialization.internal.cast' call
     var this_5 = serializer(this_4, createKType(getKClass(RecipeV2), arrayOf([]), false));
     var tmp$ret$4 = isInterface(this_5, KSerializer) ? this_5 : THROW_CCE();
-    return this_3.y10(tmp$ret$4, scaledRecipe);
+    return this_3.y11(tmp$ret$4, scaledRecipe);
+  }
+  function parseTemplate_0(templateString) {
+    _init_properties_ScaleRecipeJsContract_kt__evtan5();
+    var parsedTemplate = parseTemplate(templateString);
+    return parsedTemplate.g1d_1;
+  }
+  function renderTemplate_0(templateElements) {
+    _init_properties_ScaleRecipeJsContract_kt__evtan5();
+    var template = new ParsedTemplate(templateElements);
+    return renderTemplate(template, 1.0);
   }
   function tolerantJson$lambda_0($this$Json) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
-    $this$Json.t11_1 = true;
+    $this$Json.t12_1 = true;
     return Unit_instance;
   }
   var properties_initialized_ScaleRecipeJsContract_kt_yki7mr;
@@ -3673,20 +3778,20 @@
     }
   }
   //region block: post-declaration
-  protoOf($serializer).zr = typeParametersSerializers;
-  protoOf($serializer_0).zr = typeParametersSerializers;
-  protoOf($serializer_1).zr = typeParametersSerializers;
-  protoOf($serializer_2).zr = typeParametersSerializers;
-  protoOf($serializer_3).zr = typeParametersSerializers;
-  protoOf($serializer_4).zr = typeParametersSerializers;
-  protoOf($serializer_5).zr = typeParametersSerializers;
-  protoOf($serializer_6).zr = typeParametersSerializers;
-  protoOf($serializer_7).zr = typeParametersSerializers;
-  protoOf($serializer_8).zr = typeParametersSerializers;
-  protoOf($serializer_9).zr = typeParametersSerializers;
-  protoOf($serializer_10).zr = typeParametersSerializers;
-  protoOf($serializer_11).zr = typeParametersSerializers;
-  protoOf($serializer_12).zr = typeParametersSerializers;
+  protoOf($serializer).zs = typeParametersSerializers;
+  protoOf($serializer_0).zs = typeParametersSerializers;
+  protoOf($serializer_1).zs = typeParametersSerializers;
+  protoOf($serializer_2).zs = typeParametersSerializers;
+  protoOf($serializer_3).zs = typeParametersSerializers;
+  protoOf($serializer_4).zs = typeParametersSerializers;
+  protoOf($serializer_5).zs = typeParametersSerializers;
+  protoOf($serializer_6).zs = typeParametersSerializers;
+  protoOf($serializer_7).zs = typeParametersSerializers;
+  protoOf($serializer_8).zs = typeParametersSerializers;
+  protoOf($serializer_9).zs = typeParametersSerializers;
+  protoOf($serializer_10).zs = typeParametersSerializers;
+  protoOf($serializer_11).zs = typeParametersSerializers;
+  protoOf($serializer_12).zs = typeParametersSerializers;
   //endregion
   //region block: init
   Imperial_instance = new Imperial();
@@ -3700,13 +3805,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 = {});
+    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;
+    defineProp($com$gu$recipe$template.QuantityPlaceholder, 'Companion', Companion_getInstance_9, VOID, true);
+    $com$gu$recipe$template.OvenTemperaturePlaceholder = OvenTemperaturePlaceholder;
+    defineProp($com$gu$recipe$template.OvenTemperaturePlaceholder, 'Companion', Companion_getInstance_10, VOID, true);
     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_0;
+    $com$gu$recipe$js.scaleRecipe = scaleRecipe;
+    $com$gu$recipe$js.parseTemplate = parseTemplate_0;
+    $com$gu$recipe$js.renderTemplate = renderTemplate_0;
   }
   $jsExportAll$(_);
+  kotlin_kotlin.$jsExportAll$(_);
   //endregion
   return _;
 }(module.exports, require('./kotlin-kotlin-stdlib.js'), require('./kotlinx-serialization-kotlinx-serialization-core.js'), require('./kotlinx-serialization-kotlinx-serialization-json.js')));