@guardian/feast-multiplatform-library 6.0.1 → 7.1.1

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

@@ -3,31 +3,31 @@
   //region block: imports
   var imul = Math.imul;
   var VOID = kotlin_kotlin.$_$.b;
-  var protoOf = kotlin_kotlin.$_$.s7;
+  var protoOf = kotlin_kotlin.$_$.r7;
   var toString = kotlin_kotlin.$_$.qa;
-  var getNumberHashCode = kotlin_kotlin.$_$.s6;
-  var equals = kotlin_kotlin.$_$.q6;
-  var initMetadataForClass = kotlin_kotlin.$_$.w6;
-  var numberToInt = kotlin_kotlin.$_$.q7;
+  var getNumberHashCode = kotlin_kotlin.$_$.r6;
+  var getBooleanHashCode = kotlin_kotlin.$_$.q6;
+  var equals = kotlin_kotlin.$_$.p6;
+  var initMetadataForClass = kotlin_kotlin.$_$.v6;
+  var Regex_init_$Create$ = kotlin_kotlin.$_$.r;
+  var numberToInt = kotlin_kotlin.$_$.p7;
   var Unit_instance = kotlin_kotlin.$_$.k3;
-  var round = kotlin_kotlin.$_$.v7;
-  var initMetadataForObject = kotlin_kotlin.$_$.b7;
+  var round = kotlin_kotlin.$_$.u7;
+  var replace = kotlin_kotlin.$_$.o8;
+  var initMetadataForObject = kotlin_kotlin.$_$.a7;
   var listOfNotNull = kotlin_kotlin.$_$.y4;
   var joinToString = kotlin_kotlin.$_$.t4;
   var noWhenBranchMatchedException = kotlin_kotlin.$_$.oa;
   var collectionSizeOrDefault = kotlin_kotlin.$_$.a4;
   var ArrayList_init_$Create$ = kotlin_kotlin.$_$.d;
-  var _Char___init__impl__6a9atx = kotlin_kotlin.$_$.b1;
-  var charArrayOf = kotlin_kotlin.$_$.j6;
-  var indexOfAny = kotlin_kotlin.$_$.k8;
-  var substring = kotlin_kotlin.$_$.v8;
-  var substring_0 = kotlin_kotlin.$_$.u8;
+  var substring = kotlin_kotlin.$_$.u8;
+  var substringBefore = kotlin_kotlin.$_$.s8;
   var StringSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.o;
   var ArrayListSerializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.o1;
   var get_nullable = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.r;
   var LazyThreadSafetyMode_PUBLICATION_getInstance = kotlin_kotlin.$_$.c;
   var lazy = kotlin_kotlin.$_$.ma;
-  var initMetadataForCompanion = kotlin_kotlin.$_$.x6;
+  var initMetadataForCompanion = kotlin_kotlin.$_$.w6;
   var PluginGeneratedSerialDescriptor = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.u1;
   var BooleanSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.k;
   var THROW_CCE = kotlin_kotlin.$_$.u9;
@@ -35,38 +35,36 @@
   var typeParametersSerializers = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.q1;
   var GeneratedSerializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.r1;
   var throwMissingFieldException = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.x1;
-  var objectCreate = kotlin_kotlin.$_$.r7;
-  var getStringHashCode = kotlin_kotlin.$_$.u6;
-  var hashCode = kotlin_kotlin.$_$.v6;
-  var getBooleanHashCode = kotlin_kotlin.$_$.r6;
+  var objectCreate = kotlin_kotlin.$_$.q7;
+  var getStringHashCode = kotlin_kotlin.$_$.t6;
+  var hashCode = kotlin_kotlin.$_$.u6;
   var DoubleSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.l;
-  var toString_0 = kotlin_kotlin.$_$.u7;
-  var Regex_init_$Create$ = kotlin_kotlin.$_$.r;
+  var toString_0 = kotlin_kotlin.$_$.t7;
   var ArrayList_init_$Create$_0 = kotlin_kotlin.$_$.e;
-  var charSequenceLength = kotlin_kotlin.$_$.n6;
+  var substring_0 = kotlin_kotlin.$_$.v8;
+  var charSequenceLength = kotlin_kotlin.$_$.m6;
   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.$_$.e8;
+  var getKClass = kotlin_kotlin.$_$.d8;
   var arrayOf = kotlin_kotlin.$_$.fa;
-  var createKType = kotlin_kotlin.$_$.c8;
+  var createKType = kotlin_kotlin.$_$.b8;
   var serializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.j2;
   var KSerializer = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.c2;
-  var isInterface = kotlin_kotlin.$_$.j7;
+  var isInterface = kotlin_kotlin.$_$.i7;
   var print = kotlin_kotlin.$_$.q5;
   var Exception = kotlin_kotlin.$_$.p9;
-  var isBlank = kotlin_kotlin.$_$.n8;
+  var isBlank = kotlin_kotlin.$_$.l8;
   var Json = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_json.$_$.b;
-  var initMetadataForInterface = kotlin_kotlin.$_$.z6;
+  var initMetadataForInterface = kotlin_kotlin.$_$.y6;
   var FloatSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.m;
   var IntSerializer_getInstance = kotlin_org_jetbrains_kotlinx_kotlinx_serialization_core.$_$.n;
-  var defineProp = kotlin_kotlin.$_$.p6;
+  var defineProp = kotlin_kotlin.$_$.o6;
   var Enum = kotlin_kotlin.$_$.o9;
   var listOf = kotlin_kotlin.$_$.z4;
   var mapCapacity = kotlin_kotlin.$_$.a5;
-  var coerceAtLeast = kotlin_kotlin.$_$.x7;
+  var coerceAtLeast = kotlin_kotlin.$_$.w7;
   var LinkedHashMap_init_$Create$ = kotlin_kotlin.$_$.m;
   var plus = kotlin_kotlin.$_$.c5;
-  var Pair = kotlin_kotlin.$_$.s9;
   var IllegalArgumentException_init_$Create$ = kotlin_kotlin.$_$.w;
   //endregion
   //region block: pre-declaration
@@ -112,29 +110,33 @@
   initMetadataForObject(Units, 'Units');
   initMetadataForObject(UnitConversion, 'UnitConversion');
   //endregion
-  function Amount(min, max, unit) {
+  function Amount(min, max, unit, usCust) {
     max = max === VOID ? null : max;
     unit = unit === VOID ? null : unit;
-    this.g1d_1 = min;
-    this.h1d_1 = max;
-    this.i1d_1 = unit;
-  }
-  protoOf(Amount).j1d = function (min, max, unit) {
-    return new Amount(min, max, unit);
-  };
-  protoOf(Amount).k1d = function (min, max, unit, $super) {
-    min = min === VOID ? this.g1d_1 : min;
-    max = max === VOID ? this.h1d_1 : max;
-    unit = unit === VOID ? this.i1d_1 : unit;
-    return $super === VOID ? this.j1d(min, max, unit) : $super.j1d.call(this, min, max, unit);
+    usCust = usCust === VOID ? null : usCust;
+    this.m1d_1 = min;
+    this.n1d_1 = max;
+    this.o1d_1 = unit;
+    this.p1d_1 = usCust;
+  }
+  protoOf(Amount).q1d = function (min, max, unit, usCust) {
+    return new Amount(min, max, unit, usCust);
+  };
+  protoOf(Amount).r1d = function (min, max, unit, usCust, $super) {
+    min = min === VOID ? this.m1d_1 : min;
+    max = max === VOID ? this.n1d_1 : max;
+    unit = unit === VOID ? this.o1d_1 : unit;
+    usCust = usCust === VOID ? this.p1d_1 : usCust;
+    return $super === VOID ? this.q1d(min, max, unit, usCust) : $super.q1d.call(this, min, max, unit, usCust);
   };
   protoOf(Amount).toString = function () {
-    return 'Amount(min=' + this.g1d_1 + ', max=' + this.h1d_1 + ', unit=' + toString(this.i1d_1) + ')';
+    return 'Amount(min=' + this.m1d_1 + ', max=' + this.n1d_1 + ', unit=' + toString(this.o1d_1) + ', usCust=' + this.p1d_1 + ')';
   };
   protoOf(Amount).hashCode = function () {
-    var result = getNumberHashCode(this.g1d_1);
-    result = imul(result, 31) + (this.h1d_1 == null ? 0 : getNumberHashCode(this.h1d_1)) | 0;
-    result = imul(result, 31) + (this.i1d_1 == null ? 0 : this.i1d_1.hashCode()) | 0;
+    var result = getNumberHashCode(this.m1d_1);
+    result = imul(result, 31) + (this.n1d_1 == null ? 0 : getNumberHashCode(this.n1d_1)) | 0;
+    result = imul(result, 31) + (this.o1d_1 == null ? 0 : this.o1d_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.p1d_1 == null ? 0 : getBooleanHashCode(this.p1d_1)) | 0;
     return result;
   };
   protoOf(Amount).equals = function (other) {
@@ -142,56 +144,63 @@
       return true;
     if (!(other instanceof Amount))
       return false;
-    if (!equals(this.g1d_1, other.g1d_1))
+    if (!equals(this.m1d_1, other.m1d_1))
+      return false;
+    if (!equals(this.n1d_1, other.n1d_1))
       return false;
-    if (!equals(this.h1d_1, other.h1d_1))
+    if (!equals(this.o1d_1, other.o1d_1))
       return false;
-    if (!equals(this.i1d_1, other.i1d_1))
+    if (!(this.p1d_1 == other.p1d_1))
       return false;
     return true;
   };
+  function FormatUtils$applySmartPunctuation$lambda(matchResult) {
+    return '\u201C' + matchResult.ub().l(2) + '\u201D';
+  }
   function FormatUtils() {
+    FormatUtils_instance = this;
+    this.s1d_1 = Regex_init_$Create$('(["])(.*?)(["])');
   }
-  protoOf(FormatUtils).l1d = function (number) {
+  protoOf(FormatUtils).t1d = function (number) {
+    if (number === 0.0)
+      return '0';
     var integerPart = numberToInt(number);
+    var integerPartStr = integerPart > 0 ? integerPart.toString() : '';
     var fractionalPart = number - integerPart;
-    var fractionString = (0.12 <= fractionalPart ? fractionalPart <= 0.13 : false) ? '\u215B' : (0.33 <= fractionalPart ? fractionalPart <= 0.34 : false) ? '\u2153' : (0.66 <= fractionalPart ? fractionalPart <= 0.67 : false) ? '\u2154' : fractionalPart === 0.25 ? '\xBC' : fractionalPart === 0.5 ? '\xBD' : fractionalPart === 0.75 ? '\xBE' : null;
-    var tmp;
-    if (!(fractionString == null)) {
-      var tmp_0;
-      if (integerPart > 0) {
-        tmp_0 = '' + integerPart + fractionString;
+    return (0.0 <= fractionalPart ? fractionalPart <= 0.0625 : false) ? integerPartStr : (0.0625 <= fractionalPart ? fractionalPart <= 0.1875 : false) ? integerPartStr + '\u215B' : (0.1875 <= fractionalPart ? fractionalPart <= 0.291667 : false) ? integerPartStr + '\xBC' : (0.291667 <= fractionalPart ? fractionalPart <= 0.354167 : false) ? integerPartStr + '\u2153' : (0.354167 <= fractionalPart ? fractionalPart <= 0.4375 : false) ? integerPartStr + '\u215C' : (0.4375 <= fractionalPart ? fractionalPart <= 0.5625 : false) ? integerPartStr + '\xBD' : (0.5625 <= fractionalPart ? fractionalPart <= 0.645833 : false) ? integerPartStr + '\u215D' : (0.645833 <= fractionalPart ? fractionalPart <= 0.708333 : false) ? integerPartStr + '\u2154' : (0.708333 <= fractionalPart ? fractionalPart <= 0.8125 : false) ? integerPartStr + '\xBE' : (0.8125 <= fractionalPart ? fractionalPart <= 0.9375 : false) ? integerPartStr + '\u215E' : '' + (integerPart + 1 | 0);
+  };
+  protoOf(FormatUtils).u1d = function (number, decimals, fraction) {
+    if (fraction) {
+      return this.t1d(number);
+    } else {
+      var multiplier = 1.0;
+      // Inline function 'kotlin.repeat' call
+      var inductionVariable = 0;
+      if (inductionVariable < decimals)
+        do {
+          var index = inductionVariable;
+          inductionVariable = inductionVariable + 1 | 0;
+          multiplier = multiplier * 10;
+        }
+         while (inductionVariable < decimals);
+      var roundedNumber = round(number * multiplier) / multiplier;
+      var tmp;
+      if (roundedNumber % 1.0 === 0.0) {
+        tmp = numberToInt(roundedNumber).toString();
       } else {
-        tmp_0 = fractionString;
+        tmp = roundedNumber.toString();
       }
-      tmp = tmp_0;
-    } else {
-      tmp = number.toString();
+      return tmp;
     }
-    return tmp;
   };
-  protoOf(FormatUtils).m1d = function (number, decimals, fraction) {
-    var multiplier = 1.0;
-    // Inline function 'kotlin.repeat' call
-    var inductionVariable = 0;
-    if (inductionVariable < decimals)
-      do {
-        var index = inductionVariable;
-        inductionVariable = inductionVariable + 1 | 0;
-        multiplier = multiplier * 10;
-      }
-       while (inductionVariable < decimals);
-    var roundedNumber = round(number * multiplier) / multiplier;
-    if (roundedNumber % 1.0 === 0.0) {
-      return numberToInt(roundedNumber).toString();
-    }
-    if (fraction) {
-      return this.l1d(roundedNumber);
-    }
-    return roundedNumber.toString();
+  protoOf(FormatUtils).v1d = function (text) {
+    var withQuotes = this.s1d_1.za(text, FormatUtils$applySmartPunctuation$lambda);
+    return replace(replace(withQuotes, "'", '\u2019'), ' - ', ' \u2013 ');
   };
   var FormatUtils_instance;
   function FormatUtils_getInstance() {
+    if (FormatUtils_instance == null)
+      new FormatUtils();
     return FormatUtils_instance;
   }
   function renderOvenTemperature(element) {
@@ -232,7 +241,7 @@
       tmp_5 = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp_5 = '/gas mark ' + FormatUtils_instance.l1d(tmp3_safe_receiver);
+      tmp_5 = '/gas mark ' + FormatUtils_getInstance().t1d(tmp3_safe_receiver);
     }
     return joinToString(listOfNotNull([tmp_2, fanTempC, tmp_4, tmp_5]), '');
   }
@@ -240,8 +249,8 @@
     if (!shouldScale) {
       return amount;
     }
-    var tmp = amount.g1d_1 * factor;
-    var tmp0_safe_receiver = amount.h1d_1;
+    var tmp = amount.m1d_1 * factor;
+    var tmp0_safe_receiver = amount.n1d_1;
     var tmp_0;
     if (tmp0_safe_receiver == null) {
       tmp_0 = null;
@@ -249,7 +258,7 @@
       // Inline function 'kotlin.let' call
       tmp_0 = tmp0_safe_receiver * factor;
     }
-    return amount.k1d(tmp, tmp_0);
+    return amount.r1d(tmp, tmp_0);
   }
   function renderQuantity(element, factor, measuringSystem) {
     var tmp = !(element.min === element.max) ? element.max : null;
@@ -259,40 +268,40 @@
       tmp_0 = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp_0 = Units_getInstance().d1e(tmp0_safe_receiver);
+      tmp_0 = Units_getInstance().m1e(tmp0_safe_receiver);
     }
-    var amount = new Amount(element.min, tmp, tmp_0);
+    var amount = new Amount(element.min, tmp, tmp_0, element.usCust);
     amount = scaleAmount(amount, factor, element.scale);
-    amount = UnitConversion_instance.g1e(amount, measuringSystem);
-    var tmp1_subject = amount.i1d_1;
-    var decimals = equals(tmp1_subject, Units_getInstance().n1d_1) || (equals(tmp1_subject, Units_getInstance().r1d_1) || equals(tmp1_subject, Units_getInstance().x1d_1)) ? 0 : equals(tmp1_subject, Units_getInstance().y1d_1) || equals(tmp1_subject, Units_getInstance().z1d_1) ? 1 : 2;
-    var tmp2_subject = amount.i1d_1;
-    var fraction = equals(tmp2_subject, Units_getInstance().v1d_1) || (equals(tmp2_subject, Units_getInstance().w1d_1) || equals(tmp2_subject, Units_getInstance().u1d_1)) ? true : tmp2_subject == null ? true : false;
+    amount = UnitConversion_instance.q1e(amount, measuringSystem);
+    var tmp1_subject = amount.o1d_1;
+    var decimals = equals(tmp1_subject, Units_getInstance().w1d_1) || (equals(tmp1_subject, Units_getInstance().a1e_1) || equals(tmp1_subject, Units_getInstance().g1e_1)) ? 0 : equals(tmp1_subject, Units_getInstance().h1e_1) || equals(tmp1_subject, Units_getInstance().i1e_1) ? 1 : 2;
+    var tmp2_subject = amount.o1d_1;
+    var fraction = equals(tmp2_subject, Units_getInstance().e1e_1) || (equals(tmp2_subject, Units_getInstance().f1e_1) || equals(tmp2_subject, Units_getInstance().d1e_1)) ? true : tmp2_subject == null ? true : false;
     var tmp_1;
-    if (!(amount.i1d_1 == null)) {
+    if (!(amount.o1d_1 == null)) {
       var tmp_2;
-      var tmp0 = amount.g1d_1;
-      var tmp3_elvis_lhs = amount.h1d_1;
+      var tmp0 = amount.m1d_1;
+      var tmp3_elvis_lhs = amount.n1d_1;
       // Inline function 'kotlin.math.max' call
-      var b = tmp3_elvis_lhs == null ? amount.g1d_1 : tmp3_elvis_lhs;
+      var b = tmp3_elvis_lhs == null ? amount.m1d_1 : tmp3_elvis_lhs;
       if (Math.max(tmp0, b) > 1) {
-        tmp_2 = ' ' + amount.i1d_1.k1e_1;
+        tmp_2 = ' ' + amount.o1d_1.u1e_1;
       } else {
-        tmp_2 = ' ' + amount.i1d_1.j1e_1;
+        tmp_2 = ' ' + amount.o1d_1.t1e_1;
       }
       tmp_1 = tmp_2;
     } else {
       tmp_1 = '';
     }
     var unitString = tmp_1;
-    var tmp_3 = FormatUtils_instance.m1d(amount.g1d_1, decimals, fraction);
-    var tmp4_safe_receiver = amount.h1d_1;
+    var tmp_3 = FormatUtils_getInstance().u1d(amount.m1d_1, decimals, fraction);
+    var tmp4_safe_receiver = amount.n1d_1;
     var tmp_4;
     if (tmp4_safe_receiver == null) {
       tmp_4 = null;
     } else {
       // Inline function 'kotlin.let' call
-      tmp_4 = '-' + FormatUtils_instance.m1d(tmp4_safe_receiver, decimals, fraction);
+      tmp_4 = '-' + FormatUtils_getInstance().u1d(tmp4_safe_receiver, decimals, fraction);
     }
     return joinToString(listOfNotNull([tmp_3, tmp_4, unitString]), '');
   }
@@ -315,7 +324,7 @@
   }
   function renderTemplate(template, factor, measuringSystem) {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = template.n1e_1;
+    var this_0 = template.x1e_1;
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var _iterator__ex2g4s = this_0.h();
@@ -325,22 +334,15 @@
       destination.f(tmp$ret$0);
     }
     var renderedParts = destination;
-    return joinToString(renderedParts, '');
+    return FormatUtils_getInstance().v1d(joinToString(renderedParts, ''));
   }
   function wrapWithStrongTag(value) {
-    // Inline function 'kotlin.charArrayOf' call
-    var separators = charArrayOf([_Char___init__impl__6a9atx(44), _Char___init__impl__6a9atx(59), _Char___init__impl__6a9atx(40)]);
-    var index = indexOfAny(value, separators);
-    if (!(index === -1)) {
-      var before = substring(value, 0, index);
-      var after = substring_0(value, index);
-      return '<strong>' + before + '<\/strong>' + after;
-    } else {
-      return '<strong>' + value + '<\/strong>';
-    }
+    var before = ingredientWithoutSuffix(value);
+    var after = substring(value, before.length);
+    return '<strong>' + before + '<\/strong>' + after;
   }
   function scaleAndConvertUnitRecipe(recipe, factor, measuringSystem) {
-    var tmp0_safe_receiver = recipe.a1f_1;
+    var tmp0_safe_receiver = recipe.k1f_1;
     var tmp;
     if (tmp0_safe_receiver == null) {
       tmp = null;
@@ -351,7 +353,7 @@
       var _iterator__ex2g4s = tmp0_safe_receiver.h();
       while (_iterator__ex2g4s.i()) {
         var item = _iterator__ex2g4s.j();
-        var tmp0_safe_receiver_0 = item.l1f_1;
+        var tmp0_safe_receiver_0 = item.v1f_1;
         var tmp_0;
         if (tmp0_safe_receiver_0 == null) {
           tmp_0 = null;
@@ -362,7 +364,7 @@
           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.t1f_1;
+            var tmp0_safe_receiver_1 = item_0.d1g_1;
             var tmp_1;
             if (tmp0_safe_receiver_1 == null) {
               tmp_1 = null;
@@ -371,19 +373,19 @@
               tmp_1 = wrapWithStrongTag(renderTemplate(parseTemplate(tmp0_safe_receiver_1), factor, measuringSystem));
             }
             var tmp1_elvis_lhs = tmp_1;
-            var scaledText = tmp1_elvis_lhs == null ? item_0.u1f_1 : tmp1_elvis_lhs;
-            var tmp$ret$2 = item_0.w1f(VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledText);
+            var scaledText = tmp1_elvis_lhs == null ? item_0.e1g_1 : tmp1_elvis_lhs;
+            var tmp$ret$2 = item_0.g1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledText);
             destination_0.f(tmp$ret$2);
           }
           tmp_0 = destination_0;
         }
-        var tmp$ret$5 = new IngredientsList(tmp_0, item.m1f_1);
+        var tmp$ret$5 = new IngredientsList(tmp_0, item.w1f_1);
         destination.f(tmp$ret$5);
       }
       tmp = destination;
     }
     var scaledIngredients = tmp;
-    var tmp1_safe_receiver = recipe.b1f_1;
+    var tmp1_safe_receiver = recipe.l1f_1;
     var tmp_2;
     if (tmp1_safe_receiver == null) {
       tmp_2 = null;
@@ -394,7 +396,7 @@
       var _iterator__ex2g4s_1 = tmp1_safe_receiver.h();
       while (_iterator__ex2g4s_1.i()) {
         var item_1 = _iterator__ex2g4s_1.j();
-        var tmp0_safe_receiver_2 = item_1.y1f_1;
+        var tmp0_safe_receiver_2 = item_1.i1g_1;
         var tmp_3;
         if (tmp0_safe_receiver_2 == null) {
           tmp_3 = null;
@@ -403,13 +405,16 @@
           tmp_3 = renderTemplate(parseTemplate(tmp0_safe_receiver_2), factor, measuringSystem);
         }
         var description = tmp_3;
-        var tmp$ret$10 = item_1.b1g(description == null ? item_1.x1f_1 : description);
+        var tmp$ret$10 = item_1.l1g(description == null ? item_1.h1g_1 : description);
         destination_1.f(tmp$ret$10);
       }
       tmp_2 = destination_1;
     }
     var scaledInstructions = tmp_2;
-    return recipe.c1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledIngredients, scaledInstructions);
+    return recipe.m1g(VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, VOID, scaledIngredients, scaledInstructions);
+  }
+  function ingredientWithoutSuffix(renderedTemplate) {
+    return substringBefore(renderedTemplate, ',');
   }
   function RecipeV3$Companion$$childSerializers$_anonymous__7om4qn() {
     return new ArrayListSerializer(StringSerializer_getInstance());
@@ -481,7 +486,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.d1g_1 = [null, tmp_1, null, tmp_3, tmp_5, null, tmp_7, tmp_9, null, null, null, null, tmp_11, tmp_13, null, tmp_15, tmp_17, tmp_19, tmp_21, tmp_23, null, lazy(tmp_24, RecipeV3$Companion$$childSerializers$_anonymous__7om4qn_11), null];
+    tmp.n1g_1 = [null, tmp_1, null, tmp_3, tmp_5, null, tmp_7, tmp_9, null, null, null, null, tmp_11, tmp_13, null, tmp_15, tmp_17, tmp_19, tmp_21, tmp_23, null, lazy(tmp_24, RecipeV3$Companion$$childSerializers$_anonymous__7om4qn_11), null];
   }
   var Companion_instance;
   function Companion_getInstance() {
@@ -492,109 +497,109 @@
   function $serializer() {
     $serializer_instance = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.RecipeV3', this, 23);
-    tmp0_serialDesc.ws('bookCredit', true);
-    tmp0_serialDesc.ws('byline', true);
-    tmp0_serialDesc.ws('canonicalArticle', true);
-    tmp0_serialDesc.ws('celebrationIds', true);
-    tmp0_serialDesc.ws('commerceCtas', 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.e1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ct('bookCredit', true);
+    tmp0_serialDesc.ct('byline', true);
+    tmp0_serialDesc.ct('canonicalArticle', true);
+    tmp0_serialDesc.ct('celebrationIds', true);
+    tmp0_serialDesc.ct('commerceCtas', true);
+    tmp0_serialDesc.ct('composerId', true);
+    tmp0_serialDesc.ct('contributors', true);
+    tmp0_serialDesc.ct('cuisineIds', true);
+    tmp0_serialDesc.ct('description', true);
+    tmp0_serialDesc.ct('difficultyLevel', true);
+    tmp0_serialDesc.ct('featuredImage', true);
+    tmp0_serialDesc.ct('id', false);
+    tmp0_serialDesc.ct('ingredients', true);
+    tmp0_serialDesc.ct('instructions', true);
+    tmp0_serialDesc.ct('isAppReady', true);
+    tmp0_serialDesc.ct('mealTypeIds', true);
+    tmp0_serialDesc.ct('serves', true);
+    tmp0_serialDesc.ct('suitableForDietIds', true);
+    tmp0_serialDesc.ct('techniquesUsedIds', true);
+    tmp0_serialDesc.ct('timings', true);
+    tmp0_serialDesc.ct('title', true);
+    tmp0_serialDesc.ct('utensilsAndApplianceIds', true);
+    tmp0_serialDesc.ct('webPublicationDate', true);
+    this.o1g_1 = tmp0_serialDesc;
   }
-  protoOf($serializer).f1g = function (encoder, value) {
-    var tmp0_desc = this.e1g_1;
-    var tmp1_output = encoder.nl(tmp0_desc);
-    var tmp2_cached = Companion_getInstance().d1g_1;
-    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.o1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 0, StringSerializer_getInstance(), value.o1e_1);
+  protoOf($serializer).p1g = function (encoder, value) {
+    var tmp0_desc = this.o1g_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance().n1g_1;
+    if (tmp1_output.pn(tmp0_desc, 0) ? true : !(value.y1e_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 0, StringSerializer_getInstance(), value.y1e_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.p1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 1, tmp2_cached[1].t1(), value.p1e_1);
+    if (tmp1_output.pn(tmp0_desc, 1) ? true : !(value.z1e_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 1, tmp2_cached[1].t1(), value.z1e_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.q1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.q1e_1);
+    if (tmp1_output.pn(tmp0_desc, 2) ? true : !(value.a1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 2, StringSerializer_getInstance(), value.a1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.r1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 3, tmp2_cached[3].t1(), value.r1e_1);
+    if (tmp1_output.pn(tmp0_desc, 3) ? true : !(value.b1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 3, tmp2_cached[3].t1(), value.b1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 4) ? true : !(value.s1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 4, tmp2_cached[4].t1(), value.s1e_1);
+    if (tmp1_output.pn(tmp0_desc, 4) ? true : !(value.c1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 4, tmp2_cached[4].t1(), value.c1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 5) ? true : !(value.t1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 5, StringSerializer_getInstance(), value.t1e_1);
+    if (tmp1_output.pn(tmp0_desc, 5) ? true : !(value.d1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 5, StringSerializer_getInstance(), value.d1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 6) ? true : !(value.u1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 6, tmp2_cached[6].t1(), value.u1e_1);
+    if (tmp1_output.pn(tmp0_desc, 6) ? true : !(value.e1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 6, tmp2_cached[6].t1(), value.e1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 7) ? true : !(value.v1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 7, tmp2_cached[7].t1(), value.v1e_1);
+    if (tmp1_output.pn(tmp0_desc, 7) ? true : !(value.f1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 7, tmp2_cached[7].t1(), value.f1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 8) ? true : !(value.w1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 8, StringSerializer_getInstance(), value.w1e_1);
+    if (tmp1_output.pn(tmp0_desc, 8) ? true : !(value.g1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 8, StringSerializer_getInstance(), value.g1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 9) ? true : !(value.x1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 9, StringSerializer_getInstance(), value.x1e_1);
+    if (tmp1_output.pn(tmp0_desc, 9) ? true : !(value.h1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 9, StringSerializer_getInstance(), value.h1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 10) ? true : !(value.y1e_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 10, $serializer_getInstance_1(), value.y1e_1);
+    if (tmp1_output.pn(tmp0_desc, 10) ? true : !(value.i1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 10, $serializer_getInstance_1(), value.i1f_1);
     }
-    tmp1_output.bn(tmp0_desc, 11, value.z1e_1);
-    if (tmp1_output.jn(tmp0_desc, 12) ? true : !(value.a1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 12, tmp2_cached[12].t1(), value.a1f_1);
+    tmp1_output.hn(tmp0_desc, 11, value.j1f_1);
+    if (tmp1_output.pn(tmp0_desc, 12) ? true : !(value.k1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 12, tmp2_cached[12].t1(), value.k1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 13) ? true : !(value.b1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 13, tmp2_cached[13].t1(), value.b1f_1);
+    if (tmp1_output.pn(tmp0_desc, 13) ? true : !(value.l1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 13, tmp2_cached[13].t1(), value.l1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 14) ? true : !(value.c1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 14, BooleanSerializer_getInstance(), value.c1f_1);
+    if (tmp1_output.pn(tmp0_desc, 14) ? true : !(value.m1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 14, BooleanSerializer_getInstance(), value.m1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 15) ? true : !(value.d1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 15, tmp2_cached[15].t1(), value.d1f_1);
+    if (tmp1_output.pn(tmp0_desc, 15) ? true : !(value.n1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 15, tmp2_cached[15].t1(), value.n1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 16) ? true : !(value.e1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 16, tmp2_cached[16].t1(), value.e1f_1);
+    if (tmp1_output.pn(tmp0_desc, 16) ? true : !(value.o1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 16, tmp2_cached[16].t1(), value.o1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 17) ? true : !(value.f1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 17, tmp2_cached[17].t1(), value.f1f_1);
+    if (tmp1_output.pn(tmp0_desc, 17) ? true : !(value.p1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 17, tmp2_cached[17].t1(), value.p1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 18) ? true : !(value.g1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 18, tmp2_cached[18].t1(), value.g1f_1);
+    if (tmp1_output.pn(tmp0_desc, 18) ? true : !(value.q1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 18, tmp2_cached[18].t1(), value.q1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 19) ? true : !(value.h1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 19, tmp2_cached[19].t1(), value.h1f_1);
+    if (tmp1_output.pn(tmp0_desc, 19) ? true : !(value.r1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 19, tmp2_cached[19].t1(), value.r1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 20) ? true : !(value.i1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 20, StringSerializer_getInstance(), value.i1f_1);
+    if (tmp1_output.pn(tmp0_desc, 20) ? true : !(value.s1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 20, StringSerializer_getInstance(), value.s1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 21) ? true : !(value.j1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 21, tmp2_cached[21].t1(), value.j1f_1);
+    if (tmp1_output.pn(tmp0_desc, 21) ? true : !(value.t1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 21, tmp2_cached[21].t1(), value.t1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 22) ? true : !(value.k1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 22, StringSerializer_getInstance(), value.k1f_1);
+    if (tmp1_output.pn(tmp0_desc, 22) ? true : !(value.u1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 22, StringSerializer_getInstance(), value.u1f_1);
     }
-    tmp1_output.ol(tmp0_desc);
+    tmp1_output.ul(tmp0_desc);
   };
-  protoOf($serializer).ri = function (encoder, value) {
-    return this.f1g(encoder, value instanceof RecipeV3 ? value : THROW_CCE());
+  protoOf($serializer).xi = function (encoder, value) {
+    return this.p1g(encoder, value instanceof RecipeV3 ? value : THROW_CCE());
   };
-  protoOf($serializer).si = function (decoder) {
-    var tmp0_desc = this.e1g_1;
+  protoOf($serializer).yi = function (decoder) {
+    var tmp0_desc = this.o1g_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -621,166 +626,166 @@
     var tmp24_local20 = null;
     var tmp25_local21 = null;
     var tmp26_local22 = null;
-    var tmp27_input = decoder.nl(tmp0_desc);
-    var tmp28_cached = Companion_getInstance().d1g_1;
-    if (tmp27_input.dm()) {
-      tmp4_local0 = tmp27_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+    var tmp27_input = decoder.tl(tmp0_desc);
+    var tmp28_cached = Companion_getInstance().n1g_1;
+    if (tmp27_input.jm()) {
+      tmp4_local0 = tmp27_input.hm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp27_input.bm(tmp0_desc, 1, tmp28_cached[1].t1(), tmp5_local1);
+      tmp5_local1 = tmp27_input.hm(tmp0_desc, 1, tmp28_cached[1].t1(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp27_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp27_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp27_input.bm(tmp0_desc, 3, tmp28_cached[3].t1(), tmp7_local3);
+      tmp7_local3 = tmp27_input.hm(tmp0_desc, 3, tmp28_cached[3].t1(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp27_input.bm(tmp0_desc, 4, tmp28_cached[4].t1(), tmp8_local4);
+      tmp8_local4 = tmp27_input.hm(tmp0_desc, 4, tmp28_cached[4].t1(), tmp8_local4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp27_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp27_input.hm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp27_input.bm(tmp0_desc, 6, tmp28_cached[6].t1(), tmp10_local6);
+      tmp10_local6 = tmp27_input.hm(tmp0_desc, 6, tmp28_cached[6].t1(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp27_input.bm(tmp0_desc, 7, tmp28_cached[7].t1(), tmp11_local7);
+      tmp11_local7 = tmp27_input.hm(tmp0_desc, 7, tmp28_cached[7].t1(), tmp11_local7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
-      tmp12_local8 = tmp27_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+      tmp12_local8 = tmp27_input.hm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
       tmp3_bitMask0 = tmp3_bitMask0 | 256;
-      tmp13_local9 = tmp27_input.bm(tmp0_desc, 9, StringSerializer_getInstance(), tmp13_local9);
+      tmp13_local9 = tmp27_input.hm(tmp0_desc, 9, StringSerializer_getInstance(), tmp13_local9);
       tmp3_bitMask0 = tmp3_bitMask0 | 512;
-      tmp14_local10 = tmp27_input.bm(tmp0_desc, 10, $serializer_getInstance_1(), tmp14_local10);
+      tmp14_local10 = tmp27_input.hm(tmp0_desc, 10, $serializer_getInstance_1(), tmp14_local10);
       tmp3_bitMask0 = tmp3_bitMask0 | 1024;
-      tmp15_local11 = tmp27_input.xl(tmp0_desc, 11);
+      tmp15_local11 = tmp27_input.dm(tmp0_desc, 11);
       tmp3_bitMask0 = tmp3_bitMask0 | 2048;
-      tmp16_local12 = tmp27_input.bm(tmp0_desc, 12, tmp28_cached[12].t1(), tmp16_local12);
+      tmp16_local12 = tmp27_input.hm(tmp0_desc, 12, tmp28_cached[12].t1(), tmp16_local12);
       tmp3_bitMask0 = tmp3_bitMask0 | 4096;
-      tmp17_local13 = tmp27_input.bm(tmp0_desc, 13, tmp28_cached[13].t1(), tmp17_local13);
+      tmp17_local13 = tmp27_input.hm(tmp0_desc, 13, tmp28_cached[13].t1(), tmp17_local13);
       tmp3_bitMask0 = tmp3_bitMask0 | 8192;
-      tmp18_local14 = tmp27_input.bm(tmp0_desc, 14, BooleanSerializer_getInstance(), tmp18_local14);
+      tmp18_local14 = tmp27_input.hm(tmp0_desc, 14, BooleanSerializer_getInstance(), tmp18_local14);
       tmp3_bitMask0 = tmp3_bitMask0 | 16384;
-      tmp19_local15 = tmp27_input.bm(tmp0_desc, 15, tmp28_cached[15].t1(), tmp19_local15);
+      tmp19_local15 = tmp27_input.hm(tmp0_desc, 15, tmp28_cached[15].t1(), tmp19_local15);
       tmp3_bitMask0 = tmp3_bitMask0 | 32768;
-      tmp20_local16 = tmp27_input.bm(tmp0_desc, 16, tmp28_cached[16].t1(), tmp20_local16);
+      tmp20_local16 = tmp27_input.hm(tmp0_desc, 16, tmp28_cached[16].t1(), tmp20_local16);
       tmp3_bitMask0 = tmp3_bitMask0 | 65536;
-      tmp21_local17 = tmp27_input.bm(tmp0_desc, 17, tmp28_cached[17].t1(), tmp21_local17);
+      tmp21_local17 = tmp27_input.hm(tmp0_desc, 17, tmp28_cached[17].t1(), tmp21_local17);
       tmp3_bitMask0 = tmp3_bitMask0 | 131072;
-      tmp22_local18 = tmp27_input.bm(tmp0_desc, 18, tmp28_cached[18].t1(), tmp22_local18);
+      tmp22_local18 = tmp27_input.hm(tmp0_desc, 18, tmp28_cached[18].t1(), tmp22_local18);
       tmp3_bitMask0 = tmp3_bitMask0 | 262144;
-      tmp23_local19 = tmp27_input.bm(tmp0_desc, 19, tmp28_cached[19].t1(), tmp23_local19);
+      tmp23_local19 = tmp27_input.hm(tmp0_desc, 19, tmp28_cached[19].t1(), tmp23_local19);
       tmp3_bitMask0 = tmp3_bitMask0 | 524288;
-      tmp24_local20 = tmp27_input.bm(tmp0_desc, 20, StringSerializer_getInstance(), tmp24_local20);
+      tmp24_local20 = tmp27_input.hm(tmp0_desc, 20, StringSerializer_getInstance(), tmp24_local20);
       tmp3_bitMask0 = tmp3_bitMask0 | 1048576;
-      tmp25_local21 = tmp27_input.bm(tmp0_desc, 21, tmp28_cached[21].t1(), tmp25_local21);
+      tmp25_local21 = tmp27_input.hm(tmp0_desc, 21, tmp28_cached[21].t1(), tmp25_local21);
       tmp3_bitMask0 = tmp3_bitMask0 | 2097152;
-      tmp26_local22 = tmp27_input.bm(tmp0_desc, 22, StringSerializer_getInstance(), tmp26_local22);
+      tmp26_local22 = tmp27_input.hm(tmp0_desc, 22, StringSerializer_getInstance(), tmp26_local22);
       tmp3_bitMask0 = tmp3_bitMask0 | 4194304;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp27_input.em(tmp0_desc);
+        tmp2_index = tmp27_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp27_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp27_input.hm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp27_input.bm(tmp0_desc, 1, tmp28_cached[1].t1(), tmp5_local1);
+            tmp5_local1 = tmp27_input.hm(tmp0_desc, 1, tmp28_cached[1].t1(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp27_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp27_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp27_input.bm(tmp0_desc, 3, tmp28_cached[3].t1(), tmp7_local3);
+            tmp7_local3 = tmp27_input.hm(tmp0_desc, 3, tmp28_cached[3].t1(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp27_input.bm(tmp0_desc, 4, tmp28_cached[4].t1(), tmp8_local4);
+            tmp8_local4 = tmp27_input.hm(tmp0_desc, 4, tmp28_cached[4].t1(), tmp8_local4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp27_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp27_input.hm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp27_input.bm(tmp0_desc, 6, tmp28_cached[6].t1(), tmp10_local6);
+            tmp10_local6 = tmp27_input.hm(tmp0_desc, 6, tmp28_cached[6].t1(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp27_input.bm(tmp0_desc, 7, tmp28_cached[7].t1(), tmp11_local7);
+            tmp11_local7 = tmp27_input.hm(tmp0_desc, 7, tmp28_cached[7].t1(), tmp11_local7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           case 8:
-            tmp12_local8 = tmp27_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+            tmp12_local8 = tmp27_input.hm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
             tmp3_bitMask0 = tmp3_bitMask0 | 256;
             break;
           case 9:
-            tmp13_local9 = tmp27_input.bm(tmp0_desc, 9, StringSerializer_getInstance(), tmp13_local9);
+            tmp13_local9 = tmp27_input.hm(tmp0_desc, 9, StringSerializer_getInstance(), tmp13_local9);
             tmp3_bitMask0 = tmp3_bitMask0 | 512;
             break;
           case 10:
-            tmp14_local10 = tmp27_input.bm(tmp0_desc, 10, $serializer_getInstance_1(), tmp14_local10);
+            tmp14_local10 = tmp27_input.hm(tmp0_desc, 10, $serializer_getInstance_1(), tmp14_local10);
             tmp3_bitMask0 = tmp3_bitMask0 | 1024;
             break;
           case 11:
-            tmp15_local11 = tmp27_input.xl(tmp0_desc, 11);
+            tmp15_local11 = tmp27_input.dm(tmp0_desc, 11);
             tmp3_bitMask0 = tmp3_bitMask0 | 2048;
             break;
           case 12:
-            tmp16_local12 = tmp27_input.bm(tmp0_desc, 12, tmp28_cached[12].t1(), tmp16_local12);
+            tmp16_local12 = tmp27_input.hm(tmp0_desc, 12, tmp28_cached[12].t1(), tmp16_local12);
             tmp3_bitMask0 = tmp3_bitMask0 | 4096;
             break;
           case 13:
-            tmp17_local13 = tmp27_input.bm(tmp0_desc, 13, tmp28_cached[13].t1(), tmp17_local13);
+            tmp17_local13 = tmp27_input.hm(tmp0_desc, 13, tmp28_cached[13].t1(), tmp17_local13);
             tmp3_bitMask0 = tmp3_bitMask0 | 8192;
             break;
           case 14:
-            tmp18_local14 = tmp27_input.bm(tmp0_desc, 14, BooleanSerializer_getInstance(), tmp18_local14);
+            tmp18_local14 = tmp27_input.hm(tmp0_desc, 14, BooleanSerializer_getInstance(), tmp18_local14);
             tmp3_bitMask0 = tmp3_bitMask0 | 16384;
             break;
           case 15:
-            tmp19_local15 = tmp27_input.bm(tmp0_desc, 15, tmp28_cached[15].t1(), tmp19_local15);
+            tmp19_local15 = tmp27_input.hm(tmp0_desc, 15, tmp28_cached[15].t1(), tmp19_local15);
             tmp3_bitMask0 = tmp3_bitMask0 | 32768;
             break;
           case 16:
-            tmp20_local16 = tmp27_input.bm(tmp0_desc, 16, tmp28_cached[16].t1(), tmp20_local16);
+            tmp20_local16 = tmp27_input.hm(tmp0_desc, 16, tmp28_cached[16].t1(), tmp20_local16);
             tmp3_bitMask0 = tmp3_bitMask0 | 65536;
             break;
           case 17:
-            tmp21_local17 = tmp27_input.bm(tmp0_desc, 17, tmp28_cached[17].t1(), tmp21_local17);
+            tmp21_local17 = tmp27_input.hm(tmp0_desc, 17, tmp28_cached[17].t1(), tmp21_local17);
             tmp3_bitMask0 = tmp3_bitMask0 | 131072;
             break;
           case 18:
-            tmp22_local18 = tmp27_input.bm(tmp0_desc, 18, tmp28_cached[18].t1(), tmp22_local18);
+            tmp22_local18 = tmp27_input.hm(tmp0_desc, 18, tmp28_cached[18].t1(), tmp22_local18);
             tmp3_bitMask0 = tmp3_bitMask0 | 262144;
             break;
           case 19:
-            tmp23_local19 = tmp27_input.bm(tmp0_desc, 19, tmp28_cached[19].t1(), tmp23_local19);
+            tmp23_local19 = tmp27_input.hm(tmp0_desc, 19, tmp28_cached[19].t1(), tmp23_local19);
             tmp3_bitMask0 = tmp3_bitMask0 | 524288;
             break;
           case 20:
-            tmp24_local20 = tmp27_input.bm(tmp0_desc, 20, StringSerializer_getInstance(), tmp24_local20);
+            tmp24_local20 = tmp27_input.hm(tmp0_desc, 20, StringSerializer_getInstance(), tmp24_local20);
             tmp3_bitMask0 = tmp3_bitMask0 | 1048576;
             break;
           case 21:
-            tmp25_local21 = tmp27_input.bm(tmp0_desc, 21, tmp28_cached[21].t1(), tmp25_local21);
+            tmp25_local21 = tmp27_input.hm(tmp0_desc, 21, tmp28_cached[21].t1(), tmp25_local21);
             tmp3_bitMask0 = tmp3_bitMask0 | 2097152;
             break;
           case 22:
-            tmp26_local22 = tmp27_input.bm(tmp0_desc, 22, StringSerializer_getInstance(), tmp26_local22);
+            tmp26_local22 = tmp27_input.hm(tmp0_desc, 22, StringSerializer_getInstance(), tmp26_local22);
             tmp3_bitMask0 = tmp3_bitMask0 | 4194304;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp27_input.ol(tmp0_desc);
+    tmp27_input.ul(tmp0_desc);
     return RecipeV3_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, tmp12_local8, tmp13_local9, tmp14_local10, tmp15_local11, tmp16_local12, tmp17_local13, tmp18_local14, tmp19_local15, tmp20_local16, tmp21_local17, tmp22_local18, tmp23_local19, tmp24_local20, tmp25_local21, tmp26_local22, null);
   };
-  protoOf($serializer).qi = function () {
-    return this.e1g_1;
+  protoOf($serializer).wi = function () {
+    return this.o1g_1;
   };
-  protoOf($serializer).ys = function () {
-    var tmp0_cached = Companion_getInstance().d1g_1;
+  protoOf($serializer).et = function () {
+    var tmp0_cached = Companion_getInstance().n1g_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -794,97 +799,97 @@
   }
   function RecipeV3_init_$Init$(seen0, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, serializationConstructorMarker, $this) {
     if (!(2048 === (2048 & seen0))) {
-      throwMissingFieldException(seen0, 2048, $serializer_getInstance().e1g_1);
+      throwMissingFieldException(seen0, 2048, $serializer_getInstance().o1g_1);
     }
     if (0 === (seen0 & 1))
-      $this.o1e_1 = null;
+      $this.y1e_1 = null;
     else
-      $this.o1e_1 = bookCredit;
+      $this.y1e_1 = bookCredit;
     if (0 === (seen0 & 2))
-      $this.p1e_1 = null;
+      $this.z1e_1 = null;
     else
-      $this.p1e_1 = byline;
+      $this.z1e_1 = byline;
     if (0 === (seen0 & 4))
-      $this.q1e_1 = null;
+      $this.a1f_1 = null;
     else
-      $this.q1e_1 = canonicalArticle;
+      $this.a1f_1 = canonicalArticle;
     if (0 === (seen0 & 8))
-      $this.r1e_1 = null;
+      $this.b1f_1 = null;
     else
-      $this.r1e_1 = celebrationIds;
+      $this.b1f_1 = celebrationIds;
     if (0 === (seen0 & 16))
-      $this.s1e_1 = null;
+      $this.c1f_1 = null;
     else
-      $this.s1e_1 = commerceCtas;
+      $this.c1f_1 = commerceCtas;
     if (0 === (seen0 & 32))
-      $this.t1e_1 = null;
+      $this.d1f_1 = null;
     else
-      $this.t1e_1 = composerId;
+      $this.d1f_1 = composerId;
     if (0 === (seen0 & 64))
-      $this.u1e_1 = null;
+      $this.e1f_1 = null;
     else
-      $this.u1e_1 = contributors;
+      $this.e1f_1 = contributors;
     if (0 === (seen0 & 128))
-      $this.v1e_1 = null;
+      $this.f1f_1 = null;
     else
-      $this.v1e_1 = cuisineIds;
+      $this.f1f_1 = cuisineIds;
     if (0 === (seen0 & 256))
-      $this.w1e_1 = null;
+      $this.g1f_1 = null;
     else
-      $this.w1e_1 = description;
+      $this.g1f_1 = description;
     if (0 === (seen0 & 512))
-      $this.x1e_1 = null;
+      $this.h1f_1 = null;
     else
-      $this.x1e_1 = difficultyLevel;
+      $this.h1f_1 = difficultyLevel;
     if (0 === (seen0 & 1024))
-      $this.y1e_1 = null;
+      $this.i1f_1 = null;
     else
-      $this.y1e_1 = featuredImage;
-    $this.z1e_1 = id;
+      $this.i1f_1 = featuredImage;
+    $this.j1f_1 = id;
     if (0 === (seen0 & 4096))
-      $this.a1f_1 = null;
+      $this.k1f_1 = null;
     else
-      $this.a1f_1 = ingredients;
+      $this.k1f_1 = ingredients;
     if (0 === (seen0 & 8192))
-      $this.b1f_1 = null;
+      $this.l1f_1 = null;
     else
-      $this.b1f_1 = instructions;
+      $this.l1f_1 = instructions;
     if (0 === (seen0 & 16384))
-      $this.c1f_1 = null;
+      $this.m1f_1 = null;
     else
-      $this.c1f_1 = isAppReady;
+      $this.m1f_1 = isAppReady;
     if (0 === (seen0 & 32768))
-      $this.d1f_1 = null;
+      $this.n1f_1 = null;
     else
-      $this.d1f_1 = mealTypeIds;
+      $this.n1f_1 = mealTypeIds;
     if (0 === (seen0 & 65536))
-      $this.e1f_1 = null;
+      $this.o1f_1 = null;
     else
-      $this.e1f_1 = serves;
+      $this.o1f_1 = serves;
     if (0 === (seen0 & 131072))
-      $this.f1f_1 = null;
+      $this.p1f_1 = null;
     else
-      $this.f1f_1 = suitableForDietIds;
+      $this.p1f_1 = suitableForDietIds;
     if (0 === (seen0 & 262144))
-      $this.g1f_1 = null;
+      $this.q1f_1 = null;
     else
-      $this.g1f_1 = techniquesUsedIds;
+      $this.q1f_1 = techniquesUsedIds;
     if (0 === (seen0 & 524288))
-      $this.h1f_1 = null;
+      $this.r1f_1 = null;
     else
-      $this.h1f_1 = timings;
+      $this.r1f_1 = timings;
     if (0 === (seen0 & 1048576))
-      $this.i1f_1 = null;
+      $this.s1f_1 = null;
     else
-      $this.i1f_1 = title;
+      $this.s1f_1 = title;
     if (0 === (seen0 & 2097152))
-      $this.j1f_1 = null;
+      $this.t1f_1 = null;
     else
-      $this.j1f_1 = utensilsAndApplianceIds;
+      $this.t1f_1 = utensilsAndApplianceIds;
     if (0 === (seen0 & 4194304))
-      $this.k1f_1 = null;
+      $this.u1f_1 = null;
     else
-      $this.k1f_1 = webPublicationDate;
+      $this.u1f_1 = webPublicationDate;
     return $this;
   }
   function RecipeV3_init_$Create$(seen0, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, serializationConstructorMarker) {
@@ -914,86 +919,86 @@
     title = title === VOID ? null : title;
     utensilsAndApplianceIds = utensilsAndApplianceIds === VOID ? null : utensilsAndApplianceIds;
     webPublicationDate = webPublicationDate === VOID ? null : webPublicationDate;
-    this.o1e_1 = bookCredit;
-    this.p1e_1 = byline;
-    this.q1e_1 = canonicalArticle;
-    this.r1e_1 = celebrationIds;
-    this.s1e_1 = commerceCtas;
-    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;
-  }
-  protoOf(RecipeV3).g1g = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) {
+    this.y1e_1 = bookCredit;
+    this.z1e_1 = byline;
+    this.a1f_1 = canonicalArticle;
+    this.b1f_1 = celebrationIds;
+    this.c1f_1 = commerceCtas;
+    this.d1f_1 = composerId;
+    this.e1f_1 = contributors;
+    this.f1f_1 = cuisineIds;
+    this.g1f_1 = description;
+    this.h1f_1 = difficultyLevel;
+    this.i1f_1 = featuredImage;
+    this.j1f_1 = id;
+    this.k1f_1 = ingredients;
+    this.l1f_1 = instructions;
+    this.m1f_1 = isAppReady;
+    this.n1f_1 = mealTypeIds;
+    this.o1f_1 = serves;
+    this.p1f_1 = suitableForDietIds;
+    this.q1f_1 = techniquesUsedIds;
+    this.r1f_1 = timings;
+    this.s1f_1 = title;
+    this.t1f_1 = utensilsAndApplianceIds;
+    this.u1f_1 = webPublicationDate;
+  }
+  protoOf(RecipeV3).q1g = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) {
     return new RecipeV3(bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate);
   };
-  protoOf(RecipeV3).c1g = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, $super) {
-    bookCredit = bookCredit === VOID ? this.o1e_1 : bookCredit;
-    byline = byline === VOID ? this.p1e_1 : byline;
-    canonicalArticle = canonicalArticle === VOID ? this.q1e_1 : canonicalArticle;
-    celebrationIds = celebrationIds === VOID ? this.r1e_1 : celebrationIds;
-    commerceCtas = commerceCtas === VOID ? this.s1e_1 : commerceCtas;
-    composerId = composerId === VOID ? this.t1e_1 : composerId;
-    contributors = contributors === VOID ? this.u1e_1 : contributors;
-    cuisineIds = cuisineIds === VOID ? this.v1e_1 : cuisineIds;
-    description = description === VOID ? this.w1e_1 : description;
-    difficultyLevel = difficultyLevel === VOID ? this.x1e_1 : difficultyLevel;
-    featuredImage = featuredImage === VOID ? this.y1e_1 : featuredImage;
-    id = id === VOID ? this.z1e_1 : id;
-    ingredients = ingredients === VOID ? this.a1f_1 : ingredients;
-    instructions = instructions === VOID ? this.b1f_1 : instructions;
-    isAppReady = isAppReady === VOID ? this.c1f_1 : isAppReady;
-    mealTypeIds = mealTypeIds === VOID ? this.d1f_1 : mealTypeIds;
-    serves = serves === VOID ? this.e1f_1 : serves;
-    suitableForDietIds = suitableForDietIds === VOID ? this.f1f_1 : suitableForDietIds;
-    techniquesUsedIds = techniquesUsedIds === VOID ? this.g1f_1 : techniquesUsedIds;
-    timings = timings === VOID ? this.h1f_1 : timings;
-    title = title === VOID ? this.i1f_1 : title;
-    utensilsAndApplianceIds = utensilsAndApplianceIds === VOID ? this.j1f_1 : utensilsAndApplianceIds;
-    webPublicationDate = webPublicationDate === VOID ? this.k1f_1 : webPublicationDate;
-    return $super === VOID ? this.g1g(bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) : $super.g1g.call(this, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate);
+  protoOf(RecipeV3).m1g = function (bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate, $super) {
+    bookCredit = bookCredit === VOID ? this.y1e_1 : bookCredit;
+    byline = byline === VOID ? this.z1e_1 : byline;
+    canonicalArticle = canonicalArticle === VOID ? this.a1f_1 : canonicalArticle;
+    celebrationIds = celebrationIds === VOID ? this.b1f_1 : celebrationIds;
+    commerceCtas = commerceCtas === VOID ? this.c1f_1 : commerceCtas;
+    composerId = composerId === VOID ? this.d1f_1 : composerId;
+    contributors = contributors === VOID ? this.e1f_1 : contributors;
+    cuisineIds = cuisineIds === VOID ? this.f1f_1 : cuisineIds;
+    description = description === VOID ? this.g1f_1 : description;
+    difficultyLevel = difficultyLevel === VOID ? this.h1f_1 : difficultyLevel;
+    featuredImage = featuredImage === VOID ? this.i1f_1 : featuredImage;
+    id = id === VOID ? this.j1f_1 : id;
+    ingredients = ingredients === VOID ? this.k1f_1 : ingredients;
+    instructions = instructions === VOID ? this.l1f_1 : instructions;
+    isAppReady = isAppReady === VOID ? this.m1f_1 : isAppReady;
+    mealTypeIds = mealTypeIds === VOID ? this.n1f_1 : mealTypeIds;
+    serves = serves === VOID ? this.o1f_1 : serves;
+    suitableForDietIds = suitableForDietIds === VOID ? this.p1f_1 : suitableForDietIds;
+    techniquesUsedIds = techniquesUsedIds === VOID ? this.q1f_1 : techniquesUsedIds;
+    timings = timings === VOID ? this.r1f_1 : timings;
+    title = title === VOID ? this.s1f_1 : title;
+    utensilsAndApplianceIds = utensilsAndApplianceIds === VOID ? this.t1f_1 : utensilsAndApplianceIds;
+    webPublicationDate = webPublicationDate === VOID ? this.u1f_1 : webPublicationDate;
+    return $super === VOID ? this.q1g(bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate) : $super.q1g.call(this, bookCredit, byline, canonicalArticle, celebrationIds, commerceCtas, composerId, contributors, cuisineIds, description, difficultyLevel, featuredImage, id, ingredients, instructions, isAppReady, mealTypeIds, serves, suitableForDietIds, techniquesUsedIds, timings, title, utensilsAndApplianceIds, webPublicationDate);
   };
   protoOf(RecipeV3).toString = function () {
-    return 'RecipeV3(bookCredit=' + this.o1e_1 + ', byline=' + toString(this.p1e_1) + ', canonicalArticle=' + this.q1e_1 + ', celebrationIds=' + toString(this.r1e_1) + ', commerceCtas=' + 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 'RecipeV3(bookCredit=' + this.y1e_1 + ', byline=' + toString(this.z1e_1) + ', canonicalArticle=' + this.a1f_1 + ', celebrationIds=' + toString(this.b1f_1) + ', commerceCtas=' + toString(this.c1f_1) + ', composerId=' + this.d1f_1 + ', contributors=' + toString(this.e1f_1) + ', cuisineIds=' + toString(this.f1f_1) + ', description=' + this.g1f_1 + ', difficultyLevel=' + this.h1f_1 + ', featuredImage=' + toString(this.i1f_1) + ', id=' + this.j1f_1 + ', ingredients=' + toString(this.k1f_1) + ', instructions=' + toString(this.l1f_1) + ', isAppReady=' + this.m1f_1 + ', mealTypeIds=' + toString(this.n1f_1) + ', serves=' + toString(this.o1f_1) + ', suitableForDietIds=' + toString(this.p1f_1) + ', techniquesUsedIds=' + toString(this.q1f_1) + ', timings=' + toString(this.r1f_1) + ', title=' + this.s1f_1 + ', utensilsAndApplianceIds=' + toString(this.t1f_1) + ', webPublicationDate=' + this.u1f_1 + ')';
   };
   protoOf(RecipeV3).hashCode = function () {
-    var result = this.o1e_1 == null ? 0 : getStringHashCode(this.o1e_1);
-    result = imul(result, 31) + (this.p1e_1 == null ? 0 : hashCode(this.p1e_1)) | 0;
-    result = imul(result, 31) + (this.q1e_1 == null ? 0 : getStringHashCode(this.q1e_1)) | 0;
-    result = imul(result, 31) + (this.r1e_1 == null ? 0 : hashCode(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;
+    var result = this.y1e_1 == null ? 0 : getStringHashCode(this.y1e_1);
+    result = imul(result, 31) + (this.z1e_1 == null ? 0 : hashCode(this.z1e_1)) | 0;
+    result = imul(result, 31) + (this.a1f_1 == null ? 0 : getStringHashCode(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.c1f_1 == null ? 0 : hashCode(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 : 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;
+    result = imul(result, 31) + (this.g1f_1 == null ? 0 : getStringHashCode(this.g1f_1)) | 0;
+    result = imul(result, 31) + (this.h1f_1 == null ? 0 : getStringHashCode(this.h1f_1)) | 0;
+    result = imul(result, 31) + (this.i1f_1 == null ? 0 : this.i1f_1.hashCode()) | 0;
+    result = imul(result, 31) + getStringHashCode(this.j1f_1) | 0;
+    result = imul(result, 31) + (this.k1f_1 == null ? 0 : hashCode(this.k1f_1)) | 0;
+    result = imul(result, 31) + (this.l1f_1 == null ? 0 : hashCode(this.l1f_1)) | 0;
+    result = imul(result, 31) + (this.m1f_1 == null ? 0 : getBooleanHashCode(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 : hashCode(this.o1f_1)) | 0;
+    result = imul(result, 31) + (this.p1f_1 == null ? 0 : hashCode(this.p1f_1)) | 0;
+    result = imul(result, 31) + (this.q1f_1 == null ? 0 : hashCode(this.q1f_1)) | 0;
+    result = imul(result, 31) + (this.r1f_1 == null ? 0 : hashCode(this.r1f_1)) | 0;
+    result = imul(result, 31) + (this.s1f_1 == null ? 0 : getStringHashCode(this.s1f_1)) | 0;
+    result = imul(result, 31) + (this.t1f_1 == null ? 0 : hashCode(this.t1f_1)) | 0;
+    result = imul(result, 31) + (this.u1f_1 == null ? 0 : getStringHashCode(this.u1f_1)) | 0;
     return result;
   };
   protoOf(RecipeV3).equals = function (other) {
@@ -1001,119 +1006,119 @@
       return true;
     if (!(other instanceof RecipeV3))
       return false;
-    if (!(this.o1e_1 == other.o1e_1))
+    if (!(this.y1e_1 == other.y1e_1))
       return false;
-    if (!equals(this.p1e_1, other.p1e_1))
+    if (!equals(this.z1e_1, other.z1e_1))
       return false;
-    if (!(this.q1e_1 == other.q1e_1))
+    if (!(this.a1f_1 == other.a1f_1))
       return false;
-    if (!equals(this.r1e_1, other.r1e_1))
+    if (!equals(this.b1f_1, other.b1f_1))
       return false;
-    if (!equals(this.s1e_1, other.s1e_1))
+    if (!equals(this.c1f_1, other.c1f_1))
       return false;
-    if (!(this.t1e_1 == other.t1e_1))
+    if (!(this.d1f_1 == other.d1f_1))
       return false;
-    if (!equals(this.u1e_1, other.u1e_1))
+    if (!equals(this.e1f_1, other.e1f_1))
       return false;
-    if (!equals(this.v1e_1, other.v1e_1))
+    if (!equals(this.f1f_1, other.f1f_1))
       return false;
-    if (!(this.w1e_1 == other.w1e_1))
+    if (!(this.g1f_1 == other.g1f_1))
       return false;
-    if (!(this.x1e_1 == other.x1e_1))
+    if (!(this.h1f_1 == other.h1f_1))
       return false;
-    if (!equals(this.y1e_1, other.y1e_1))
+    if (!equals(this.i1f_1, other.i1f_1))
       return false;
-    if (!(this.z1e_1 === other.z1e_1))
+    if (!(this.j1f_1 === other.j1f_1))
       return false;
-    if (!equals(this.a1f_1, other.a1f_1))
+    if (!equals(this.k1f_1, other.k1f_1))
       return false;
-    if (!equals(this.b1f_1, other.b1f_1))
+    if (!equals(this.l1f_1, other.l1f_1))
       return false;
-    if (!(this.c1f_1 == other.c1f_1))
+    if (!(this.m1f_1 == other.m1f_1))
       return false;
-    if (!equals(this.d1f_1, other.d1f_1))
+    if (!equals(this.n1f_1, other.n1f_1))
       return false;
-    if (!equals(this.e1f_1, other.e1f_1))
+    if (!equals(this.o1f_1, other.o1f_1))
       return false;
-    if (!equals(this.f1f_1, other.f1f_1))
+    if (!equals(this.p1f_1, other.p1f_1))
       return false;
-    if (!equals(this.g1f_1, other.g1f_1))
+    if (!equals(this.q1f_1, other.q1f_1))
       return false;
-    if (!equals(this.h1f_1, other.h1f_1))
+    if (!equals(this.r1f_1, other.r1f_1))
       return false;
-    if (!(this.i1f_1 == other.i1f_1))
+    if (!(this.s1f_1 == other.s1f_1))
       return false;
-    if (!equals(this.j1f_1, other.j1f_1))
+    if (!equals(this.t1f_1, other.t1f_1))
       return false;
-    if (!(this.k1f_1 == other.k1f_1))
+    if (!(this.u1f_1 == other.u1f_1))
       return false;
     return true;
   };
   function $serializer_0() {
     $serializer_instance_0 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.CommerceCta', this, 3);
-    tmp0_serialDesc.ws('sponsorName', false);
-    tmp0_serialDesc.ws('territory', false);
-    tmp0_serialDesc.ws('url', false);
-    this.h1g_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_0).i1g = function (encoder, value) {
-    var tmp0_desc = this.h1g_1;
-    var tmp1_output = encoder.nl(tmp0_desc);
-    tmp1_output.bn(tmp0_desc, 0, value.j1g_1);
-    tmp1_output.bn(tmp0_desc, 1, value.k1g_1);
-    tmp1_output.bn(tmp0_desc, 2, value.l1g_1);
-    tmp1_output.ol(tmp0_desc);
-  };
-  protoOf($serializer_0).ri = function (encoder, value) {
-    return this.i1g(encoder, value instanceof CommerceCta ? value : THROW_CCE());
-  };
-  protoOf($serializer_0).si = function (decoder) {
-    var tmp0_desc = this.h1g_1;
+    tmp0_serialDesc.ct('sponsorName', false);
+    tmp0_serialDesc.ct('territory', false);
+    tmp0_serialDesc.ct('url', false);
+    this.r1g_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_0).s1g = function (encoder, value) {
+    var tmp0_desc = this.r1g_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    tmp1_output.hn(tmp0_desc, 0, value.t1g_1);
+    tmp1_output.hn(tmp0_desc, 1, value.u1g_1);
+    tmp1_output.hn(tmp0_desc, 2, value.v1g_1);
+    tmp1_output.ul(tmp0_desc);
+  };
+  protoOf($serializer_0).xi = function (encoder, value) {
+    return this.s1g(encoder, value instanceof CommerceCta ? value : THROW_CCE());
+  };
+  protoOf($serializer_0).yi = 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_local2 = null;
-    var tmp7_input = decoder.nl(tmp0_desc);
-    if (tmp7_input.dm()) {
-      tmp4_local0 = tmp7_input.xl(tmp0_desc, 0);
+    var tmp7_input = decoder.tl(tmp0_desc);
+    if (tmp7_input.jm()) {
+      tmp4_local0 = tmp7_input.dm(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.xl(tmp0_desc, 1);
+      tmp5_local1 = tmp7_input.dm(tmp0_desc, 1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.xl(tmp0_desc, 2);
+      tmp6_local2 = tmp7_input.dm(tmp0_desc, 2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.em(tmp0_desc);
+        tmp2_index = tmp7_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.xl(tmp0_desc, 0);
+            tmp4_local0 = tmp7_input.dm(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.xl(tmp0_desc, 1);
+            tmp5_local1 = tmp7_input.dm(tmp0_desc, 1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.xl(tmp0_desc, 2);
+            tmp6_local2 = tmp7_input.dm(tmp0_desc, 2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.ol(tmp0_desc);
+    tmp7_input.ul(tmp0_desc);
     return CommerceCta_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_0).qi = function () {
-    return this.h1g_1;
+  protoOf($serializer_0).wi = function () {
+    return this.r1g_1;
   };
-  protoOf($serializer_0).ys = function () {
+  protoOf($serializer_0).et = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1127,11 +1132,11 @@
   }
   function CommerceCta_init_$Init$(seen0, sponsorName, territory, url, serializationConstructorMarker, $this) {
     if (!(7 === (7 & seen0))) {
-      throwMissingFieldException(seen0, 7, $serializer_getInstance_0().h1g_1);
+      throwMissingFieldException(seen0, 7, $serializer_getInstance_0().r1g_1);
     }
-    $this.j1g_1 = sponsorName;
-    $this.k1g_1 = territory;
-    $this.l1g_1 = url;
+    $this.t1g_1 = sponsorName;
+    $this.u1g_1 = territory;
+    $this.v1g_1 = url;
     return $this;
   }
   function CommerceCta_init_$Create$(seen0, sponsorName, territory, url, serializationConstructorMarker) {
@@ -1140,12 +1145,12 @@
   function CommerceCta() {
   }
   protoOf(CommerceCta).toString = function () {
-    return 'CommerceCta(sponsorName=' + this.j1g_1 + ', territory=' + this.k1g_1 + ', url=' + this.l1g_1 + ')';
+    return 'CommerceCta(sponsorName=' + this.t1g_1 + ', territory=' + this.u1g_1 + ', url=' + this.v1g_1 + ')';
   };
   protoOf(CommerceCta).hashCode = function () {
-    var result = getStringHashCode(this.j1g_1);
-    result = imul(result, 31) + getStringHashCode(this.k1g_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.l1g_1) | 0;
+    var result = getStringHashCode(this.t1g_1);
+    result = imul(result, 31) + getStringHashCode(this.u1g_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.v1g_1) | 0;
     return result;
   };
   protoOf(CommerceCta).equals = function (other) {
@@ -1153,55 +1158,55 @@
       return true;
     if (!(other instanceof CommerceCta))
       return false;
-    if (!(this.j1g_1 === other.j1g_1))
+    if (!(this.t1g_1 === other.t1g_1))
       return false;
-    if (!(this.k1g_1 === other.k1g_1))
+    if (!(this.u1g_1 === other.u1g_1))
       return false;
-    if (!(this.l1g_1 === other.l1g_1))
+    if (!(this.v1g_1 === other.v1g_1))
       return false;
     return true;
   };
   function $serializer_1() {
     $serializer_instance_1 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Image', this, 8);
-    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.m1g_1 = tmp0_serialDesc;
-  }
-  protoOf($serializer_1).n1g = function (encoder, value) {
-    var tmp0_desc = this.m1g_1;
-    var tmp1_output = encoder.nl(tmp0_desc);
-    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.o1g_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 0, StringSerializer_getInstance(), value.o1g_1);
-    }
-    tmp1_output.bn(tmp0_desc, 1, value.p1g_1);
-    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.q1g_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.q1g_1);
-    }
-    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.r1g_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 3, StringSerializer_getInstance(), value.r1g_1);
-    }
-    tmp1_output.bn(tmp0_desc, 4, value.s1g_1);
-    if (tmp1_output.jn(tmp0_desc, 5) ? true : !(value.t1g_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 5, StringSerializer_getInstance(), value.t1g_1);
-    }
-    if (tmp1_output.jn(tmp0_desc, 6) ? true : !(value.u1g_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 6, StringSerializer_getInstance(), value.u1g_1);
-    }
-    tmp1_output.bn(tmp0_desc, 7, value.v1g_1);
-    tmp1_output.ol(tmp0_desc);
-  };
-  protoOf($serializer_1).ri = function (encoder, value) {
-    return this.n1g(encoder, value instanceof Image ? value : THROW_CCE());
-  };
-  protoOf($serializer_1).si = function (decoder) {
-    var tmp0_desc = this.m1g_1;
+    tmp0_serialDesc.ct('caption', true);
+    tmp0_serialDesc.ct('cropId', false);
+    tmp0_serialDesc.ct('imageType', true);
+    tmp0_serialDesc.ct('mediaApiUrl', true);
+    tmp0_serialDesc.ct('mediaId', false);
+    tmp0_serialDesc.ct('photographer', true);
+    tmp0_serialDesc.ct('source', true);
+    tmp0_serialDesc.ct('url', false);
+    this.w1g_1 = tmp0_serialDesc;
+  }
+  protoOf($serializer_1).x1g = function (encoder, value) {
+    var tmp0_desc = this.w1g_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    if (tmp1_output.pn(tmp0_desc, 0) ? true : !(value.y1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 0, StringSerializer_getInstance(), value.y1g_1);
+    }
+    tmp1_output.hn(tmp0_desc, 1, value.z1g_1);
+    if (tmp1_output.pn(tmp0_desc, 2) ? true : !(value.a1h_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 2, StringSerializer_getInstance(), value.a1h_1);
+    }
+    if (tmp1_output.pn(tmp0_desc, 3) ? true : !(value.b1h_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 3, StringSerializer_getInstance(), value.b1h_1);
+    }
+    tmp1_output.hn(tmp0_desc, 4, value.c1h_1);
+    if (tmp1_output.pn(tmp0_desc, 5) ? true : !(value.d1h_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 5, StringSerializer_getInstance(), value.d1h_1);
+    }
+    if (tmp1_output.pn(tmp0_desc, 6) ? true : !(value.e1h_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 6, StringSerializer_getInstance(), value.e1h_1);
+    }
+    tmp1_output.hn(tmp0_desc, 7, value.f1h_1);
+    tmp1_output.ul(tmp0_desc);
+  };
+  protoOf($serializer_1).xi = function (encoder, value) {
+    return this.x1g(encoder, value instanceof Image ? value : THROW_CCE());
+  };
+  protoOf($serializer_1).yi = function (decoder) {
+    var tmp0_desc = this.w1g_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -1213,74 +1218,74 @@
     var tmp9_local5 = null;
     var tmp10_local6 = null;
     var tmp11_local7 = null;
-    var tmp12_input = decoder.nl(tmp0_desc);
-    if (tmp12_input.dm()) {
-      tmp4_local0 = tmp12_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+    var tmp12_input = decoder.tl(tmp0_desc);
+    if (tmp12_input.jm()) {
+      tmp4_local0 = tmp12_input.hm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp12_input.xl(tmp0_desc, 1);
+      tmp5_local1 = tmp12_input.dm(tmp0_desc, 1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp12_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp12_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp12_input.bm(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp12_input.hm(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp12_input.xl(tmp0_desc, 4);
+      tmp8_local4 = tmp12_input.dm(tmp0_desc, 4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp12_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp12_input.hm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp12_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+      tmp10_local6 = tmp12_input.hm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp12_input.xl(tmp0_desc, 7);
+      tmp11_local7 = tmp12_input.dm(tmp0_desc, 7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp12_input.em(tmp0_desc);
+        tmp2_index = tmp12_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp12_input.bm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp12_input.hm(tmp0_desc, 0, StringSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp12_input.xl(tmp0_desc, 1);
+            tmp5_local1 = tmp12_input.dm(tmp0_desc, 1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp12_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp12_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp12_input.bm(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp12_input.hm(tmp0_desc, 3, StringSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp12_input.xl(tmp0_desc, 4);
+            tmp8_local4 = tmp12_input.dm(tmp0_desc, 4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp12_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp12_input.hm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp12_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+            tmp10_local6 = tmp12_input.hm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp12_input.xl(tmp0_desc, 7);
+            tmp11_local7 = tmp12_input.dm(tmp0_desc, 7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp12_input.ol(tmp0_desc);
+    tmp12_input.ul(tmp0_desc);
     return Image_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, null);
   };
-  protoOf($serializer_1).qi = function () {
-    return this.m1g_1;
+  protoOf($serializer_1).wi = function () {
+    return this.w1g_1;
   };
-  protoOf($serializer_1).ys = function () {
+  protoOf($serializer_1).et = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1294,31 +1299,31 @@
   }
   function Image_init_$Init$(seen0, caption, cropId, imageType, mediaApiUrl, mediaId, photographer, source, url, serializationConstructorMarker, $this) {
     if (!(146 === (146 & seen0))) {
-      throwMissingFieldException(seen0, 146, $serializer_getInstance_1().m1g_1);
+      throwMissingFieldException(seen0, 146, $serializer_getInstance_1().w1g_1);
     }
     if (0 === (seen0 & 1))
-      $this.o1g_1 = null;
+      $this.y1g_1 = null;
     else
-      $this.o1g_1 = caption;
-    $this.p1g_1 = cropId;
+      $this.y1g_1 = caption;
+    $this.z1g_1 = cropId;
     if (0 === (seen0 & 4))
-      $this.q1g_1 = null;
+      $this.a1h_1 = null;
     else
-      $this.q1g_1 = imageType;
+      $this.a1h_1 = imageType;
     if (0 === (seen0 & 8))
-      $this.r1g_1 = null;
+      $this.b1h_1 = null;
     else
-      $this.r1g_1 = mediaApiUrl;
-    $this.s1g_1 = mediaId;
+      $this.b1h_1 = mediaApiUrl;
+    $this.c1h_1 = mediaId;
     if (0 === (seen0 & 32))
-      $this.t1g_1 = null;
+      $this.d1h_1 = null;
     else
-      $this.t1g_1 = photographer;
+      $this.d1h_1 = photographer;
     if (0 === (seen0 & 64))
-      $this.u1g_1 = null;
+      $this.e1h_1 = null;
     else
-      $this.u1g_1 = source;
-    $this.v1g_1 = url;
+      $this.e1h_1 = source;
+    $this.f1h_1 = url;
     return $this;
   }
   function Image_init_$Create$(seen0, caption, cropId, imageType, mediaApiUrl, mediaId, photographer, source, url, serializationConstructorMarker) {
@@ -1327,17 +1332,17 @@
   function Image() {
   }
   protoOf(Image).toString = function () {
-    return 'Image(caption=' + this.o1g_1 + ', cropId=' + this.p1g_1 + ', imageType=' + this.q1g_1 + ', mediaApiUrl=' + this.r1g_1 + ', mediaId=' + this.s1g_1 + ', photographer=' + this.t1g_1 + ', source=' + this.u1g_1 + ', url=' + this.v1g_1 + ')';
+    return 'Image(caption=' + this.y1g_1 + ', cropId=' + this.z1g_1 + ', imageType=' + this.a1h_1 + ', mediaApiUrl=' + this.b1h_1 + ', mediaId=' + this.c1h_1 + ', photographer=' + this.d1h_1 + ', source=' + this.e1h_1 + ', url=' + this.f1h_1 + ')';
   };
   protoOf(Image).hashCode = function () {
-    var result = this.o1g_1 == null ? 0 : getStringHashCode(this.o1g_1);
-    result = imul(result, 31) + getStringHashCode(this.p1g_1) | 0;
-    result = imul(result, 31) + (this.q1g_1 == null ? 0 : getStringHashCode(this.q1g_1)) | 0;
-    result = imul(result, 31) + (this.r1g_1 == null ? 0 : getStringHashCode(this.r1g_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.s1g_1) | 0;
-    result = imul(result, 31) + (this.t1g_1 == null ? 0 : getStringHashCode(this.t1g_1)) | 0;
-    result = imul(result, 31) + (this.u1g_1 == null ? 0 : getStringHashCode(this.u1g_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.v1g_1) | 0;
+    var result = this.y1g_1 == null ? 0 : getStringHashCode(this.y1g_1);
+    result = imul(result, 31) + getStringHashCode(this.z1g_1) | 0;
+    result = imul(result, 31) + (this.a1h_1 == null ? 0 : getStringHashCode(this.a1h_1)) | 0;
+    result = imul(result, 31) + (this.b1h_1 == null ? 0 : getStringHashCode(this.b1h_1)) | 0;
+    result = imul(result, 31) + getStringHashCode(this.c1h_1) | 0;
+    result = imul(result, 31) + (this.d1h_1 == null ? 0 : getStringHashCode(this.d1h_1)) | 0;
+    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(Image).equals = function (other) {
@@ -1345,21 +1350,21 @@
       return true;
     if (!(other instanceof Image))
       return false;
-    if (!(this.o1g_1 == other.o1g_1))
+    if (!(this.y1g_1 == other.y1g_1))
       return false;
-    if (!(this.p1g_1 === other.p1g_1))
+    if (!(this.z1g_1 === other.z1g_1))
       return false;
-    if (!(this.q1g_1 == other.q1g_1))
+    if (!(this.a1h_1 == other.a1h_1))
       return false;
-    if (!(this.r1g_1 == other.r1g_1))
+    if (!(this.b1h_1 == other.b1h_1))
       return false;
-    if (!(this.s1g_1 === other.s1g_1))
+    if (!(this.c1h_1 === other.c1h_1))
       return false;
-    if (!(this.t1g_1 == other.t1g_1))
+    if (!(this.d1h_1 == other.d1h_1))
       return false;
-    if (!(this.u1g_1 == other.u1g_1))
+    if (!(this.e1h_1 == other.e1h_1))
       return false;
-    if (!(this.v1g_1 === other.v1g_1))
+    if (!(this.f1h_1 === other.f1h_1))
       return false;
     return true;
   };
@@ -1373,7 +1378,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.w1g_1 = [lazy(tmp_0, IngredientsList$Companion$$childSerializers$_anonymous__y7k6ja), null];
+    tmp.g1h_1 = [lazy(tmp_0, IngredientsList$Companion$$childSerializers$_anonymous__y7k6ja), null];
   }
   var Companion_instance_0;
   function Companion_getInstance_0() {
@@ -1384,66 +1389,66 @@
   function $serializer_2() {
     $serializer_instance_2 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.IngredientsList', this, 2);
-    tmp0_serialDesc.ws('ingredientsList', true);
-    tmp0_serialDesc.ws('recipeSection', true);
-    this.x1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ct('ingredientsList', true);
+    tmp0_serialDesc.ct('recipeSection', true);
+    this.h1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_2).y1g = function (encoder, value) {
-    var tmp0_desc = this.x1g_1;
-    var tmp1_output = encoder.nl(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_0().w1g_1;
-    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.l1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 0, tmp2_cached[0].t1(), value.l1f_1);
+  protoOf($serializer_2).i1h = function (encoder, value) {
+    var tmp0_desc = this.h1h_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_0().g1h_1;
+    if (tmp1_output.pn(tmp0_desc, 0) ? true : !(value.v1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 0, tmp2_cached[0].t1(), value.v1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.m1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.m1f_1);
+    if (tmp1_output.pn(tmp0_desc, 1) ? true : !(value.w1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 1, StringSerializer_getInstance(), value.w1f_1);
     }
-    tmp1_output.ol(tmp0_desc);
+    tmp1_output.ul(tmp0_desc);
   };
-  protoOf($serializer_2).ri = function (encoder, value) {
-    return this.y1g(encoder, value instanceof IngredientsList ? value : THROW_CCE());
+  protoOf($serializer_2).xi = function (encoder, value) {
+    return this.i1h(encoder, value instanceof IngredientsList ? value : THROW_CCE());
   };
-  protoOf($serializer_2).si = function (decoder) {
-    var tmp0_desc = this.x1g_1;
+  protoOf($serializer_2).yi = function (decoder) {
+    var tmp0_desc = this.h1h_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.nl(tmp0_desc);
-    var tmp7_cached = Companion_getInstance_0().w1g_1;
-    if (tmp6_input.dm()) {
-      tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, tmp7_cached[0].t1(), tmp4_local0);
+    var tmp6_input = decoder.tl(tmp0_desc);
+    var tmp7_cached = Companion_getInstance_0().g1h_1;
+    if (tmp6_input.jm()) {
+      tmp4_local0 = tmp6_input.hm(tmp0_desc, 0, tmp7_cached[0].t1(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp6_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp6_input.em(tmp0_desc);
+        tmp2_index = tmp6_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, tmp7_cached[0].t1(), tmp4_local0);
+            tmp4_local0 = tmp6_input.hm(tmp0_desc, 0, tmp7_cached[0].t1(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp6_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp6_input.ol(tmp0_desc);
+    tmp6_input.ul(tmp0_desc);
     return IngredientsList_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
   };
-  protoOf($serializer_2).qi = function () {
-    return this.x1g_1;
+  protoOf($serializer_2).wi = function () {
+    return this.h1h_1;
   };
-  protoOf($serializer_2).ys = function () {
-    var tmp0_cached = Companion_getInstance_0().w1g_1;
+  protoOf($serializer_2).et = function () {
+    var tmp0_cached = Companion_getInstance_0().g1h_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1457,16 +1462,16 @@
   }
   function IngredientsList_init_$Init$(seen0, ingredientsList, recipeSection, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_2().x1g_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_2().h1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.l1f_1 = null;
+      $this.v1f_1 = null;
     else
-      $this.l1f_1 = ingredientsList;
+      $this.v1f_1 = ingredientsList;
     if (0 === (seen0 & 2))
-      $this.m1f_1 = null;
+      $this.w1f_1 = null;
     else
-      $this.m1f_1 = recipeSection;
+      $this.w1f_1 = recipeSection;
     return $this;
   }
   function IngredientsList_init_$Create$(seen0, ingredientsList, recipeSection, serializationConstructorMarker) {
@@ -1476,15 +1481,15 @@
     Companion_getInstance_0();
     ingredientsList = ingredientsList === VOID ? null : ingredientsList;
     recipeSection = recipeSection === VOID ? null : recipeSection;
-    this.l1f_1 = ingredientsList;
-    this.m1f_1 = recipeSection;
+    this.v1f_1 = ingredientsList;
+    this.w1f_1 = recipeSection;
   }
   protoOf(IngredientsList).toString = function () {
-    return 'IngredientsList(ingredientsList=' + toString(this.l1f_1) + ', recipeSection=' + this.m1f_1 + ')';
+    return 'IngredientsList(ingredientsList=' + toString(this.v1f_1) + ', recipeSection=' + this.w1f_1 + ')';
   };
   protoOf(IngredientsList).hashCode = function () {
-    var result = this.l1f_1 == null ? 0 : hashCode(this.l1f_1);
-    result = imul(result, 31) + (this.m1f_1 == null ? 0 : getStringHashCode(this.m1f_1)) | 0;
+    var result = this.v1f_1 == null ? 0 : hashCode(this.v1f_1);
+    result = imul(result, 31) + (this.w1f_1 == null ? 0 : getStringHashCode(this.w1f_1)) | 0;
     return result;
   };
   protoOf(IngredientsList).equals = function (other) {
@@ -1492,9 +1497,9 @@
       return true;
     if (!(other instanceof IngredientsList))
       return false;
-    if (!equals(this.l1f_1, other.l1f_1))
+    if (!equals(this.v1f_1, other.v1f_1))
       return false;
-    if (!(this.m1f_1 == other.m1f_1))
+    if (!(this.w1f_1 == other.w1f_1))
       return false;
     return true;
   };
@@ -1507,54 +1512,54 @@
   function $serializer_3() {
     $serializer_instance_3 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.IngredientItem', this, 9);
-    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('template', true);
-    tmp0_serialDesc.ws('text', true);
-    tmp0_serialDesc.ws('unit', true);
-    this.z1g_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ct('amount', true);
+    tmp0_serialDesc.ct('ingredientId', true);
+    tmp0_serialDesc.ct('name', true);
+    tmp0_serialDesc.ct('optional', true);
+    tmp0_serialDesc.ct('prefix', true);
+    tmp0_serialDesc.ct('suffix', true);
+    tmp0_serialDesc.ct('template', true);
+    tmp0_serialDesc.ct('text', true);
+    tmp0_serialDesc.ct('unit', true);
+    this.j1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_3).a1h = function (encoder, value) {
-    var tmp0_desc = this.z1g_1;
-    var tmp1_output = encoder.nl(tmp0_desc);
-    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.n1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 0, $serializer_getInstance_4(), value.n1f_1);
+  protoOf($serializer_3).k1h = function (encoder, value) {
+    var tmp0_desc = this.j1h_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    if (tmp1_output.pn(tmp0_desc, 0) ? true : !(value.x1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 0, $serializer_getInstance_4(), value.x1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.o1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.o1f_1);
+    if (tmp1_output.pn(tmp0_desc, 1) ? true : !(value.y1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 1, StringSerializer_getInstance(), value.y1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.p1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.p1f_1);
+    if (tmp1_output.pn(tmp0_desc, 2) ? true : !(value.z1f_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 2, StringSerializer_getInstance(), value.z1f_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.q1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 3, BooleanSerializer_getInstance(), value.q1f_1);
+    if (tmp1_output.pn(tmp0_desc, 3) ? true : !(value.a1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 3, BooleanSerializer_getInstance(), value.a1g_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 4) ? true : !(value.r1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 4, StringSerializer_getInstance(), value.r1f_1);
+    if (tmp1_output.pn(tmp0_desc, 4) ? true : !(value.b1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 4, StringSerializer_getInstance(), value.b1g_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 5) ? true : !(value.s1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 5, StringSerializer_getInstance(), value.s1f_1);
+    if (tmp1_output.pn(tmp0_desc, 5) ? true : !(value.c1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 5, StringSerializer_getInstance(), value.c1g_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 6) ? true : !(value.t1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 6, StringSerializer_getInstance(), value.t1f_1);
+    if (tmp1_output.pn(tmp0_desc, 6) ? true : !(value.d1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 6, StringSerializer_getInstance(), value.d1g_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 7) ? true : !(value.u1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 7, StringSerializer_getInstance(), value.u1f_1);
+    if (tmp1_output.pn(tmp0_desc, 7) ? true : !(value.e1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 7, StringSerializer_getInstance(), value.e1g_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 8) ? true : !(value.v1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 8, StringSerializer_getInstance(), value.v1f_1);
+    if (tmp1_output.pn(tmp0_desc, 8) ? true : !(value.f1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 8, StringSerializer_getInstance(), value.f1g_1);
     }
-    tmp1_output.ol(tmp0_desc);
+    tmp1_output.ul(tmp0_desc);
   };
-  protoOf($serializer_3).ri = function (encoder, value) {
-    return this.a1h(encoder, value instanceof IngredientItem ? value : THROW_CCE());
+  protoOf($serializer_3).xi = function (encoder, value) {
+    return this.k1h(encoder, value instanceof IngredientItem ? value : THROW_CCE());
   };
-  protoOf($serializer_3).si = function (decoder) {
-    var tmp0_desc = this.z1g_1;
+  protoOf($serializer_3).yi = function (decoder) {
+    var tmp0_desc = this.j1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -1567,80 +1572,80 @@
     var tmp10_local6 = null;
     var tmp11_local7 = null;
     var tmp12_local8 = null;
-    var tmp13_input = decoder.nl(tmp0_desc);
-    if (tmp13_input.dm()) {
-      tmp4_local0 = tmp13_input.bm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
+    var tmp13_input = decoder.tl(tmp0_desc);
+    if (tmp13_input.jm()) {
+      tmp4_local0 = tmp13_input.hm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp13_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp13_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp13_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp13_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp13_input.bm(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp13_input.hm(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
-      tmp8_local4 = tmp13_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+      tmp8_local4 = tmp13_input.hm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
       tmp3_bitMask0 = tmp3_bitMask0 | 16;
-      tmp9_local5 = tmp13_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+      tmp9_local5 = tmp13_input.hm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
       tmp3_bitMask0 = tmp3_bitMask0 | 32;
-      tmp10_local6 = tmp13_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+      tmp10_local6 = tmp13_input.hm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
       tmp3_bitMask0 = tmp3_bitMask0 | 64;
-      tmp11_local7 = tmp13_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+      tmp11_local7 = tmp13_input.hm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
       tmp3_bitMask0 = tmp3_bitMask0 | 128;
-      tmp12_local8 = tmp13_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+      tmp12_local8 = tmp13_input.hm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
       tmp3_bitMask0 = tmp3_bitMask0 | 256;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp13_input.em(tmp0_desc);
+        tmp2_index = tmp13_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp13_input.bm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
+            tmp4_local0 = tmp13_input.hm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp13_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp13_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp13_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp13_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp13_input.bm(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp13_input.hm(tmp0_desc, 3, BooleanSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           case 4:
-            tmp8_local4 = tmp13_input.bm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+            tmp8_local4 = tmp13_input.hm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
             tmp3_bitMask0 = tmp3_bitMask0 | 16;
             break;
           case 5:
-            tmp9_local5 = tmp13_input.bm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
+            tmp9_local5 = tmp13_input.hm(tmp0_desc, 5, StringSerializer_getInstance(), tmp9_local5);
             tmp3_bitMask0 = tmp3_bitMask0 | 32;
             break;
           case 6:
-            tmp10_local6 = tmp13_input.bm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
+            tmp10_local6 = tmp13_input.hm(tmp0_desc, 6, StringSerializer_getInstance(), tmp10_local6);
             tmp3_bitMask0 = tmp3_bitMask0 | 64;
             break;
           case 7:
-            tmp11_local7 = tmp13_input.bm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
+            tmp11_local7 = tmp13_input.hm(tmp0_desc, 7, StringSerializer_getInstance(), tmp11_local7);
             tmp3_bitMask0 = tmp3_bitMask0 | 128;
             break;
           case 8:
-            tmp12_local8 = tmp13_input.bm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
+            tmp12_local8 = tmp13_input.hm(tmp0_desc, 8, StringSerializer_getInstance(), tmp12_local8);
             tmp3_bitMask0 = tmp3_bitMask0 | 256;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp13_input.ol(tmp0_desc);
+    tmp13_input.ul(tmp0_desc);
     return IngredientItem_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, tmp10_local6, tmp11_local7, tmp12_local8, null);
   };
-  protoOf($serializer_3).qi = function () {
-    return this.z1g_1;
+  protoOf($serializer_3).wi = function () {
+    return this.j1h_1;
   };
-  protoOf($serializer_3).ys = function () {
+  protoOf($serializer_3).et = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1654,44 +1659,44 @@
   }
   function IngredientItem_init_$Init$(seen0, amount, ingredientId, name, optional, prefix, suffix, template, text, unit, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_3().z1g_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_3().j1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.n1f_1 = null;
+      $this.x1f_1 = null;
     else
-      $this.n1f_1 = amount;
+      $this.x1f_1 = amount;
     if (0 === (seen0 & 2))
-      $this.o1f_1 = null;
+      $this.y1f_1 = null;
     else
-      $this.o1f_1 = ingredientId;
+      $this.y1f_1 = ingredientId;
     if (0 === (seen0 & 4))
-      $this.p1f_1 = null;
+      $this.z1f_1 = null;
     else
-      $this.p1f_1 = name;
+      $this.z1f_1 = name;
     if (0 === (seen0 & 8))
-      $this.q1f_1 = null;
+      $this.a1g_1 = null;
     else
-      $this.q1f_1 = optional;
+      $this.a1g_1 = optional;
     if (0 === (seen0 & 16))
-      $this.r1f_1 = null;
+      $this.b1g_1 = null;
     else
-      $this.r1f_1 = prefix;
+      $this.b1g_1 = prefix;
     if (0 === (seen0 & 32))
-      $this.s1f_1 = null;
+      $this.c1g_1 = null;
     else
-      $this.s1f_1 = suffix;
+      $this.c1g_1 = suffix;
     if (0 === (seen0 & 64))
-      $this.t1f_1 = null;
+      $this.d1g_1 = null;
     else
-      $this.t1f_1 = template;
+      $this.d1g_1 = template;
     if (0 === (seen0 & 128))
-      $this.u1f_1 = null;
+      $this.e1g_1 = null;
     else
-      $this.u1f_1 = text;
+      $this.e1g_1 = text;
     if (0 === (seen0 & 256))
-      $this.v1f_1 = null;
+      $this.f1g_1 = null;
     else
-      $this.v1f_1 = unit;
+      $this.f1g_1 = unit;
     return $this;
   }
   function IngredientItem_init_$Create$(seen0, amount, ingredientId, name, optional, prefix, suffix, template, text, unit, serializationConstructorMarker) {
@@ -1707,44 +1712,44 @@
     template = template === VOID ? null : template;
     text = text === VOID ? null : text;
     unit = unit === VOID ? null : unit;
-    this.n1f_1 = amount;
-    this.o1f_1 = ingredientId;
-    this.p1f_1 = name;
-    this.q1f_1 = optional;
-    this.r1f_1 = prefix;
-    this.s1f_1 = suffix;
-    this.t1f_1 = template;
-    this.u1f_1 = text;
-    this.v1f_1 = unit;
-  }
-  protoOf(IngredientItem).b1h = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit) {
+    this.x1f_1 = amount;
+    this.y1f_1 = ingredientId;
+    this.z1f_1 = name;
+    this.a1g_1 = optional;
+    this.b1g_1 = prefix;
+    this.c1g_1 = suffix;
+    this.d1g_1 = template;
+    this.e1g_1 = text;
+    this.f1g_1 = unit;
+  }
+  protoOf(IngredientItem).l1h = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit) {
     return new IngredientItem(amount, ingredientId, name, optional, prefix, suffix, template, text, unit);
   };
-  protoOf(IngredientItem).w1f = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit, $super) {
-    amount = amount === VOID ? this.n1f_1 : amount;
-    ingredientId = ingredientId === VOID ? this.o1f_1 : ingredientId;
-    name = name === VOID ? this.p1f_1 : name;
-    optional = optional === VOID ? this.q1f_1 : optional;
-    prefix = prefix === VOID ? this.r1f_1 : prefix;
-    suffix = suffix === VOID ? this.s1f_1 : suffix;
-    template = template === VOID ? this.t1f_1 : template;
-    text = text === VOID ? this.u1f_1 : text;
-    unit = unit === VOID ? this.v1f_1 : unit;
-    return $super === VOID ? this.b1h(amount, ingredientId, name, optional, prefix, suffix, template, text, unit) : $super.b1h.call(this, amount, ingredientId, name, optional, prefix, suffix, template, text, unit);
+  protoOf(IngredientItem).g1g = function (amount, ingredientId, name, optional, prefix, suffix, template, text, unit, $super) {
+    amount = amount === VOID ? this.x1f_1 : amount;
+    ingredientId = ingredientId === VOID ? this.y1f_1 : ingredientId;
+    name = name === VOID ? this.z1f_1 : name;
+    optional = optional === VOID ? this.a1g_1 : optional;
+    prefix = prefix === VOID ? this.b1g_1 : prefix;
+    suffix = suffix === VOID ? this.c1g_1 : suffix;
+    template = template === VOID ? this.d1g_1 : template;
+    text = text === VOID ? this.e1g_1 : text;
+    unit = unit === VOID ? this.f1g_1 : unit;
+    return $super === VOID ? this.l1h(amount, ingredientId, name, optional, prefix, suffix, template, text, unit) : $super.l1h.call(this, amount, ingredientId, name, optional, prefix, suffix, template, text, unit);
   };
   protoOf(IngredientItem).toString = function () {
-    return 'IngredientItem(amount=' + toString(this.n1f_1) + ', ingredientId=' + this.o1f_1 + ', name=' + this.p1f_1 + ', optional=' + this.q1f_1 + ', prefix=' + this.r1f_1 + ', suffix=' + this.s1f_1 + ', template=' + this.t1f_1 + ', text=' + this.u1f_1 + ', unit=' + this.v1f_1 + ')';
+    return 'IngredientItem(amount=' + toString(this.x1f_1) + ', ingredientId=' + this.y1f_1 + ', name=' + this.z1f_1 + ', optional=' + this.a1g_1 + ', prefix=' + this.b1g_1 + ', suffix=' + this.c1g_1 + ', template=' + this.d1g_1 + ', text=' + this.e1g_1 + ', unit=' + this.f1g_1 + ')';
   };
   protoOf(IngredientItem).hashCode = function () {
-    var result = this.n1f_1 == null ? 0 : this.n1f_1.hashCode();
-    result = imul(result, 31) + (this.o1f_1 == null ? 0 : 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 : getBooleanHashCode(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 : getStringHashCode(this.t1f_1)) | 0;
-    result = imul(result, 31) + (this.u1f_1 == null ? 0 : getStringHashCode(this.u1f_1)) | 0;
-    result = imul(result, 31) + (this.v1f_1 == null ? 0 : getStringHashCode(this.v1f_1)) | 0;
+    var result = this.x1f_1 == null ? 0 : this.x1f_1.hashCode();
+    result = imul(result, 31) + (this.y1f_1 == null ? 0 : getStringHashCode(this.y1f_1)) | 0;
+    result = imul(result, 31) + (this.z1f_1 == null ? 0 : getStringHashCode(this.z1f_1)) | 0;
+    result = imul(result, 31) + (this.a1g_1 == null ? 0 : getBooleanHashCode(this.a1g_1)) | 0;
+    result = imul(result, 31) + (this.b1g_1 == null ? 0 : getStringHashCode(this.b1g_1)) | 0;
+    result = imul(result, 31) + (this.c1g_1 == null ? 0 : getStringHashCode(this.c1g_1)) | 0;
+    result = imul(result, 31) + (this.d1g_1 == null ? 0 : getStringHashCode(this.d1g_1)) | 0;
+    result = imul(result, 31) + (this.e1g_1 == null ? 0 : getStringHashCode(this.e1g_1)) | 0;
+    result = imul(result, 31) + (this.f1g_1 == null ? 0 : getStringHashCode(this.f1g_1)) | 0;
     return result;
   };
   protoOf(IngredientItem).equals = function (other) {
@@ -1752,23 +1757,23 @@
       return true;
     if (!(other instanceof IngredientItem))
       return false;
-    if (!equals(this.n1f_1, other.n1f_1))
+    if (!equals(this.x1f_1, other.x1f_1))
       return false;
-    if (!(this.o1f_1 == other.o1f_1))
+    if (!(this.y1f_1 == other.y1f_1))
       return false;
-    if (!(this.p1f_1 == other.p1f_1))
+    if (!(this.z1f_1 == other.z1f_1))
       return false;
-    if (!(this.q1f_1 == other.q1f_1))
+    if (!(this.a1g_1 == other.a1g_1))
       return false;
-    if (!(this.r1f_1 == other.r1f_1))
+    if (!(this.b1g_1 == other.b1g_1))
       return false;
-    if (!(this.s1f_1 == other.s1f_1))
+    if (!(this.c1g_1 == other.c1g_1))
       return false;
-    if (!(this.t1f_1 == other.t1f_1))
+    if (!(this.d1g_1 == other.d1g_1))
       return false;
-    if (!(this.u1f_1 == other.u1f_1))
+    if (!(this.e1g_1 == other.e1g_1))
       return false;
-    if (!(this.v1f_1 == other.v1f_1))
+    if (!(this.f1g_1 == other.f1g_1))
       return false;
     return true;
   };
@@ -1781,63 +1786,63 @@
   function $serializer_4() {
     $serializer_instance_4 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Range', this, 2);
-    tmp0_serialDesc.ws('max', true);
-    tmp0_serialDesc.ws('min', true);
-    this.c1h_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ct('max', true);
+    tmp0_serialDesc.ct('min', true);
+    this.m1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_4).d1h = function (encoder, value) {
-    var tmp0_desc = this.c1h_1;
-    var tmp1_output = encoder.nl(tmp0_desc);
-    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.e1h_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 0, DoubleSerializer_getInstance(), value.e1h_1);
+  protoOf($serializer_4).n1h = function (encoder, value) {
+    var tmp0_desc = this.m1h_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    if (tmp1_output.pn(tmp0_desc, 0) ? true : !(value.o1h_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 0, DoubleSerializer_getInstance(), value.o1h_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.f1h_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 1, DoubleSerializer_getInstance(), value.f1h_1);
+    if (tmp1_output.pn(tmp0_desc, 1) ? true : !(value.p1h_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 1, DoubleSerializer_getInstance(), value.p1h_1);
     }
-    tmp1_output.ol(tmp0_desc);
+    tmp1_output.ul(tmp0_desc);
   };
-  protoOf($serializer_4).ri = function (encoder, value) {
-    return this.d1h(encoder, value instanceof Range ? value : THROW_CCE());
+  protoOf($serializer_4).xi = function (encoder, value) {
+    return this.n1h(encoder, value instanceof Range ? value : THROW_CCE());
   };
-  protoOf($serializer_4).si = function (decoder) {
-    var tmp0_desc = this.c1h_1;
+  protoOf($serializer_4).yi = function (decoder) {
+    var tmp0_desc = this.m1h_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.nl(tmp0_desc);
-    if (tmp6_input.dm()) {
-      tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
+    var tmp6_input = decoder.tl(tmp0_desc);
+    if (tmp6_input.jm()) {
+      tmp4_local0 = tmp6_input.hm(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp6_input.hm(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp6_input.em(tmp0_desc);
+        tmp2_index = tmp6_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp6_input.bm(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp6_input.hm(tmp0_desc, 0, DoubleSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp6_input.bm(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp6_input.hm(tmp0_desc, 1, DoubleSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp6_input.ol(tmp0_desc);
+    tmp6_input.ul(tmp0_desc);
     return Range_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, null);
   };
-  protoOf($serializer_4).qi = function () {
-    return this.c1h_1;
+  protoOf($serializer_4).wi = function () {
+    return this.m1h_1;
   };
-  protoOf($serializer_4).ys = function () {
+  protoOf($serializer_4).et = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -1851,16 +1856,16 @@
   }
   function Range_init_$Init$(seen0, max, min, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_4().c1h_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_4().m1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.e1h_1 = null;
+      $this.o1h_1 = null;
     else
-      $this.e1h_1 = max;
+      $this.o1h_1 = max;
     if (0 === (seen0 & 2))
-      $this.f1h_1 = null;
+      $this.p1h_1 = null;
     else
-      $this.f1h_1 = min;
+      $this.p1h_1 = min;
     return $this;
   }
   function Range_init_$Create$(seen0, max, min, serializationConstructorMarker) {
@@ -1869,15 +1874,15 @@
   function Range(max, min) {
     max = max === VOID ? null : max;
     min = min === VOID ? null : min;
-    this.e1h_1 = max;
-    this.f1h_1 = min;
+    this.o1h_1 = max;
+    this.p1h_1 = min;
   }
   protoOf(Range).toString = function () {
-    return 'Range(max=' + this.e1h_1 + ', min=' + this.f1h_1 + ')';
+    return 'Range(max=' + this.o1h_1 + ', min=' + this.p1h_1 + ')';
   };
   protoOf(Range).hashCode = function () {
-    var result = this.e1h_1 == null ? 0 : getNumberHashCode(this.e1h_1);
-    result = imul(result, 31) + (this.f1h_1 == null ? 0 : getNumberHashCode(this.f1h_1)) | 0;
+    var result = this.o1h_1 == null ? 0 : getNumberHashCode(this.o1h_1);
+    result = imul(result, 31) + (this.p1h_1 == null ? 0 : getNumberHashCode(this.p1h_1)) | 0;
     return result;
   };
   protoOf(Range).equals = function (other) {
@@ -1885,9 +1890,9 @@
       return true;
     if (!(other instanceof Range))
       return false;
-    if (!equals(this.e1h_1, other.e1h_1))
+    if (!equals(this.o1h_1, other.o1h_1))
       return false;
-    if (!equals(this.f1h_1, other.f1h_1))
+    if (!equals(this.p1h_1, other.p1h_1))
       return false;
     return true;
   };
@@ -1901,7 +1906,7 @@
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    tmp.g1h_1 = [null, null, lazy(tmp_0, Instruction$Companion$$childSerializers$_anonymous__sbbefw), null];
+    tmp.q1h_1 = [null, null, lazy(tmp_0, Instruction$Companion$$childSerializers$_anonymous__sbbefw), null];
   }
   var Companion_instance_3;
   function Companion_getInstance_3() {
@@ -1912,33 +1917,33 @@
   function $serializer_5() {
     $serializer_instance_5 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Instruction', this, 4);
-    tmp0_serialDesc.ws('description', false);
-    tmp0_serialDesc.ws('descriptionTemplate', true);
-    tmp0_serialDesc.ws('images', true);
-    tmp0_serialDesc.ws('stepNumber', true);
-    this.h1h_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ct('description', false);
+    tmp0_serialDesc.ct('descriptionTemplate', true);
+    tmp0_serialDesc.ct('images', true);
+    tmp0_serialDesc.ct('stepNumber', true);
+    this.r1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_5).i1h = function (encoder, value) {
-    var tmp0_desc = this.h1h_1;
-    var tmp1_output = encoder.nl(tmp0_desc);
-    var tmp2_cached = Companion_getInstance_3().g1h_1;
-    tmp1_output.bn(tmp0_desc, 0, value.x1f_1);
-    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.y1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.y1f_1);
+  protoOf($serializer_5).s1h = function (encoder, value) {
+    var tmp0_desc = this.r1h_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    var tmp2_cached = Companion_getInstance_3().q1h_1;
+    tmp1_output.hn(tmp0_desc, 0, value.h1g_1);
+    if (tmp1_output.pn(tmp0_desc, 1) ? true : !(value.i1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 1, StringSerializer_getInstance(), value.i1g_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.z1f_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 2, tmp2_cached[2].t1(), value.z1f_1);
+    if (tmp1_output.pn(tmp0_desc, 2) ? true : !(value.j1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 2, tmp2_cached[2].t1(), value.j1g_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.a1g_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 3, DoubleSerializer_getInstance(), value.a1g_1);
+    if (tmp1_output.pn(tmp0_desc, 3) ? true : !(value.k1g_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 3, DoubleSerializer_getInstance(), value.k1g_1);
     }
-    tmp1_output.ol(tmp0_desc);
+    tmp1_output.ul(tmp0_desc);
   };
-  protoOf($serializer_5).ri = function (encoder, value) {
-    return this.i1h(encoder, value instanceof Instruction ? value : THROW_CCE());
+  protoOf($serializer_5).xi = function (encoder, value) {
+    return this.s1h(encoder, value instanceof Instruction ? value : THROW_CCE());
   };
-  protoOf($serializer_5).si = function (decoder) {
-    var tmp0_desc = this.h1h_1;
+  protoOf($serializer_5).yi = function (decoder) {
+    var tmp0_desc = this.r1h_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -1946,52 +1951,52 @@
     var tmp5_local1 = null;
     var tmp6_local2 = null;
     var tmp7_local3 = null;
-    var tmp8_input = decoder.nl(tmp0_desc);
-    var tmp9_cached = Companion_getInstance_3().g1h_1;
-    if (tmp8_input.dm()) {
-      tmp4_local0 = tmp8_input.xl(tmp0_desc, 0);
+    var tmp8_input = decoder.tl(tmp0_desc);
+    var tmp9_cached = Companion_getInstance_3().q1h_1;
+    if (tmp8_input.jm()) {
+      tmp4_local0 = tmp8_input.dm(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp8_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, tmp9_cached[2].t1(), tmp6_local2);
+      tmp6_local2 = tmp8_input.hm(tmp0_desc, 2, tmp9_cached[2].t1(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp8_input.bm(tmp0_desc, 3, DoubleSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp8_input.hm(tmp0_desc, 3, DoubleSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp8_input.em(tmp0_desc);
+        tmp2_index = tmp8_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp8_input.xl(tmp0_desc, 0);
+            tmp4_local0 = tmp8_input.dm(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp8_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, tmp9_cached[2].t1(), tmp6_local2);
+            tmp6_local2 = tmp8_input.hm(tmp0_desc, 2, tmp9_cached[2].t1(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp8_input.bm(tmp0_desc, 3, DoubleSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp8_input.hm(tmp0_desc, 3, DoubleSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp8_input.ol(tmp0_desc);
+    tmp8_input.ul(tmp0_desc);
     return Instruction_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
-  protoOf($serializer_5).qi = function () {
-    return this.h1h_1;
+  protoOf($serializer_5).wi = function () {
+    return this.r1h_1;
   };
-  protoOf($serializer_5).ys = function () {
-    var tmp0_cached = Companion_getInstance_3().g1h_1;
+  protoOf($serializer_5).et = function () {
+    var tmp0_cached = Companion_getInstance_3().q1h_1;
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2005,21 +2010,21 @@
   }
   function Instruction_init_$Init$(seen0, description, descriptionTemplate, images, stepNumber, serializationConstructorMarker, $this) {
     if (!(1 === (1 & seen0))) {
-      throwMissingFieldException(seen0, 1, $serializer_getInstance_5().h1h_1);
+      throwMissingFieldException(seen0, 1, $serializer_getInstance_5().r1h_1);
     }
-    $this.x1f_1 = description;
+    $this.h1g_1 = description;
     if (0 === (seen0 & 2))
-      $this.y1f_1 = null;
+      $this.i1g_1 = null;
     else
-      $this.y1f_1 = descriptionTemplate;
+      $this.i1g_1 = descriptionTemplate;
     if (0 === (seen0 & 4))
-      $this.z1f_1 = null;
+      $this.j1g_1 = null;
     else
-      $this.z1f_1 = images;
+      $this.j1g_1 = images;
     if (0 === (seen0 & 8))
-      $this.a1g_1 = null;
+      $this.k1g_1 = null;
     else
-      $this.a1g_1 = stepNumber;
+      $this.k1g_1 = stepNumber;
     return $this;
   }
   function Instruction_init_$Create$(seen0, description, descriptionTemplate, images, stepNumber, serializationConstructorMarker) {
@@ -2030,29 +2035,29 @@
     descriptionTemplate = descriptionTemplate === VOID ? null : descriptionTemplate;
     images = images === VOID ? null : images;
     stepNumber = stepNumber === VOID ? null : stepNumber;
-    this.x1f_1 = description;
-    this.y1f_1 = descriptionTemplate;
-    this.z1f_1 = images;
-    this.a1g_1 = stepNumber;
+    this.h1g_1 = description;
+    this.i1g_1 = descriptionTemplate;
+    this.j1g_1 = images;
+    this.k1g_1 = stepNumber;
   }
-  protoOf(Instruction).j1h = function (description, descriptionTemplate, images, stepNumber) {
+  protoOf(Instruction).t1h = function (description, descriptionTemplate, images, stepNumber) {
     return new Instruction(description, descriptionTemplate, images, stepNumber);
   };
-  protoOf(Instruction).b1g = function (description, descriptionTemplate, images, stepNumber, $super) {
-    description = description === VOID ? this.x1f_1 : description;
-    descriptionTemplate = descriptionTemplate === VOID ? this.y1f_1 : descriptionTemplate;
-    images = images === VOID ? this.z1f_1 : images;
-    stepNumber = stepNumber === VOID ? this.a1g_1 : stepNumber;
-    return $super === VOID ? this.j1h(description, descriptionTemplate, images, stepNumber) : $super.j1h.call(this, description, descriptionTemplate, images, stepNumber);
+  protoOf(Instruction).l1g = function (description, descriptionTemplate, images, stepNumber, $super) {
+    description = description === VOID ? this.h1g_1 : description;
+    descriptionTemplate = descriptionTemplate === VOID ? this.i1g_1 : descriptionTemplate;
+    images = images === VOID ? this.j1g_1 : images;
+    stepNumber = stepNumber === VOID ? this.k1g_1 : stepNumber;
+    return $super === VOID ? this.t1h(description, descriptionTemplate, images, stepNumber) : $super.t1h.call(this, description, descriptionTemplate, images, stepNumber);
   };
   protoOf(Instruction).toString = function () {
-    return 'Instruction(description=' + this.x1f_1 + ', descriptionTemplate=' + this.y1f_1 + ', images=' + toString(this.z1f_1) + ', stepNumber=' + this.a1g_1 + ')';
+    return 'Instruction(description=' + this.h1g_1 + ', descriptionTemplate=' + this.i1g_1 + ', images=' + toString(this.j1g_1) + ', stepNumber=' + this.k1g_1 + ')';
   };
   protoOf(Instruction).hashCode = function () {
-    var result = getStringHashCode(this.x1f_1);
-    result = imul(result, 31) + (this.y1f_1 == null ? 0 : getStringHashCode(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 : getNumberHashCode(this.a1g_1)) | 0;
+    var result = getStringHashCode(this.h1g_1);
+    result = imul(result, 31) + (this.i1g_1 == null ? 0 : getStringHashCode(this.i1g_1)) | 0;
+    result = imul(result, 31) + (this.j1g_1 == null ? 0 : hashCode(this.j1g_1)) | 0;
+    result = imul(result, 31) + (this.k1g_1 == null ? 0 : getNumberHashCode(this.k1g_1)) | 0;
     return result;
   };
   protoOf(Instruction).equals = function (other) {
@@ -2060,85 +2065,85 @@
       return true;
     if (!(other instanceof Instruction))
       return false;
-    if (!(this.x1f_1 === other.x1f_1))
+    if (!(this.h1g_1 === other.h1g_1))
       return false;
-    if (!(this.y1f_1 == other.y1f_1))
+    if (!(this.i1g_1 == other.i1g_1))
       return false;
-    if (!equals(this.z1f_1, other.z1f_1))
+    if (!equals(this.j1g_1, other.j1g_1))
       return false;
-    if (!equals(this.a1g_1, other.a1g_1))
+    if (!equals(this.k1g_1, other.k1g_1))
       return false;
     return true;
   };
   function $serializer_6() {
     $serializer_instance_6 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Serves', this, 3);
-    tmp0_serialDesc.ws('amount', true);
-    tmp0_serialDesc.ws('text', true);
-    tmp0_serialDesc.ws('unit', false);
-    this.k1h_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ct('amount', true);
+    tmp0_serialDesc.ct('text', true);
+    tmp0_serialDesc.ct('unit', false);
+    this.u1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_6).l1h = function (encoder, value) {
-    var tmp0_desc = this.k1h_1;
-    var tmp1_output = encoder.nl(tmp0_desc);
-    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.m1h_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 0, $serializer_getInstance_4(), value.m1h_1);
+  protoOf($serializer_6).v1h = function (encoder, value) {
+    var tmp0_desc = this.u1h_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    if (tmp1_output.pn(tmp0_desc, 0) ? true : !(value.w1h_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 0, $serializer_getInstance_4(), value.w1h_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.n1h_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.n1h_1);
+    if (tmp1_output.pn(tmp0_desc, 1) ? true : !(value.x1h_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 1, StringSerializer_getInstance(), value.x1h_1);
     }
-    tmp1_output.bn(tmp0_desc, 2, value.o1h_1);
-    tmp1_output.ol(tmp0_desc);
+    tmp1_output.hn(tmp0_desc, 2, value.y1h_1);
+    tmp1_output.ul(tmp0_desc);
   };
-  protoOf($serializer_6).ri = function (encoder, value) {
-    return this.l1h(encoder, value instanceof Serves ? value : THROW_CCE());
+  protoOf($serializer_6).xi = function (encoder, value) {
+    return this.v1h(encoder, value instanceof Serves ? value : THROW_CCE());
   };
-  protoOf($serializer_6).si = function (decoder) {
-    var tmp0_desc = this.k1h_1;
+  protoOf($serializer_6).yi = 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.nl(tmp0_desc);
-    if (tmp7_input.dm()) {
-      tmp4_local0 = tmp7_input.bm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
+    var tmp7_input = decoder.tl(tmp0_desc);
+    if (tmp7_input.jm()) {
+      tmp4_local0 = tmp7_input.hm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp7_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.xl(tmp0_desc, 2);
+      tmp6_local2 = tmp7_input.dm(tmp0_desc, 2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.em(tmp0_desc);
+        tmp2_index = tmp7_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.bm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
+            tmp4_local0 = tmp7_input.hm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp7_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.xl(tmp0_desc, 2);
+            tmp6_local2 = tmp7_input.dm(tmp0_desc, 2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.ol(tmp0_desc);
+    tmp7_input.ul(tmp0_desc);
     return Serves_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_6).qi = function () {
-    return this.k1h_1;
+  protoOf($serializer_6).wi = function () {
+    return this.u1h_1;
   };
-  protoOf($serializer_6).ys = function () {
+  protoOf($serializer_6).et = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2152,17 +2157,17 @@
   }
   function Serves_init_$Init$(seen0, amount, text, unit, serializationConstructorMarker, $this) {
     if (!(4 === (4 & seen0))) {
-      throwMissingFieldException(seen0, 4, $serializer_getInstance_6().k1h_1);
+      throwMissingFieldException(seen0, 4, $serializer_getInstance_6().u1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.m1h_1 = null;
+      $this.w1h_1 = null;
     else
-      $this.m1h_1 = amount;
+      $this.w1h_1 = amount;
     if (0 === (seen0 & 2))
-      $this.n1h_1 = null;
+      $this.x1h_1 = null;
     else
-      $this.n1h_1 = text;
-    $this.o1h_1 = unit;
+      $this.x1h_1 = text;
+    $this.y1h_1 = unit;
     return $this;
   }
   function Serves_init_$Create$(seen0, amount, text, unit, serializationConstructorMarker) {
@@ -2171,12 +2176,12 @@
   function Serves() {
   }
   protoOf(Serves).toString = function () {
-    return 'Serves(amount=' + toString(this.m1h_1) + ', text=' + this.n1h_1 + ', unit=' + this.o1h_1 + ')';
+    return 'Serves(amount=' + toString(this.w1h_1) + ', text=' + this.x1h_1 + ', unit=' + this.y1h_1 + ')';
   };
   protoOf(Serves).hashCode = function () {
-    var result = this.m1h_1 == null ? 0 : this.m1h_1.hashCode();
-    result = imul(result, 31) + (this.n1h_1 == null ? 0 : getStringHashCode(this.n1h_1)) | 0;
-    result = imul(result, 31) + getStringHashCode(this.o1h_1) | 0;
+    var result = this.w1h_1 == null ? 0 : this.w1h_1.hashCode();
+    result = imul(result, 31) + (this.x1h_1 == null ? 0 : getStringHashCode(this.x1h_1)) | 0;
+    result = imul(result, 31) + getStringHashCode(this.y1h_1) | 0;
     return result;
   };
   protoOf(Serves).equals = function (other) {
@@ -2184,11 +2189,11 @@
       return true;
     if (!(other instanceof Serves))
       return false;
-    if (!equals(this.m1h_1, other.m1h_1))
+    if (!equals(this.w1h_1, other.w1h_1))
       return false;
-    if (!(this.n1h_1 == other.n1h_1))
+    if (!(this.x1h_1 == other.x1h_1))
       return false;
-    if (!(this.o1h_1 === other.o1h_1))
+    if (!(this.y1h_1 === other.y1h_1))
       return false;
     return true;
   };
@@ -2201,74 +2206,74 @@
   function $serializer_7() {
     $serializer_instance_7 = this;
     var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.generated.Timing', this, 3);
-    tmp0_serialDesc.ws('durationInMins', true);
-    tmp0_serialDesc.ws('qualifier', true);
-    tmp0_serialDesc.ws('text', true);
-    this.p1h_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ct('durationInMins', true);
+    tmp0_serialDesc.ct('qualifier', true);
+    tmp0_serialDesc.ct('text', true);
+    this.z1h_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_7).q1h = function (encoder, value) {
-    var tmp0_desc = this.p1h_1;
-    var tmp1_output = encoder.nl(tmp0_desc);
-    if (tmp1_output.jn(tmp0_desc, 0) ? true : !(value.r1h_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 0, $serializer_getInstance_4(), value.r1h_1);
+  protoOf($serializer_7).a1i = function (encoder, value) {
+    var tmp0_desc = this.z1h_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    if (tmp1_output.pn(tmp0_desc, 0) ? true : !(value.b1i_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 0, $serializer_getInstance_4(), value.b1i_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.s1h_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 1, StringSerializer_getInstance(), value.s1h_1);
+    if (tmp1_output.pn(tmp0_desc, 1) ? true : !(value.c1i_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 1, StringSerializer_getInstance(), value.c1i_1);
     }
-    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.t1h_1 == null)) {
-      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.t1h_1);
+    if (tmp1_output.pn(tmp0_desc, 2) ? true : !(value.d1i_1 == null)) {
+      tmp1_output.ln(tmp0_desc, 2, StringSerializer_getInstance(), value.d1i_1);
     }
-    tmp1_output.ol(tmp0_desc);
+    tmp1_output.ul(tmp0_desc);
   };
-  protoOf($serializer_7).ri = function (encoder, value) {
-    return this.q1h(encoder, value instanceof Timing ? value : THROW_CCE());
+  protoOf($serializer_7).xi = function (encoder, value) {
+    return this.a1i(encoder, value instanceof Timing ? value : THROW_CCE());
   };
-  protoOf($serializer_7).si = function (decoder) {
-    var tmp0_desc = this.p1h_1;
+  protoOf($serializer_7).yi = function (decoder) {
+    var tmp0_desc = this.z1h_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.nl(tmp0_desc);
-    if (tmp7_input.dm()) {
-      tmp4_local0 = tmp7_input.bm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
+    var tmp7_input = decoder.tl(tmp0_desc);
+    if (tmp7_input.jm()) {
+      tmp4_local0 = tmp7_input.hm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp7_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp7_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp7_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp7_input.em(tmp0_desc);
+        tmp2_index = tmp7_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp7_input.bm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
+            tmp4_local0 = tmp7_input.hm(tmp0_desc, 0, $serializer_getInstance_4(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp7_input.bm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp7_input.hm(tmp0_desc, 1, StringSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp7_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp7_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp7_input.ol(tmp0_desc);
+    tmp7_input.ul(tmp0_desc);
     return Timing_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, null);
   };
-  protoOf($serializer_7).qi = function () {
-    return this.p1h_1;
+  protoOf($serializer_7).wi = function () {
+    return this.z1h_1;
   };
-  protoOf($serializer_7).ys = function () {
+  protoOf($serializer_7).et = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2282,20 +2287,20 @@
   }
   function Timing_init_$Init$(seen0, durationInMins, qualifier, text, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_7().p1h_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_7().z1h_1);
     }
     if (0 === (seen0 & 1))
-      $this.r1h_1 = null;
+      $this.b1i_1 = null;
     else
-      $this.r1h_1 = durationInMins;
+      $this.b1i_1 = durationInMins;
     if (0 === (seen0 & 2))
-      $this.s1h_1 = null;
+      $this.c1i_1 = null;
     else
-      $this.s1h_1 = qualifier;
+      $this.c1i_1 = qualifier;
     if (0 === (seen0 & 4))
-      $this.t1h_1 = null;
+      $this.d1i_1 = null;
     else
-      $this.t1h_1 = text;
+      $this.d1i_1 = text;
     return $this;
   }
   function Timing_init_$Create$(seen0, durationInMins, qualifier, text, serializationConstructorMarker) {
@@ -2305,17 +2310,17 @@
     durationInMins = durationInMins === VOID ? null : durationInMins;
     qualifier = qualifier === VOID ? null : qualifier;
     text = text === VOID ? null : text;
-    this.r1h_1 = durationInMins;
-    this.s1h_1 = qualifier;
-    this.t1h_1 = text;
+    this.b1i_1 = durationInMins;
+    this.c1i_1 = qualifier;
+    this.d1i_1 = text;
   }
   protoOf(Timing).toString = function () {
-    return 'Timing(durationInMins=' + toString(this.r1h_1) + ', qualifier=' + this.s1h_1 + ', text=' + this.t1h_1 + ')';
+    return 'Timing(durationInMins=' + toString(this.b1i_1) + ', qualifier=' + this.c1i_1 + ', text=' + this.d1i_1 + ')';
   };
   protoOf(Timing).hashCode = function () {
-    var result = this.r1h_1 == null ? 0 : this.r1h_1.hashCode();
-    result = imul(result, 31) + (this.s1h_1 == null ? 0 : getStringHashCode(this.s1h_1)) | 0;
-    result = imul(result, 31) + (this.t1h_1 == null ? 0 : getStringHashCode(this.t1h_1)) | 0;
+    var result = this.b1i_1 == null ? 0 : this.b1i_1.hashCode();
+    result = imul(result, 31) + (this.c1i_1 == null ? 0 : getStringHashCode(this.c1i_1)) | 0;
+    result = imul(result, 31) + (this.d1i_1 == null ? 0 : getStringHashCode(this.d1i_1)) | 0;
     return result;
   };
   protoOf(Timing).equals = function (other) {
@@ -2323,29 +2328,29 @@
       return true;
     if (!(other instanceof Timing))
       return false;
-    if (!equals(this.r1h_1, other.r1h_1))
+    if (!equals(this.b1i_1, other.b1i_1))
       return false;
-    if (!(this.s1h_1 == other.s1h_1))
+    if (!(this.c1i_1 == other.c1i_1))
       return false;
-    if (!(this.t1h_1 == other.t1h_1))
+    if (!(this.d1i_1 == other.d1i_1))
       return false;
     return true;
   };
   function ParsedTemplate(elements) {
-    this.n1e_1 = elements;
+    this.x1e_1 = elements;
   }
   protoOf(ParsedTemplate).toString = function () {
-    return 'ParsedTemplate(elements=' + toString_0(this.n1e_1) + ')';
+    return 'ParsedTemplate(elements=' + toString_0(this.x1e_1) + ')';
   };
   protoOf(ParsedTemplate).hashCode = function () {
-    return hashCode(this.n1e_1);
+    return hashCode(this.x1e_1);
   };
   protoOf(ParsedTemplate).equals = function (other) {
     if (this === other)
       return true;
     if (!(other instanceof ParsedTemplate))
       return false;
-    if (!equals(this.n1e_1, other.n1e_1))
+    if (!equals(this.x1e_1, other.x1e_1))
       return false;
     return true;
   };
@@ -2361,39 +2366,39 @@
     var parts = ArrayList_init_$Create$_0();
     var lastEnd = 0;
     // Inline function 'kotlin.sequences.forEach' call
-    var _iterator__ex2g4s = pattern.va(template).h();
+    var _iterator__ex2g4s = pattern.ya(template).h();
     while (_iterator__ex2g4s.i()) {
       var element = _iterator__ex2g4s.j();
-      if (element.jb().p_1 > lastEnd) {
-        var textPart = substring(template, lastEnd, element.jb().p_1);
+      if (element.ab().p_1 > lastEnd) {
+        var textPart = substring_0(template, lastEnd, element.ab().p_1);
         // Inline function 'kotlin.text.isNotEmpty' call
         if (charSequenceLength(textPart) > 0) {
           parts.f(new TemplateConst(textPart));
         }
       }
       try {
-        var jsonObj = get_jsonObject(Default_getInstance().b12(element.t1()));
+        var jsonObj = get_jsonObject(Default_getInstance().h12(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.cm();
+          var this_1 = this_0.im();
           // 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.a12(tmp$ret$3, jsonObj);
+          var it = this_0.g12(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.cm();
+          var this_4 = this_3.im();
           // 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.a12(tmp$ret$8, jsonObj);
+          var it_0 = this_3.g12(tmp$ret$8, jsonObj);
           parts.f(it_0);
         }
       } catch ($p) {
@@ -2405,10 +2410,10 @@
           throw $p;
         }
       }
-      lastEnd = element.jb().q_1 + 1 | 0;
+      lastEnd = element.ab().q_1 + 1 | 0;
     }
     if (lastEnd < template.length) {
-      var remaining = substring_0(template, lastEnd);
+      var remaining = substring(template, lastEnd);
       // Inline function 'kotlin.text.isNotBlank' call
       if (!isBlank(remaining)) {
         parts.f(new TemplateConst(remaining));
@@ -2418,7 +2423,7 @@
   }
   function tolerantJson$lambda($this$Json) {
     _init_properties_Parser_kt__o3jwn5();
-    $this$Json.t12_1 = true;
+    $this$Json.z12_1 = true;
     return Unit_instance;
   }
   var properties_initialized_Parser_kt_5uifb3;
@@ -2436,15 +2441,15 @@
   protoOf(TemplateConst).t1 = function () {
     return this.value;
   };
-  protoOf(TemplateConst).cd = function () {
+  protoOf(TemplateConst).id = function () {
     return this.value;
   };
-  protoOf(TemplateConst).u1h = function (value) {
+  protoOf(TemplateConst).e1i = function (value) {
     return new TemplateConst(value);
   };
   protoOf(TemplateConst).copy = function (value, $super) {
     value = value === VOID ? this.value : value;
-    return $super === VOID ? this.u1h(value) : $super.u1h.call(this, value);
+    return $super === VOID ? this.e1i(value) : $super.e1i.call(this, value);
   };
   protoOf(TemplateConst).toString = function () {
     return 'TemplateConst(value=' + this.value + ')';
@@ -2463,7 +2468,7 @@
   };
   function Companion_5() {
   }
-  protoOf(Companion_5).i14 = function () {
+  protoOf(Companion_5).o14 = function () {
     return $serializer_getInstance_8();
   };
   var Companion_instance_5;
@@ -2472,33 +2477,41 @@
   }
   function $serializer_8() {
     $serializer_instance_8 = this;
-    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.v1h_1 = tmp0_serialDesc;
+    var tmp0_serialDesc = new PluginGeneratedSerialDescriptor('com.gu.recipe.template.QuantityPlaceholder', this, 6);
+    tmp0_serialDesc.ct('min', false);
+    tmp0_serialDesc.ct('max', true);
+    tmp0_serialDesc.ct('unit', true);
+    tmp0_serialDesc.ct('scale', true);
+    tmp0_serialDesc.ct('ingredient', true);
+    tmp0_serialDesc.ct('usCust', true);
+    this.f1i_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_8).w1h = function (encoder, value) {
-    var tmp0_desc = this.v1h_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);
+  protoOf($serializer_8).g1i = function (encoder, value) {
+    var tmp0_desc = this.f1i_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    tmp1_output.en(tmp0_desc, 0, value.min);
+    if (tmp1_output.pn(tmp0_desc, 1) ? true : !(value.max == null)) {
+      tmp1_output.ln(tmp0_desc, 1, FloatSerializer_getInstance(), value.max);
+    }
+    if (tmp1_output.pn(tmp0_desc, 2) ? true : !(value.unit == null)) {
+      tmp1_output.ln(tmp0_desc, 2, StringSerializer_getInstance(), value.unit);
+    }
+    if (tmp1_output.pn(tmp0_desc, 3) ? true : !(value.scale === false)) {
+      tmp1_output.zm(tmp0_desc, 3, value.scale);
     }
-    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.unit == null)) {
-      tmp1_output.fn(tmp0_desc, 2, StringSerializer_getInstance(), value.unit);
+    if (tmp1_output.pn(tmp0_desc, 4) ? true : !(value.ingredient == null)) {
+      tmp1_output.ln(tmp0_desc, 4, StringSerializer_getInstance(), value.ingredient);
     }
-    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.scale === false)) {
-      tmp1_output.tm(tmp0_desc, 3, value.scale);
+    if (tmp1_output.pn(tmp0_desc, 5) ? true : !(value.usCust == null)) {
+      tmp1_output.ln(tmp0_desc, 5, BooleanSerializer_getInstance(), value.usCust);
     }
-    tmp1_output.ol(tmp0_desc);
+    tmp1_output.ul(tmp0_desc);
   };
-  protoOf($serializer_8).ri = function (encoder, value) {
-    return this.w1h(encoder, value instanceof QuantityPlaceholder ? value : THROW_CCE());
+  protoOf($serializer_8).xi = function (encoder, value) {
+    return this.g1i(encoder, value instanceof QuantityPlaceholder ? value : THROW_CCE());
   };
-  protoOf($serializer_8).si = function (decoder) {
-    var tmp0_desc = this.v1h_1;
+  protoOf($serializer_8).yi = function (decoder) {
+    var tmp0_desc = this.f1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2506,54 +2519,68 @@
     var tmp5_local1 = null;
     var tmp6_local2 = null;
     var tmp7_local3 = false;
-    var tmp8_input = decoder.nl(tmp0_desc);
-    if (tmp8_input.dm()) {
-      tmp4_local0 = tmp8_input.ul(tmp0_desc, 0);
+    var tmp8_local4 = null;
+    var tmp9_local5 = null;
+    var tmp10_input = decoder.tl(tmp0_desc);
+    if (tmp10_input.jm()) {
+      tmp4_local0 = tmp10_input.am(tmp0_desc, 0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp10_input.hm(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp10_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp8_input.pl(tmp0_desc, 3);
+      tmp7_local3 = tmp10_input.vl(tmp0_desc, 3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
+      tmp8_local4 = tmp10_input.hm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+      tmp3_bitMask0 = tmp3_bitMask0 | 16;
+      tmp9_local5 = tmp10_input.hm(tmp0_desc, 5, BooleanSerializer_getInstance(), tmp9_local5);
+      tmp3_bitMask0 = tmp3_bitMask0 | 32;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp8_input.em(tmp0_desc);
+        tmp2_index = tmp10_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp8_input.ul(tmp0_desc, 0);
+            tmp4_local0 = tmp10_input.am(tmp0_desc, 0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp10_input.hm(tmp0_desc, 1, FloatSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp10_input.hm(tmp0_desc, 2, StringSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp8_input.pl(tmp0_desc, 3);
+            tmp7_local3 = tmp10_input.vl(tmp0_desc, 3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
+          case 4:
+            tmp8_local4 = tmp10_input.hm(tmp0_desc, 4, StringSerializer_getInstance(), tmp8_local4);
+            tmp3_bitMask0 = tmp3_bitMask0 | 16;
+            break;
+          case 5:
+            tmp9_local5 = tmp10_input.hm(tmp0_desc, 5, BooleanSerializer_getInstance(), tmp9_local5);
+            tmp3_bitMask0 = tmp3_bitMask0 | 32;
+            break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp8_input.ol(tmp0_desc);
-    return QuantityPlaceholder_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
+    tmp10_input.ul(tmp0_desc);
+    return QuantityPlaceholder_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, tmp8_local4, tmp9_local5, null);
   };
-  protoOf($serializer_8).qi = function () {
-    return this.v1h_1;
+  protoOf($serializer_8).wi = function () {
+    return this.f1i_1;
   };
-  protoOf($serializer_8).ys = function () {
+  protoOf($serializer_8).et = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
-    return [FloatSerializer_getInstance(), get_nullable(FloatSerializer_getInstance()), get_nullable(StringSerializer_getInstance()), BooleanSerializer_getInstance()];
+    return [FloatSerializer_getInstance(), get_nullable(FloatSerializer_getInstance()), get_nullable(StringSerializer_getInstance()), BooleanSerializer_getInstance(), get_nullable(StringSerializer_getInstance()), get_nullable(BooleanSerializer_getInstance())];
   };
   var $serializer_instance_8;
   function $serializer_getInstance_8() {
@@ -2561,9 +2588,9 @@
       new $serializer_8();
     return $serializer_instance_8;
   }
-  function QuantityPlaceholder_init_$Init$(seen0, min, max, unit, scale, serializationConstructorMarker, $this) {
+  function QuantityPlaceholder_init_$Init$(seen0, min, max, unit, scale, ingredient, usCust, serializationConstructorMarker, $this) {
     if (!(1 === (1 & seen0))) {
-      throwMissingFieldException(seen0, 1, $serializer_getInstance_8().v1h_1);
+      throwMissingFieldException(seen0, 1, $serializer_getInstance_8().f1i_1);
     }
     $this.min = min;
     if (0 === (seen0 & 2))
@@ -2578,62 +2605,90 @@
       $this.scale = false;
     else
       $this.scale = scale;
+    if (0 === (seen0 & 16))
+      $this.ingredient = null;
+    else
+      $this.ingredient = ingredient;
+    if (0 === (seen0 & 32))
+      $this.usCust = null;
+    else
+      $this.usCust = usCust;
     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_init_$Create$(seen0, min, max, unit, scale, ingredient, usCust, serializationConstructorMarker) {
+    return QuantityPlaceholder_init_$Init$(seen0, min, max, unit, scale, ingredient, usCust, serializationConstructorMarker, objectCreate(protoOf(QuantityPlaceholder)));
   }
-  function QuantityPlaceholder(min, max, unit, scale) {
+  function QuantityPlaceholder(min, max, unit, scale, ingredient, usCust) {
     max = max === VOID ? null : max;
     unit = unit === VOID ? null : unit;
     scale = scale === VOID ? false : scale;
+    ingredient = ingredient === VOID ? null : ingredient;
+    usCust = usCust === VOID ? null : usCust;
     this.min = min;
     this.max = max;
     this.unit = unit;
     this.scale = scale;
+    this.ingredient = ingredient;
+    this.usCust = usCust;
   }
-  protoOf(QuantityPlaceholder).x1h = function () {
+  protoOf(QuantityPlaceholder).h1i = function () {
     return this.min;
   };
-  protoOf(QuantityPlaceholder).y1h = function () {
+  protoOf(QuantityPlaceholder).i1i = function () {
     return this.max;
   };
-  protoOf(QuantityPlaceholder).z1h = function () {
+  protoOf(QuantityPlaceholder).j1i = function () {
     return this.unit;
   };
-  protoOf(QuantityPlaceholder).a1i = function () {
+  protoOf(QuantityPlaceholder).k1i = function () {
     return this.scale;
   };
-  protoOf(QuantityPlaceholder).cd = function () {
+  protoOf(QuantityPlaceholder).l1i = function () {
+    return this.ingredient;
+  };
+  protoOf(QuantityPlaceholder).m1i = function () {
+    return this.usCust;
+  };
+  protoOf(QuantityPlaceholder).id = function () {
     return this.min;
   };
-  protoOf(QuantityPlaceholder).dd = function () {
+  protoOf(QuantityPlaceholder).jd = function () {
     return this.max;
   };
-  protoOf(QuantityPlaceholder).b1i = function () {
+  protoOf(QuantityPlaceholder).n1i = function () {
     return this.unit;
   };
-  protoOf(QuantityPlaceholder).c1i = function () {
+  protoOf(QuantityPlaceholder).o1i = function () {
     return this.scale;
   };
-  protoOf(QuantityPlaceholder).d1i = function (min, max, unit, scale) {
-    return new QuantityPlaceholder(min, max, unit, scale);
+  protoOf(QuantityPlaceholder).p1i = function () {
+    return this.ingredient;
+  };
+  protoOf(QuantityPlaceholder).q1i = function () {
+    return this.usCust;
   };
-  protoOf(QuantityPlaceholder).copy = function (min, max, unit, scale, $super) {
+  protoOf(QuantityPlaceholder).r1i = function (min, max, unit, scale, ingredient, usCust) {
+    return new QuantityPlaceholder(min, max, unit, scale, ingredient, usCust);
+  };
+  protoOf(QuantityPlaceholder).copy = function (min, max, unit, scale, ingredient, usCust, $super) {
     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.d1i(min, max, unit, scale) : $super.d1i.call(this, min, max, unit, scale);
+    ingredient = ingredient === VOID ? this.ingredient : ingredient;
+    usCust = usCust === VOID ? this.usCust : usCust;
+    return $super === VOID ? this.r1i(min, max, unit, scale, ingredient, usCust) : $super.r1i.call(this, min, max, unit, scale, ingredient, usCust);
   };
   protoOf(QuantityPlaceholder).toString = function () {
-    return 'QuantityPlaceholder(min=' + this.min + ', max=' + this.max + ', unit=' + this.unit + ', scale=' + this.scale + ')';
+    return 'QuantityPlaceholder(min=' + this.min + ', max=' + this.max + ', unit=' + this.unit + ', scale=' + this.scale + ', ingredient=' + this.ingredient + ', usCust=' + this.usCust + ')';
   };
   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;
+    result = imul(result, 31) + (this.ingredient == null ? 0 : getStringHashCode(this.ingredient)) | 0;
+    result = imul(result, 31) + (this.usCust == null ? 0 : getBooleanHashCode(this.usCust)) | 0;
     return result;
   };
   protoOf(QuantityPlaceholder).equals = function (other) {
@@ -2649,11 +2704,15 @@
       return false;
     if (!(this.scale === other.scale))
       return false;
+    if (!(this.ingredient == other.ingredient))
+      return false;
+    if (!(this.usCust == other.usCust))
+      return false;
     return true;
   };
   function Companion_6() {
   }
-  protoOf(Companion_6).i14 = function () {
+  protoOf(Companion_6).o14 = function () {
     return $serializer_getInstance_9();
   };
   var Companion_instance_6;
@@ -2663,34 +2722,34 @@
   function $serializer_9() {
     $serializer_instance_9 = this;
     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.e1i_1 = tmp0_serialDesc;
+    tmp0_serialDesc.ct('temperatureC', true);
+    tmp0_serialDesc.ct('temperatureFanC', true);
+    tmp0_serialDesc.ct('temperatureF', true);
+    tmp0_serialDesc.ct('gasMark', true);
+    this.s1i_1 = tmp0_serialDesc;
   }
-  protoOf($serializer_9).f1i = function (encoder, value) {
-    var tmp0_desc = this.e1i_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);
+  protoOf($serializer_9).t1i = function (encoder, value) {
+    var tmp0_desc = this.s1i_1;
+    var tmp1_output = encoder.tl(tmp0_desc);
+    if (tmp1_output.pn(tmp0_desc, 0) ? true : !(value.temperatureC == null)) {
+      tmp1_output.ln(tmp0_desc, 0, IntSerializer_getInstance(), value.temperatureC);
     }
-    if (tmp1_output.jn(tmp0_desc, 1) ? true : !(value.temperatureFanC == null)) {
-      tmp1_output.fn(tmp0_desc, 1, IntSerializer_getInstance(), value.temperatureFanC);
+    if (tmp1_output.pn(tmp0_desc, 1) ? true : !(value.temperatureFanC == null)) {
+      tmp1_output.ln(tmp0_desc, 1, IntSerializer_getInstance(), value.temperatureFanC);
     }
-    if (tmp1_output.jn(tmp0_desc, 2) ? true : !(value.temperatureF == null)) {
-      tmp1_output.fn(tmp0_desc, 2, IntSerializer_getInstance(), value.temperatureF);
+    if (tmp1_output.pn(tmp0_desc, 2) ? true : !(value.temperatureF == null)) {
+      tmp1_output.ln(tmp0_desc, 2, IntSerializer_getInstance(), value.temperatureF);
     }
-    if (tmp1_output.jn(tmp0_desc, 3) ? true : !(value.gasMark == null)) {
-      tmp1_output.fn(tmp0_desc, 3, FloatSerializer_getInstance(), value.gasMark);
+    if (tmp1_output.pn(tmp0_desc, 3) ? true : !(value.gasMark == null)) {
+      tmp1_output.ln(tmp0_desc, 3, FloatSerializer_getInstance(), value.gasMark);
     }
-    tmp1_output.ol(tmp0_desc);
+    tmp1_output.ul(tmp0_desc);
   };
-  protoOf($serializer_9).ri = function (encoder, value) {
-    return this.f1i(encoder, value instanceof OvenTemperaturePlaceholder ? value : THROW_CCE());
+  protoOf($serializer_9).xi = function (encoder, value) {
+    return this.t1i(encoder, value instanceof OvenTemperaturePlaceholder ? value : THROW_CCE());
   };
-  protoOf($serializer_9).si = function (decoder) {
-    var tmp0_desc = this.e1i_1;
+  protoOf($serializer_9).yi = function (decoder) {
+    var tmp0_desc = this.s1i_1;
     var tmp1_flag = true;
     var tmp2_index = 0;
     var tmp3_bitMask0 = 0;
@@ -2698,50 +2757,50 @@
     var tmp5_local1 = null;
     var tmp6_local2 = null;
     var tmp7_local3 = null;
-    var tmp8_input = decoder.nl(tmp0_desc);
-    if (tmp8_input.dm()) {
-      tmp4_local0 = tmp8_input.bm(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
+    var tmp8_input = decoder.tl(tmp0_desc);
+    if (tmp8_input.jm()) {
+      tmp4_local0 = tmp8_input.hm(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
       tmp3_bitMask0 = tmp3_bitMask0 | 1;
-      tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
+      tmp5_local1 = tmp8_input.hm(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
       tmp3_bitMask0 = tmp3_bitMask0 | 2;
-      tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
+      tmp6_local2 = tmp8_input.hm(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
       tmp3_bitMask0 = tmp3_bitMask0 | 4;
-      tmp7_local3 = tmp8_input.bm(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
+      tmp7_local3 = tmp8_input.hm(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
       tmp3_bitMask0 = tmp3_bitMask0 | 8;
     } else
       while (tmp1_flag) {
-        tmp2_index = tmp8_input.em(tmp0_desc);
+        tmp2_index = tmp8_input.km(tmp0_desc);
         switch (tmp2_index) {
           case -1:
             tmp1_flag = false;
             break;
           case 0:
-            tmp4_local0 = tmp8_input.bm(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
+            tmp4_local0 = tmp8_input.hm(tmp0_desc, 0, IntSerializer_getInstance(), tmp4_local0);
             tmp3_bitMask0 = tmp3_bitMask0 | 1;
             break;
           case 1:
-            tmp5_local1 = tmp8_input.bm(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
+            tmp5_local1 = tmp8_input.hm(tmp0_desc, 1, IntSerializer_getInstance(), tmp5_local1);
             tmp3_bitMask0 = tmp3_bitMask0 | 2;
             break;
           case 2:
-            tmp6_local2 = tmp8_input.bm(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
+            tmp6_local2 = tmp8_input.hm(tmp0_desc, 2, IntSerializer_getInstance(), tmp6_local2);
             tmp3_bitMask0 = tmp3_bitMask0 | 4;
             break;
           case 3:
-            tmp7_local3 = tmp8_input.bm(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
+            tmp7_local3 = tmp8_input.hm(tmp0_desc, 3, FloatSerializer_getInstance(), tmp7_local3);
             tmp3_bitMask0 = tmp3_bitMask0 | 8;
             break;
           default:
             throw UnknownFieldException_init_$Create$(tmp2_index);
         }
       }
-    tmp8_input.ol(tmp0_desc);
+    tmp8_input.ul(tmp0_desc);
     return OvenTemperaturePlaceholder_init_$Create$(tmp3_bitMask0, tmp4_local0, tmp5_local1, tmp6_local2, tmp7_local3, null);
   };
-  protoOf($serializer_9).qi = function () {
-    return this.e1i_1;
+  protoOf($serializer_9).wi = function () {
+    return this.s1i_1;
   };
-  protoOf($serializer_9).ys = function () {
+  protoOf($serializer_9).et = function () {
     // Inline function 'kotlin.arrayOf' call
     // Inline function 'kotlin.js.unsafeCast' call
     // Inline function 'kotlin.js.asDynamic' call
@@ -2755,7 +2814,7 @@
   }
   function OvenTemperaturePlaceholder_init_$Init$(seen0, temperatureC, temperatureFanC, temperatureF, gasMark, serializationConstructorMarker, $this) {
     if (!(0 === (0 & seen0))) {
-      throwMissingFieldException(seen0, 0, $serializer_getInstance_9().e1i_1);
+      throwMissingFieldException(seen0, 0, $serializer_getInstance_9().s1i_1);
     }
     if (0 === (seen0 & 1))
       $this.temperatureC = null;
@@ -2788,31 +2847,31 @@
     this.temperatureF = temperatureF;
     this.gasMark = gasMark;
   }
-  protoOf(OvenTemperaturePlaceholder).g1i = function () {
+  protoOf(OvenTemperaturePlaceholder).u1i = function () {
     return this.temperatureC;
   };
-  protoOf(OvenTemperaturePlaceholder).h1i = function () {
+  protoOf(OvenTemperaturePlaceholder).v1i = function () {
     return this.temperatureFanC;
   };
-  protoOf(OvenTemperaturePlaceholder).i1i = function () {
+  protoOf(OvenTemperaturePlaceholder).w1i = function () {
     return this.temperatureF;
   };
-  protoOf(OvenTemperaturePlaceholder).j1i = function () {
+  protoOf(OvenTemperaturePlaceholder).x1i = function () {
     return this.gasMark;
   };
-  protoOf(OvenTemperaturePlaceholder).cd = function () {
+  protoOf(OvenTemperaturePlaceholder).id = function () {
     return this.temperatureC;
   };
-  protoOf(OvenTemperaturePlaceholder).dd = function () {
+  protoOf(OvenTemperaturePlaceholder).jd = function () {
     return this.temperatureFanC;
   };
-  protoOf(OvenTemperaturePlaceholder).b1i = function () {
+  protoOf(OvenTemperaturePlaceholder).n1i = function () {
     return this.temperatureF;
   };
-  protoOf(OvenTemperaturePlaceholder).c1i = function () {
+  protoOf(OvenTemperaturePlaceholder).o1i = function () {
     return this.gasMark;
   };
-  protoOf(OvenTemperaturePlaceholder).k1i = function (temperatureC, temperatureFanC, temperatureF, gasMark) {
+  protoOf(OvenTemperaturePlaceholder).y1i = function (temperatureC, temperatureFanC, temperatureF, gasMark) {
     return new OvenTemperaturePlaceholder(temperatureC, temperatureFanC, temperatureF, gasMark);
   };
   protoOf(OvenTemperaturePlaceholder).copy = function (temperatureC, temperatureFanC, temperatureF, gasMark, $super) {
@@ -2820,7 +2879,7 @@
     temperatureFanC = temperatureFanC === VOID ? this.temperatureFanC : temperatureFanC;
     temperatureF = temperatureF === VOID ? this.temperatureF : temperatureF;
     gasMark = gasMark === VOID ? this.gasMark : gasMark;
-    return $super === VOID ? this.k1i(temperatureC, temperatureFanC, temperatureF, gasMark) : $super.k1i.call(this, temperatureC, temperatureFanC, temperatureF, gasMark);
+    return $super === VOID ? this.y1i(temperatureC, temperatureFanC, temperatureF, gasMark) : $super.y1i.call(this, temperatureC, temperatureFanC, temperatureF, gasMark);
   };
   protoOf(OvenTemperaturePlaceholder).toString = function () {
     return 'OvenTemperaturePlaceholder(temperatureC=' + this.temperatureC + ', temperatureFanC=' + this.temperatureFanC + ', temperatureF=' + this.temperatureF + ', gasMark=' + this.gasMark + ')';
@@ -2875,23 +2934,23 @@
     Enum.call(this, name, ordinal);
   }
   function Unit(singular, plural, symbol, symbolPlural, unitType, measuringSystem) {
-    this.h1e_1 = singular;
-    this.i1e_1 = plural;
-    this.j1e_1 = symbol;
-    this.k1e_1 = symbolPlural;
-    this.l1e_1 = unitType;
-    this.m1e_1 = measuringSystem;
+    this.r1e_1 = singular;
+    this.s1e_1 = plural;
+    this.t1e_1 = symbol;
+    this.u1e_1 = symbolPlural;
+    this.v1e_1 = unitType;
+    this.w1e_1 = measuringSystem;
   }
   protoOf(Unit).toString = function () {
-    return 'Unit(singular=' + this.h1e_1 + ', plural=' + this.i1e_1 + ', symbol=' + this.j1e_1 + ', symbolPlural=' + this.k1e_1 + ', unitType=' + toString(this.l1e_1) + ', measuringSystem=' + toString(this.m1e_1) + ')';
+    return 'Unit(singular=' + this.r1e_1 + ', plural=' + this.s1e_1 + ', symbol=' + this.t1e_1 + ', symbolPlural=' + this.u1e_1 + ', unitType=' + toString(this.v1e_1) + ', measuringSystem=' + toString(this.w1e_1) + ')';
   };
   protoOf(Unit).hashCode = function () {
-    var result = getStringHashCode(this.h1e_1);
-    result = imul(result, 31) + getStringHashCode(this.i1e_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.j1e_1) | 0;
-    result = imul(result, 31) + getStringHashCode(this.k1e_1) | 0;
-    result = imul(result, 31) + (this.l1e_1 == null ? 0 : this.l1e_1.hashCode()) | 0;
-    result = imul(result, 31) + (this.m1e_1 == null ? 0 : hashCode(this.m1e_1)) | 0;
+    var result = getStringHashCode(this.r1e_1);
+    result = imul(result, 31) + getStringHashCode(this.s1e_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.t1e_1) | 0;
+    result = imul(result, 31) + getStringHashCode(this.u1e_1) | 0;
+    result = imul(result, 31) + (this.v1e_1 == null ? 0 : this.v1e_1.hashCode()) | 0;
+    result = imul(result, 31) + (this.w1e_1 == null ? 0 : hashCode(this.w1e_1)) | 0;
     return result;
   };
   protoOf(Unit).equals = function (other) {
@@ -2899,89 +2958,89 @@
       return true;
     if (!(other instanceof Unit))
       return false;
-    if (!(this.h1e_1 === other.h1e_1))
+    if (!(this.r1e_1 === other.r1e_1))
       return false;
-    if (!(this.i1e_1 === other.i1e_1))
+    if (!(this.s1e_1 === other.s1e_1))
       return false;
-    if (!(this.j1e_1 === other.j1e_1))
+    if (!(this.t1e_1 === other.t1e_1))
       return false;
-    if (!(this.k1e_1 === other.k1e_1))
+    if (!(this.u1e_1 === other.u1e_1))
       return false;
-    if (!equals(this.l1e_1, other.l1e_1))
+    if (!equals(this.v1e_1, other.v1e_1))
       return false;
-    if (!equals(this.m1e_1, other.m1e_1))
+    if (!equals(this.w1e_1, other.w1e_1))
       return false;
     return true;
   };
   function Units() {
     Units_instance = this;
-    this.n1d_1 = new Unit('gram', 'grams', 'g', 'g', UnitType_WEIGHT_getInstance(), Metric_instance);
-    this.o1d_1 = new Unit('kilogram', 'kilograms', 'kg', 'kg', UnitType_WEIGHT_getInstance(), Metric_instance);
-    this.p1d_1 = new Unit('ounce', 'ounces', 'oz', 'oz', UnitType_WEIGHT_getInstance(), Imperial_instance);
-    this.q1d_1 = new Unit('pound', 'pounds', 'lb', 'lbs', UnitType_WEIGHT_getInstance(), Imperial_instance);
-    this.r1d_1 = new Unit('milliliter', 'milliliters', 'ml', 'ml', UnitType_VOLUME_getInstance(), Metric_instance);
-    this.s1d_1 = new Unit('liter', 'liters', 'l', 'l', UnitType_VOLUME_getInstance(), Metric_instance);
-    this.t1d_1 = new Unit('fluid ounce', 'fluid ounces', 'fl oz', 'fl oz', UnitType_VOLUME_getInstance(), Imperial_instance);
-    this.u1d_1 = new Unit('cup', 'cups', 'cup', 'cups', UnitType_VOLUME_getInstance(), Imperial_instance);
-    this.v1d_1 = new Unit('teaspoon', 'teaspoons', 'tsp', 'tsp', UnitType_VOLUME_getInstance(), Imperial_instance);
-    this.w1d_1 = new Unit('tablespoon', 'tablespoons', 'tbsp', 'tbsp', UnitType_VOLUME_getInstance(), Imperial_instance);
-    this.x1d_1 = new Unit('millimeter', 'millimeters', 'mm', 'mm', UnitType_LENGTH_getInstance(), Metric_instance);
-    this.y1d_1 = new Unit('centimeter', 'centimeters', 'cm', 'cm', UnitType_LENGTH_getInstance(), Metric_instance);
-    this.z1d_1 = new Unit('inch', 'inches', 'in', 'in', UnitType_LENGTH_getInstance(), Imperial_instance);
-    this.a1e_1 = new Unit('pint', 'pints', 'pt', 'pts', UnitType_VOLUME_getInstance(), Imperial_instance);
-    this.b1e_1 = listOf([this.n1d_1, this.o1d_1, this.p1d_1, this.q1d_1, this.r1d_1, this.s1d_1, this.t1d_1, this.u1d_1, this.v1d_1, this.w1d_1, this.x1d_1, this.y1d_1, this.z1d_1, this.a1e_1]);
+    this.w1d_1 = new Unit('gram', 'grams', 'g', 'g', UnitType_WEIGHT_getInstance(), Metric_instance);
+    this.x1d_1 = new Unit('kilogram', 'kilograms', 'kg', 'kg', UnitType_WEIGHT_getInstance(), Metric_instance);
+    this.y1d_1 = new Unit('ounce', 'ounces', 'oz', 'oz', UnitType_WEIGHT_getInstance(), Imperial_instance);
+    this.z1d_1 = new Unit('pound', 'pounds', 'lb', 'lbs', UnitType_WEIGHT_getInstance(), Imperial_instance);
+    this.a1e_1 = new Unit('milliliter', 'milliliters', 'ml', 'ml', UnitType_VOLUME_getInstance(), Metric_instance);
+    this.b1e_1 = new Unit('liter', 'liters', 'l', 'l', UnitType_VOLUME_getInstance(), Metric_instance);
+    this.c1e_1 = new Unit('fluid ounce', 'fluid ounces', 'fl oz', 'fl oz', UnitType_VOLUME_getInstance(), Imperial_instance);
+    this.d1e_1 = new Unit('cup', 'cups', 'cup', 'cups', UnitType_VOLUME_getInstance(), Imperial_instance);
+    this.e1e_1 = new Unit('teaspoon', 'teaspoons', 'tsp', 'tsp', UnitType_VOLUME_getInstance(), Imperial_instance);
+    this.f1e_1 = new Unit('tablespoon', 'tablespoons', 'tbsp', 'tbsp', UnitType_VOLUME_getInstance(), Imperial_instance);
+    this.g1e_1 = new Unit('millimeter', 'millimeters', 'mm', 'mm', UnitType_LENGTH_getInstance(), Metric_instance);
+    this.h1e_1 = new Unit('centimeter', 'centimeters', 'cm', 'cm', UnitType_LENGTH_getInstance(), Metric_instance);
+    this.i1e_1 = new Unit('inch', 'inches', 'in', 'in', UnitType_LENGTH_getInstance(), Imperial_instance);
+    this.j1e_1 = new Unit('pint', 'pints', 'pt', 'pts', UnitType_VOLUME_getInstance(), Imperial_instance);
+    this.k1e_1 = listOf([this.w1d_1, this.x1d_1, this.y1d_1, this.z1d_1, this.a1e_1, this.b1e_1, this.c1e_1, this.d1e_1, this.e1e_1, this.f1e_1, this.g1e_1, this.h1e_1, this.i1e_1, this.j1e_1]);
     var tmp = this;
     // Inline function 'kotlin.collections.associateBy' call
-    var this_0 = this.b1e_1;
+    var this_0 = this.k1e_1;
     var capacity = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_0, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination = LinkedHashMap_init_$Create$(capacity);
     var _iterator__ex2g4s = this_0.h();
     while (_iterator__ex2g4s.i()) {
       var element = _iterator__ex2g4s.j();
-      var tmp$ret$0 = element.j1e_1;
+      var tmp$ret$0 = element.t1e_1;
       destination.a2(tmp$ret$0, element);
     }
     var tmp_0 = destination;
     // Inline function 'kotlin.collections.associateBy' call
-    var this_1 = this.b1e_1;
+    var this_1 = this.k1e_1;
     var capacity_0 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_1, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_0 = LinkedHashMap_init_$Create$(capacity_0);
     var _iterator__ex2g4s_0 = this_1.h();
     while (_iterator__ex2g4s_0.i()) {
       var element_0 = _iterator__ex2g4s_0.j();
-      var tmp$ret$3 = element_0.k1e_1;
+      var tmp$ret$3 = element_0.u1e_1;
       destination_0.a2(tmp$ret$3, element_0);
     }
     var tmp_1 = plus(tmp_0, destination_0);
     // Inline function 'kotlin.collections.associateBy' call
-    var this_2 = this.b1e_1;
+    var this_2 = this.k1e_1;
     var capacity_1 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_2, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_1 = LinkedHashMap_init_$Create$(capacity_1);
     var _iterator__ex2g4s_1 = this_2.h();
     while (_iterator__ex2g4s_1.i()) {
       var element_1 = _iterator__ex2g4s_1.j();
-      var tmp$ret$6 = element_1.h1e_1;
+      var tmp$ret$6 = element_1.r1e_1;
       destination_1.a2(tmp$ret$6, element_1);
     }
     var tmp_2 = plus(tmp_1, destination_1);
     // Inline function 'kotlin.collections.associateBy' call
-    var this_3 = this.b1e_1;
+    var this_3 = this.k1e_1;
     var capacity_2 = coerceAtLeast(mapCapacity(collectionSizeOrDefault(this_3, 10)), 16);
     // Inline function 'kotlin.collections.associateByTo' call
     var destination_2 = LinkedHashMap_init_$Create$(capacity_2);
     var _iterator__ex2g4s_2 = this_3.h();
     while (_iterator__ex2g4s_2.i()) {
       var element_2 = _iterator__ex2g4s_2.j();
-      var tmp$ret$9 = element_2.i1e_1;
+      var tmp$ret$9 = element_2.s1e_1;
       destination_2.a2(tmp$ret$9, element_2);
     }
-    tmp.c1e_1 = plus(tmp_2, destination_2);
+    tmp.l1e_1 = plus(tmp_2, destination_2);
   }
-  protoOf(Units).d1e = function (name) {
-    var unit = this.c1e_1.w1(name);
+  protoOf(Units).m1e = function (name) {
+    var unit = this.l1e_1.w1(name);
     if (!(unit == null)) {
       return unit;
     } else {
@@ -3007,44 +3066,64 @@
     return UnitType_LENGTH_instance;
   }
   function UnitConversion() {
-    this.e1e_1 = 28.3495;
-    this.f1e_1 = 2.20462;
+    this.n1e_1 = 28.3495;
+    this.o1e_1 = 2.20462;
+    this.p1e_1 = 236.56;
   }
-  protoOf(UnitConversion).g1e = function (amount, target) {
-    if (amount.i1d_1 == null) {
+  protoOf(UnitConversion).q1e = function (amount, target) {
+    if (amount.o1d_1 == null || equals(amount.o1d_1.w1e_1, target) || equals(target, Metric_instance)) {
       return amount;
     }
-    if (equals(amount.i1d_1.m1e_1, target)) {
-      return amount;
-    }
-    var tmp0_subject = new Pair(amount.i1d_1, target);
     var tmp;
-    if (tmp0_subject.equals(new Pair(Units_getInstance().n1d_1, Imperial_instance))) {
-      var minOunces = amount.g1d_1 / this.e1e_1;
-      var tmp1_safe_receiver = amount.h1d_1;
+    if (amount.p1d_1 === true) {
       var tmp_0;
-      if (tmp1_safe_receiver == null) {
-        tmp_0 = null;
+      if (amount.o1d_1.equals(Units_getInstance().a1e_1)) {
+        var cups = amount.m1d_1 / this.p1e_1;
+        var tmp1_safe_receiver = amount.n1d_1;
+        var tmp_1;
+        if (tmp1_safe_receiver == null) {
+          tmp_1 = null;
+        } else {
+          // Inline function 'kotlin.let' call
+          tmp_1 = tmp1_safe_receiver / UnitConversion_instance.p1e_1;
+        }
+        var maxCups = tmp_1;
+        tmp_0 = new Amount(cups, maxCups, Units_getInstance().d1e_1);
       } else {
-        // Inline function 'kotlin.let' call
-        tmp_0 = tmp1_safe_receiver / UnitConversion_instance.e1e_1;
+        tmp_0 = amount;
       }
-      var maxOunces = tmp_0;
-      tmp = new Amount(minOunces, maxOunces, Units_getInstance().p1d_1);
-    } else if (tmp0_subject.equals(new Pair(Units_getInstance().o1d_1, Imperial_instance))) {
-      var minPounds = amount.g1d_1 * this.f1e_1;
-      var tmp2_safe_receiver = amount.h1d_1;
-      var tmp_1;
-      if (tmp2_safe_receiver == null) {
-        tmp_1 = null;
+      tmp = tmp_0;
+    } else {
+      var tmp2_subject = amount.o1d_1;
+      var tmp_2;
+      if (tmp2_subject.equals(Units_getInstance().w1d_1)) {
+        var minOunces = amount.m1d_1 / this.n1e_1;
+        var tmp3_safe_receiver = amount.n1d_1;
+        var tmp_3;
+        if (tmp3_safe_receiver == null) {
+          tmp_3 = null;
+        } else {
+          // Inline function 'kotlin.let' call
+          tmp_3 = tmp3_safe_receiver / UnitConversion_instance.n1e_1;
+        }
+        var maxOunces = tmp_3;
+        tmp_2 = new Amount(minOunces, maxOunces, Units_getInstance().y1d_1);
+      } else if (tmp2_subject.equals(Units_getInstance().x1d_1)) {
+        var minPounds = amount.m1d_1 * this.o1e_1;
+        var tmp4_safe_receiver = amount.n1d_1;
+        var tmp_4;
+        if (tmp4_safe_receiver == null) {
+          tmp_4 = null;
+        } else {
+          // Inline function 'kotlin.let' call
+          tmp_4 = tmp4_safe_receiver * UnitConversion_instance.o1e_1;
+        }
+        var maxPounds = tmp_4;
+        tmp_2 = new Amount(minPounds, maxPounds, Units_getInstance().z1d_1);
       } else {
-        // Inline function 'kotlin.let' call
-        tmp_1 = tmp2_safe_receiver * UnitConversion_instance.f1e_1;
+        tmp_2 = amount;
       }
-      var maxPounds = tmp_1;
-      tmp = new Amount(minPounds, maxPounds, Units_getInstance().q1d_1);
-    } else {
-      tmp = amount;
+      tmp = tmp_2;
     }
     return tmp;
   };
@@ -3062,11 +3141,11 @@
     // Inline function 'kotlinx.serialization.json.Json.decodeFromString' call
     var this_0 = get_tolerantJson_0();
     // Inline function 'kotlinx.serialization.serializer' call
-    var this_1 = this_0.cm();
+    var this_1 = this_0.im();
     // 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.z11(tmp$ret$1, recipe);
+    var parsedRecipe = this_0.f12(tmp$ret$1, recipe);
     var tmp;
     switch (unit) {
       case 'Imperial':
@@ -3083,16 +3162,16 @@
     // Inline function 'kotlinx.serialization.json.Json.encodeToString' call
     var this_3 = Default_getInstance();
     // Inline function 'kotlinx.serialization.serializer' call
-    var this_4 = this_3.cm();
+    var this_4 = this_3.im();
     // Inline function 'kotlinx.serialization.internal.cast' call
     var this_5 = serializer(this_4, createKType(getKClass(RecipeV3), arrayOf([]), false));
     var tmp$ret$4 = isInterface(this_5, KSerializer) ? this_5 : THROW_CCE();
-    return this_3.y11(tmp$ret$4, scaledRecipe);
+    return this_3.e12(tmp$ret$4, scaledRecipe);
   }
   function parseTemplate_0(templateString) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
     var parsedTemplate = parseTemplate(templateString);
-    return parsedTemplate.n1e_1;
+    return parsedTemplate.x1e_1;
   }
   function renderTemplate_0(templateElements) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
@@ -3101,7 +3180,7 @@
   }
   function tolerantJson$lambda_0($this$Json) {
     _init_properties_ScaleRecipeJsContract_kt__evtan5();
-    $this$Json.t12_1 = true;
+    $this$Json.z12_1 = true;
     return Unit_instance;
   }
   var properties_initialized_ScaleRecipeJsContract_kt_yki7mr;
@@ -3112,20 +3191,19 @@
     }
   }
   //region block: post-declaration
-  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).ft = typeParametersSerializers;
+  protoOf($serializer_0).ft = typeParametersSerializers;
+  protoOf($serializer_1).ft = typeParametersSerializers;
+  protoOf($serializer_2).ft = typeParametersSerializers;
+  protoOf($serializer_3).ft = typeParametersSerializers;
+  protoOf($serializer_4).ft = typeParametersSerializers;
+  protoOf($serializer_5).ft = typeParametersSerializers;
+  protoOf($serializer_6).ft = typeParametersSerializers;
+  protoOf($serializer_7).ft = typeParametersSerializers;
+  protoOf($serializer_8).ft = typeParametersSerializers;
+  protoOf($serializer_9).ft = typeParametersSerializers;
   //endregion
   //region block: init
-  FormatUtils_instance = new FormatUtils();
   Companion_instance_1 = new Companion_1();
   Companion_instance_2 = new Companion_2();
   Companion_instance_4 = new Companion_4();